From 81680e9ec03200c1a69cccd80ab866c78127886e Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 2 Dec 2024 13:44:21 +0100 Subject: [PATCH 01/10] remove charts git url and use helm for ui --- charts/argocd-apps/templates/wbaas-ui.yaml | 4 ++-- charts/argocd-apps/values.yaml | 1 - charts/argocd-config/templates/projects.yaml | 1 + charts/argocd-config/values.yaml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/argocd-apps/templates/wbaas-ui.yaml b/charts/argocd-apps/templates/wbaas-ui.yaml index 9fb7f927..f7197db6 100644 --- a/charts/argocd-apps/templates/wbaas-ui.yaml +++ b/charts/argocd-apps/templates/wbaas-ui.yaml @@ -12,8 +12,8 @@ spec: project: {{ .Values.environment }} sources: - repoURL: {{ .Values.repoUrls.charts }} - path: charts/ui - targetRevision: HEAD + chart: ui + targetRevision: 0.4.0 helm: valueFiles: - $values/k8s/argocd/{{ .Values.environment }}/ui.values.yaml diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml index ffbaa4ed..9588fffb 100644 --- a/charts/argocd-apps/values.yaml +++ b/charts/argocd-apps/values.yaml @@ -1,6 +1,5 @@ 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 diff --git a/charts/argocd-config/templates/projects.yaml b/charts/argocd-config/templates/projects.yaml index f8900d93..859d035d 100644 --- a/charts/argocd-config/templates/projects.yaml +++ b/charts/argocd-config/templates/projects.yaml @@ -24,3 +24,4 @@ spec: kind: ClusterRole - group: rbac.authorization.k8s.io kind: ClusterRoleBinding + - {{ .Values.repoUrls.wbstack }} diff --git a/charts/argocd-config/values.yaml b/charts/argocd-config/values.yaml index a0cbe3ba..78eac3c9 100644 --- a/charts/argocd-config/values.yaml +++ b/charts/argocd-config/values.yaml @@ -2,6 +2,5 @@ environment: production 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 From 2833eb62f98b2033c205ea568597074e10c71952 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 18 Oct 2024 15:28:37 +0200 Subject: [PATCH 02/10] bump chart versions and add changelogs --- charts/argocd-apps/README.md | 0 charts/argocd-config/Chart.yaml | 2 +- charts/argocd-config/README.md | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 charts/argocd-apps/README.md create mode 100644 charts/argocd-config/README.md diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md new file mode 100644 index 00000000..e69de29b diff --git a/charts/argocd-config/Chart.yaml b/charts/argocd-config/Chart.yaml index b85bd8e6..826ad312 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.10 +version: 1.0.11 appVersion: "1.0" maintainers: - name: WBstack diff --git a/charts/argocd-config/README.md b/charts/argocd-config/README.md new file mode 100644 index 00000000..5853688e --- /dev/null +++ b/charts/argocd-config/README.md @@ -0,0 +1,32 @@ +# argocd-config + +Configures permissions Argo CD and deploys the "app-of-apps" (see ../argocd-apps/README.md) + +## Changelog +## 1.0.7 +- use app-of-apps chart v1.0.5 +- add bitnami chart repo URL + +## 1.0.6 +- use app-of-apps chart v1.0.4 +- add allowed destination `in-cluster-monitoring` (needed for wbaas-api deployment) +- add `clusterResourceWhitelist` with ClusterRole and ClusterRoleBinding (needed for wbaas-api deployment) + +## 1.0.5 +- just a version bump due to chart release concurrency bug https://phabricator.wikimedia.org/T307481 + +## 1.0.4 +- use app-of-apps chart v1.0.3 + +## 1.0.3 +- use configurable wbstack chart URL instead of hardcoded string + +## 1.0.2 +- specify app-of-apps chart name +- add wbstack chart url to values file + +### 1.0.1 +- use app-of-apps chart 1.0.1 + +### 1.0.0 +- initial version in this repository \ No newline at end of file From 4c29cc3bf8e92819fe0e805aa55361d7421e4017 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 18 Oct 2024 15:40:45 +0200 Subject: [PATCH 03/10] update changelogs --- charts/argocd-apps/README.md | 25 +++++++++++++++++++++++++ charts/argocd-config/README.md | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md index e69de29b..ba6861d7 100644 --- a/charts/argocd-apps/README.md +++ b/charts/argocd-apps/README.md @@ -0,0 +1,25 @@ +# argocd-apps + +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 +## 1.0.6 +- use helm chart notation for wbaas-ui +- remove unused wbstack git repo URL + +## 1.0.5 +- add redis manifest + +## 1.0.4 +- use wbaas-api chart v0.32.0 + +## 1.0.3 +- unspecified version bump + +### 1.0.2 +- add wbstack helm charts repo +- add wbaas-api manifest + +### 1.0.1 +- initial version in this repository +- includes wbaas-ui manifest \ No newline at end of file diff --git a/charts/argocd-config/README.md b/charts/argocd-config/README.md index 5853688e..511358ff 100644 --- a/charts/argocd-config/README.md +++ b/charts/argocd-config/README.md @@ -3,6 +3,10 @@ Configures permissions Argo CD and deploys the "app-of-apps" (see ../argocd-apps/README.md) ## Changelog +## 1.0.8 +- use app-of-apps chart v1.0.6 +- remove wbstack charts git repo URL + ## 1.0.7 - use app-of-apps chart v1.0.5 - add bitnami chart repo URL @@ -29,4 +33,4 @@ Configures permissions Argo CD and deploys the "app-of-apps" (see ../argocd-apps - use app-of-apps chart 1.0.1 ### 1.0.0 -- initial version in this repository \ No newline at end of file +- initial version in this repository From f162cf5073115c3b33aad82ac6116270b86f9cdf Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 2 Dec 2024 14:02:15 +0100 Subject: [PATCH 04/10] update README --- charts/argocd-apps/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md index ba6861d7..4f93d8b9 100644 --- a/charts/argocd-apps/README.md +++ b/charts/argocd-apps/README.md @@ -3,12 +3,14 @@ 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 +## 1.0.7 +- add redis-2 manifest + ## 1.0.6 -- use helm chart notation for wbaas-ui -- remove unused wbstack git repo URL +- add redis manifest ## 1.0.5 -- add redis manifest +- use wbaas-api chart v0.32.1 ## 1.0.4 - use wbaas-api chart v0.32.0 From fa2c4f7860b0924ec4ac407f63b2bec3f79d51d2 Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 2 Dec 2024 14:13:32 +0100 Subject: [PATCH 05/10] update READEM --- charts/argocd-config/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/charts/argocd-config/README.md b/charts/argocd-config/README.md index 511358ff..6052dc25 100644 --- a/charts/argocd-config/README.md +++ b/charts/argocd-config/README.md @@ -3,6 +3,15 @@ Configures permissions Argo CD and deploys the "app-of-apps" (see ../argocd-apps/README.md) ## Changelog +## 1.0.11 +- remove unused git repo URL to wbstack/charts + +## 1.0.10 +- use app-of-apps chart v1.0.7 + +## 1.0.9 +- replace hardcoded app-of-apps repo URL with configurable value + ## 1.0.8 - use app-of-apps chart v1.0.6 - remove wbstack charts git repo URL From 0a2051a1c562ae2e3b1a15a1b645f2af9461c46b Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 2 Dec 2024 14:13:50 +0100 Subject: [PATCH 06/10] cleanup url values --- charts/argocd-config/templates/projects.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/argocd-config/templates/projects.yaml b/charts/argocd-config/templates/projects.yaml index 859d035d..0fc54652 100644 --- a/charts/argocd-config/templates/projects.yaml +++ b/charts/argocd-config/templates/projects.yaml @@ -16,7 +16,6 @@ spec: server: https://kubernetes.default.svc sourceRepos: - {{ .Values.repoUrls.deploy }} - - {{ .Values.repoUrls.charts }} - {{ .Values.repoUrls.wbstack }} - {{ .Values.repoUrls.bitnami }} clusterResourceWhitelist: @@ -24,4 +23,3 @@ spec: kind: ClusterRole - group: rbac.authorization.k8s.io kind: ClusterRoleBinding - - {{ .Values.repoUrls.wbstack }} From d560a664836120c49645b64ff7a83e3fa8da268e Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 2 Dec 2024 14:16:51 +0100 Subject: [PATCH 07/10] argocd-apps chart v1.0.8 --- charts/argocd-apps/Chart.yaml | 2 +- charts/argocd-apps/README.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml index ca3293d8..ecd00101 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.7 +version: 1.0.8 appVersion: "1.0" maintainers: - name: WBstack diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md index 4f93d8b9..f4ec48af 100644 --- a/charts/argocd-apps/README.md +++ b/charts/argocd-apps/README.md @@ -3,6 +3,10 @@ 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 +## 1.0.8 +- remove git repo url for wbstack/charts +- use helm chart notation instead for the ui + ## 1.0.7 - add redis-2 manifest From d411527f6311f62896d912d30bed3400388eb4a5 Mon Sep 17 00:00:00 2001 From: dena Date: Tue, 3 Dec 2024 11:17:59 +0100 Subject: [PATCH 08/10] move chart versions to values file --- charts/argocd-apps/Chart.yaml | 2 +- charts/argocd-apps/README.md | 5 +++-- charts/argocd-apps/templates/wbaas-api.yaml | 2 +- charts/argocd-apps/templates/wbaas-ui.yaml | 6 +++--- charts/argocd-apps/values.yaml | 2 ++ 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml index ecd00101..78056111 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.8 +version: 1.1.0 appVersion: "1.0" maintainers: - name: WBstack diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md index f4ec48af..1efe1712 100644 --- a/charts/argocd-apps/README.md +++ b/charts/argocd-apps/README.md @@ -3,9 +3,10 @@ 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 -## 1.0.8 -- remove git repo url for wbstack/charts +## 1.1.0 +- move app chart versions to values file - use helm chart notation instead for the ui +- remove git repo url for wbstack/charts ## 1.0.7 - add redis-2 manifest diff --git a/charts/argocd-apps/templates/wbaas-api.yaml b/charts/argocd-apps/templates/wbaas-api.yaml index dde5f825..fc975ef2 100644 --- a/charts/argocd-apps/templates/wbaas-api.yaml +++ b/charts/argocd-apps/templates/wbaas-api.yaml @@ -12,7 +12,7 @@ spec: project: {{ .Values.environment }} sources: - repoURL: {{ .Values.repoUrls.wbstack }} - targetRevision: 0.32.1 + targetRevision: {{ .Values.chartVersions.wbaasApi }} chart: api helm: valueFiles: diff --git a/charts/argocd-apps/templates/wbaas-ui.yaml b/charts/argocd-apps/templates/wbaas-ui.yaml index f7197db6..661715bc 100644 --- a/charts/argocd-apps/templates/wbaas-ui.yaml +++ b/charts/argocd-apps/templates/wbaas-ui.yaml @@ -12,14 +12,14 @@ spec: project: {{ .Values.environment }} sources: - repoURL: {{ .Values.repoUrls.charts }} + targetRevision: {{ .Values.chartVersions.wbaasUi }} chart: ui - targetRevision: 0.4.0 helm: valueFiles: - - $values/k8s/argocd/{{ .Values.environment }}/ui.values.yaml + - $deployRepo/k8s/argocd/{{ .Values.environment }}/ui.values.yaml - repoURL: {{ .Values.repoUrls.deploy }} targetRevision: HEAD - ref: values + ref: deployRepo syncPolicy: automated: diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml index 9588fffb..4df5b915 100644 --- a/charts/argocd-apps/values.yaml +++ b/charts/argocd-apps/values.yaml @@ -6,6 +6,8 @@ clusterUrl: https://kubernetes.default.svc environment: production chartVersions: + wbaasUi: 0.4.0 + wbaasApi: 0.32.1 redis: 17.3.8 redis2: 20.3.0 # "inherits" values from argocd-config chart From e2986d5d53af9784373f554230eda5f6376628ed Mon Sep 17 00:00:00 2001 From: dena Date: Tue, 3 Dec 2024 11:23:10 +0100 Subject: [PATCH 09/10] read app-of-apps chart version from deploy repo --- charts/argocd-config/Chart.yaml | 2 +- charts/argocd-config/README.md | 3 +++ charts/argocd-config/templates/app-of-apps.yaml | 2 +- charts/argocd-config/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/argocd-config/Chart.yaml b/charts/argocd-config/Chart.yaml index 826ad312..faa16db0 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.11 +version: 1.1.0 appVersion: "1.0" maintainers: - name: WBstack diff --git a/charts/argocd-config/README.md b/charts/argocd-config/README.md index 6052dc25..55bb7e05 100644 --- a/charts/argocd-config/README.md +++ b/charts/argocd-config/README.md @@ -3,6 +3,9 @@ Configures permissions Argo CD and deploys the "app-of-apps" (see ../argocd-apps/README.md) ## Changelog +## 1.1.0 +- read app-of-apps chart version from wbaas-deploy repo + ## 1.0.11 - remove unused git repo URL to wbstack/charts diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml index ac4cf280..309f63be 100644 --- a/charts/argocd-config/templates/app-of-apps.yaml +++ b/charts/argocd-config/templates/app-of-apps.yaml @@ -9,7 +9,7 @@ spec: project: {{ .Values.environment }} sources: - repoURL: {{ .Values.repoUrls.wbstack }} - targetRevision: 1.0.7 + targetRevision: {{ .Values.appOfAppsVersion }} chart: argocd-apps helm: values: | diff --git a/charts/argocd-config/values.yaml b/charts/argocd-config/values.yaml index 78eac3c9..5664d1f4 100644 --- a/charts/argocd-config/values.yaml +++ b/charts/argocd-config/values.yaml @@ -1,5 +1,7 @@ environment: production +appOfAppsVersion: 1.1.0 + repoUrls: deploy: https://github.com/wmde/wbaas-deploy wbstack: https://wbstack.github.io/charts From 292337f1e1259cddccacfee24b8ef8ba4314a5dc Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:33:36 +0100 Subject: [PATCH 10/10] adjust redis chart version --- charts/argocd-apps/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml index 4df5b915..e061912e 100644 --- a/charts/argocd-apps/values.yaml +++ b/charts/argocd-apps/values.yaml @@ -9,5 +9,5 @@ chartVersions: wbaasUi: 0.4.0 wbaasApi: 0.32.1 redis: 17.3.8 - redis2: 20.3.0 + redis2: 19.6.4 # "inherits" values from argocd-config chart