diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml index 0c57b1a..9616dca 100644 --- a/charts/argocd-apps/Chart.yaml +++ b/charts/argocd-apps/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argocd-apps description: Chart to deploy WBaaS apps in an "app-of-apps" pattern via ArgoCD type: application -version: 1.0.5 +version: 1.0.6 appVersion: "1.0" maintainers: - name: WBstack diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml new file mode 100644 index 0000000..0dedb6b --- /dev/null +++ b/charts/argocd-apps/templates/redis.yaml @@ -0,0 +1,27 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: redis + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: default + server: {{ .Values.clusterUrl }} + project: {{ .Values.environment }} + sources: + - repoURL: {{ .Values.repoUrls.bitnami }} + targetRevision: {{ .Values.chartVersions.redis }} + chart: redis + helm: + valueFiles: + - $deployRepo/k8s/argocd/{{ .Values.environment }}/redis.values.yaml + - repoURL: {{ .Values.repoUrls.deploy }} + targetRevision: de/argo-redis2 # use the unmerged branch on the deploy repository + ref: deployRepo + + syncPolicy: + automated: + selfHeal: true + prune: false diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml index c75f03a..803e16e 100644 --- a/charts/argocd-apps/values.yaml +++ b/charts/argocd-apps/values.yaml @@ -2,7 +2,10 @@ repoUrls: deploy: https://github.com/wmde/wbaas-deploy charts: https://github.com/wbstack/charts.git wbstack: https://wbstack.github.io/charts + bitnami: https://charts.bitnami.com/bitnami clusterUrl: https://kubernetes.default.svc environment: production +chartVersions: + redis: 17.3.8 # "inherits" values from argocd-config chart diff --git a/charts/argocd-config/Chart.yaml b/charts/argocd-config/Chart.yaml index 8a8c12b..e37fda2 100644 --- a/charts/argocd-config/Chart.yaml +++ b/charts/argocd-config/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argocd-config description: Chart to deploy ArgoCD configuration (including the argocd-apps chart) type: application -version: 1.0.7 +version: 1.0.8 appVersion: "1.0" maintainers: - name: WBstack diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml index c241e56..76244e5 100644 --- a/charts/argocd-config/templates/app-of-apps.yaml +++ b/charts/argocd-config/templates/app-of-apps.yaml @@ -7,13 +7,21 @@ spec: server: https://kubernetes.default.svc namespace: argocd project: {{ .Values.environment }} - source: - repoURL: {{ .Values.repoUrls.wbstack }} - targetRevision: 1.0.5 - chart: argocd-apps - helm: - values: | -{{ toYaml .Values | indent 8 }} + sources: + - repoURL: https://github.com/wbstack/charts.git + targetRevision: "de/argo-apps-redis-demo-dnm" # use this branch to + # get the new unreleased app-of-apps chart including the alteration + # to use the unmerged branch on the deploy repo for values in + # redis.yaml + path: "charts/argocd-apps" + helm: + values: | +{{ toYaml .Values | indent 10 }} + valueFiles: + - $deployRepo/k8s/argocd/{{ .Values.environment }}/app-of-apps.values.yaml + - repoURL: {{ .Values.repoUrls.deploy }} + targetRevision: de/argo-redis2 # use the unmerged branch on the deploy repository + ref: deployRepo syncPolicy: automated: prune: false diff --git a/charts/argocd-config/templates/projects.yaml b/charts/argocd-config/templates/projects.yaml index b8e0881..f8900d9 100644 --- a/charts/argocd-config/templates/projects.yaml +++ b/charts/argocd-config/templates/projects.yaml @@ -18,6 +18,7 @@ spec: - {{ .Values.repoUrls.deploy }} - {{ .Values.repoUrls.charts }} - {{ .Values.repoUrls.wbstack }} + - {{ .Values.repoUrls.bitnami }} clusterResourceWhitelist: - group: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/argocd-config/values.yaml b/charts/argocd-config/values.yaml index c2f4a4d..a0cbe3b 100644 --- a/charts/argocd-config/values.yaml +++ b/charts/argocd-config/values.yaml @@ -4,3 +4,4 @@ repoUrls: deploy: https://github.com/wmde/wbaas-deploy charts: https://github.com/wbstack/charts.git wbstack: https://wbstack.github.io/charts + bitnami: https://charts.bitnami.com/bitnami