Skip to content

Commit

Permalink
Allow to specify controller and argocd namespaces (#133)
Browse files Browse the repository at this point in the history
* Allow specify namespace and argocdnamespace

* Default controller namespace to .Release.Namespace

* Switch to ghcr registry
  • Loading branch information
maruina authored Aug 6, 2021
1 parent 9cac96e commit 6e5a0a3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
4 changes: 2 additions & 2 deletions charts/applicationset-progressive-sync/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.2.2-prealpha
version: 0.3.0-prealpha

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v0.2.0-prealpha"
appVersion: "v0.4.0-prealpha"

keywords:
- argoproj
Expand Down
9 changes: 5 additions & 4 deletions charts/applicationset-progressive-sync/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# applicationset-progressive-sync

![Version: 0.1.5-prealpha](https://img.shields.io/badge/Version-0.1.5--prealpha-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.2.0-prealpha](https://img.shields.io/badge/AppVersion-v0.2.0--prealpha-informational?style=flat-square)
![Version: 0.3.0-prealpha](https://img.shields.io/badge/Version-0.3.0--prealpha-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.0-prealpha](https://img.shields.io/badge/AppVersion-v0.4.0--prealpha-informational?style=flat-square)

A Helm chart to install the applicationset-progressive-sync controller.

Expand All @@ -26,8 +26,9 @@ Users of Helm v2 should use `--set installCRDs=true` to install the CRDs.
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| args.enableLeaderElection | bool | `false` | |
| args.metricsAddr | string | `":8080"` | |
| args.argoNamespace | string | `"argocd"` | The namespace where ArgoCD and the ApplicationSet controller are deployed to. |
| args.enableLeaderElection | bool | `false` | Enable leader election for controller manager. |
| args.metricsAddr | string | `":8080"` | The address the metric endpoint binds to. |
| config | object | `{"argoCDAuthToken":"example-token","argoCDInsecure":"true","argoCDServerAddr":"argocd-server"}` | Config options |
| config.argoCDAuthToken | string | `"example-token"` | ArgoCD token |
| config.argoCDInsecure | string | `"true"` | Allow insecure connection with ArgoCD server |
Expand All @@ -36,7 +37,7 @@ Users of Helm v2 should use `--set installCRDs=true` to install the CRDs.
| configSecret.name | string | `""` | If this value is not provided, a secret will be generated |
| fullnameOverride | string | `""` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"maruina/applicationset-progressive-sync"` | |
| image.repository | string | `"ghcr.io/skyscanner/applicationset-progressive-sync"` | |
| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
| imagePullSecrets | list | `[]` | |
| installCRDs | bool | `false` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ spec:
{{- if or (gt ( .Values.replicaCount | int64) 1) .Values.args.enableLeaderElection }}
- --enable-leader-election=true
{{- end }}
- --ctrl-namespace={{ .Release.Namespace }}
- --argo-namespace={{ .Values.args.argoNamespace }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
Expand Down
6 changes: 5 additions & 1 deletion charts/applicationset-progressive-sync/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ replicaCount: 1
installCRDs: false

image:
repository: maruina/applicationset-progressive-sync
repository: ghcr.io/skyscanner/applicationset-progressive-sync
pullPolicy: IfNotPresent
# -- Overrides the image tag whose default is the chart appVersion.
tag: ""

args:
# -- The address the metric endpoint binds to.
metricsAddr: :8080
# -- Enable leader election for controller manager.
enableLeaderElection: false
# -- The namespace where ArgoCD and the ApplicationSet controller are deployed to.
argoNamespace: argocd

imagePullSecrets: []
nameOverride: ""
Expand Down

0 comments on commit 6e5a0a3

Please sign in to comment.