diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml index 383f967..b8da59f 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: 2.5.1 +version: 2.6.0 appVersion: "1.0" maintainers: - name: WBstack diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md index 95b3081..b938978 100644 --- a/charts/argocd-apps/README.md +++ b/charts/argocd-apps/README.md @@ -3,6 +3,9 @@ Deploys actual `Application` manifests for Argo CD. This chart gets treated as it's own `Application`, the app-of-apps, by the chart [argocd-config](../argocd-config/README.md). ## Changelog +## 2.6.0 +- add two valkey deployments a & b + ## 2.5.1 - fix trivy operator value file references diff --git a/charts/argocd-apps/templates/valkey-a.yaml b/charts/argocd-apps/templates/valkey-a.yaml new file mode 100644 index 0000000..6fbbfd7 --- /dev/null +++ b/charts/argocd-apps/templates/valkey-a.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: valkey-a + namespace: argocd +spec: + destination: + namespace: default + server: {{ .Values.clusterUrl }} + project: {{ .Values.environment }} + sources: + - repoURL: https://github.com/wbstack/valkey-helm.git + targetRevision: {{ .Values.chartVersions.valkeyA }} + path: charts/valkey + helm: + valueFiles: + - $deployRepo/k8s/argocd/production/valkey-a.values.yaml + - $deployRepo/k8s/argocd/{{ .Values.environment }}/valkey-a.values.yaml + - repoURL: {{ .Values.repoUrls.deploy }} + targetRevision: HEAD + ref: deployRepo + syncPolicy: + automated: + selfHeal: true + prune: false diff --git a/charts/argocd-apps/templates/valkey-b.yaml b/charts/argocd-apps/templates/valkey-b.yaml new file mode 100644 index 0000000..79ad36e --- /dev/null +++ b/charts/argocd-apps/templates/valkey-b.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: valkey-b + namespace: argocd +spec: + destination: + namespace: default + server: {{ .Values.clusterUrl }} + project: {{ .Values.environment }} + sources: + - repoURL: https://github.com/wbstack/valkey-helm.git + targetRevision: {{ .Values.chartVersions.valkeyB }} + path: charts/valkey + helm: + valueFiles: + - $deployRepo/k8s/argocd/production/valkey-b.values.yaml + - $deployRepo/k8s/argocd/{{ .Values.environment }}/valkey-b.values.yaml + - repoURL: {{ .Values.repoUrls.deploy }} + targetRevision: HEAD + ref: deployRepo + syncPolicy: + automated: + selfHeal: true + prune: false diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml index 35133e7..aaa1e68 100644 --- a/charts/argocd-apps/values.yaml +++ b/charts/argocd-apps/values.yaml @@ -8,4 +8,6 @@ chartVersions: wbaasUi: 0.4.0 wbaasApi: 0.32.1 trivyOperator: 0.32.1 + valkeyA: valkey-0.12.1 + valkeyB: valkey-0.12.1 # "inherits" values from argocd-config chart