From cc28cbe5d5f52acb2c41e8c38b1ee90304b83f56 Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Mon, 14 Feb 2022 12:47:41 +0100 Subject: [PATCH 1/8] chore(back8sup/backup-apps): update to latest Signed-off-by: Toni Tauro --- charts/back8sup/Chart.yaml | 4 ++-- charts/back8sup/README.md | 2 +- charts/backup-apps/Chart.yaml | 2 +- charts/backup-apps/README.md | 4 ++-- charts/backup-apps/values.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/back8sup/Chart.yaml b/charts/back8sup/Chart.yaml index 55fe680e5..679c1ee79 100644 --- a/charts/back8sup/Chart.yaml +++ b/charts/back8sup/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: back8sup description: Deploy back8sup to a Kubernetes Cluster type: application -version: 0.4.2 -appVersion: v0.7.6 +version: 0.4.3 +appVersion: v0.7.8 home: https://github.com/adfinis-sygroup/back8sup sources: - https://github.com/adfinis-sygroup/back8sup diff --git a/charts/back8sup/README.md b/charts/back8sup/README.md index 49cec308f..90bde6a0f 100644 --- a/charts/back8sup/README.md +++ b/charts/back8sup/README.md @@ -1,6 +1,6 @@ # back8sup -![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.6](https://img.shields.io/badge/AppVersion-v0.7.6-informational?style=flat-square) +![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.8](https://img.shields.io/badge/AppVersion-v0.7.8-informational?style=flat-square) Deploy back8sup to a Kubernetes Cluster diff --git a/charts/backup-apps/Chart.yaml b/charts/backup-apps/Chart.yaml index 892eef9a0..27fc80288 100644 --- a/charts/backup-apps/Chart.yaml +++ b/charts/backup-apps/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: backup-apps description: Argo CD app-of-apps config for backup components type: application -version: 0.2.0 +version: 0.3.0 home: https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/backup-apps sources: - https://github.com/adfinis-sygroup/helm-charts diff --git a/charts/backup-apps/README.md b/charts/backup-apps/README.md index 9e5724106..9f9f2a7f1 100644 --- a/charts/backup-apps/README.md +++ b/charts/backup-apps/README.md @@ -1,6 +1,6 @@ # backup-apps -![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Argo CD app-of-apps config for backup components @@ -28,7 +28,7 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | back8sup.destination.namespace | string | `"backup-back8sup"` | Namespace | | back8sup.enabled | bool | `true` | Enable Back8sup | | back8sup.repoURL | string | [repo](https://charts.adfinis.com) | Repo URL | -| back8sup.targetRevision | string | `"0.4.*"` | [Back8sup Helm chart](https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/back8sup) | +| back8sup.targetRevision | string | `"0.7.*"` | [Back8sup Helm chart](https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/back8sup) | | back8sup.values | object | [upstream values](https://github.com/adfinis-sygroup/helm-charts/blob/master/charts/back8sup/values.yaml) | Helm values | | barman | object | [example](./examples/barman.yaml) | [Barman](https://github.com/EnterpriseDB/barman) | | barman.chart | string | `"barman"` | Chart | diff --git a/charts/backup-apps/values.yaml b/charts/backup-apps/values.yaml index 5aeaebfff..df20485df 100644 --- a/charts/backup-apps/values.yaml +++ b/charts/backup-apps/values.yaml @@ -33,7 +33,7 @@ back8sup: # back8sup.chart -- Chart chart: back8sup # back8sup.targetRevision -- [Back8sup Helm chart](https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/back8sup) - targetRevision: '0.4.*' + targetRevision: '0.7.*' # back8sup.values -- Helm values # @default -- [upstream values](https://github.com/adfinis-sygroup/helm-charts/blob/master/charts/back8sup/values.yaml) values: {} From 35f8c6c1d497decb3f06e889519e089483eb12b8 Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Mon, 14 Feb 2022 13:18:52 +0100 Subject: [PATCH 2/8] chore(back8sup): actually no backup-apps version bump needed Signed-off-by: Toni Tauro --- charts/backup-apps/Chart.yaml | 2 +- charts/backup-apps/README.md | 4 ++-- charts/backup-apps/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/backup-apps/Chart.yaml b/charts/backup-apps/Chart.yaml index 27fc80288..892eef9a0 100644 --- a/charts/backup-apps/Chart.yaml +++ b/charts/backup-apps/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: backup-apps description: Argo CD app-of-apps config for backup components type: application -version: 0.3.0 +version: 0.2.0 home: https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/backup-apps sources: - https://github.com/adfinis-sygroup/helm-charts diff --git a/charts/backup-apps/README.md b/charts/backup-apps/README.md index 9f9f2a7f1..9e5724106 100644 --- a/charts/backup-apps/README.md +++ b/charts/backup-apps/README.md @@ -1,6 +1,6 @@ # backup-apps -![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Argo CD app-of-apps config for backup components @@ -28,7 +28,7 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | back8sup.destination.namespace | string | `"backup-back8sup"` | Namespace | | back8sup.enabled | bool | `true` | Enable Back8sup | | back8sup.repoURL | string | [repo](https://charts.adfinis.com) | Repo URL | -| back8sup.targetRevision | string | `"0.7.*"` | [Back8sup Helm chart](https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/back8sup) | +| back8sup.targetRevision | string | `"0.4.*"` | [Back8sup Helm chart](https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/back8sup) | | back8sup.values | object | [upstream values](https://github.com/adfinis-sygroup/helm-charts/blob/master/charts/back8sup/values.yaml) | Helm values | | barman | object | [example](./examples/barman.yaml) | [Barman](https://github.com/EnterpriseDB/barman) | | barman.chart | string | `"barman"` | Chart | diff --git a/charts/backup-apps/values.yaml b/charts/backup-apps/values.yaml index df20485df..5aeaebfff 100644 --- a/charts/backup-apps/values.yaml +++ b/charts/backup-apps/values.yaml @@ -33,7 +33,7 @@ back8sup: # back8sup.chart -- Chart chart: back8sup # back8sup.targetRevision -- [Back8sup Helm chart](https://github.com/adfinis-sygroup/helm-charts/tree/master/charts/back8sup) - targetRevision: '0.7.*' + targetRevision: '0.4.*' # back8sup.values -- Helm values # @default -- [upstream values](https://github.com/adfinis-sygroup/helm-charts/blob/master/charts/back8sup/values.yaml) values: {} From 9e434e7faee686c9ae4a7960ece37395ef7a836b Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Wed, 16 Feb 2022 22:16:24 +0100 Subject: [PATCH 3/8] chore(back8sup): update to 0.7.9 Signed-off-by: Toni Tauro --- charts/back8sup/Chart.yaml | 2 +- charts/back8sup/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/back8sup/Chart.yaml b/charts/back8sup/Chart.yaml index 679c1ee79..7a9ab986f 100644 --- a/charts/back8sup/Chart.yaml +++ b/charts/back8sup/Chart.yaml @@ -3,7 +3,7 @@ name: back8sup description: Deploy back8sup to a Kubernetes Cluster type: application version: 0.4.3 -appVersion: v0.7.8 +appVersion: v0.7.9 home: https://github.com/adfinis-sygroup/back8sup sources: - https://github.com/adfinis-sygroup/back8sup diff --git a/charts/back8sup/README.md b/charts/back8sup/README.md index 90bde6a0f..c6782ba40 100644 --- a/charts/back8sup/README.md +++ b/charts/back8sup/README.md @@ -1,6 +1,6 @@ # back8sup -![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.8](https://img.shields.io/badge/AppVersion-v0.7.8-informational?style=flat-square) +![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.9](https://img.shields.io/badge/AppVersion-v0.7.9-informational?style=flat-square) Deploy back8sup to a Kubernetes Cluster From 29032eb831c1cb1bc46826dae3730342bee15b41 Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Wed, 16 Feb 2022 22:32:21 +0100 Subject: [PATCH 4/8] fix(back8sup): capabilities if clause Signed-off-by: Toni Tauro --- charts/back8sup/templates/cronjob.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/back8sup/templates/cronjob.yaml b/charts/back8sup/templates/cronjob.yaml index 949053961..cb36ea9ac 100644 --- a/charts/back8sup/templates/cronjob.yaml +++ b/charts/back8sup/templates/cronjob.yaml @@ -1,4 +1,4 @@ -{{- if .Capabilities.APIVersions.Has "batch/v1/CronJob" }} +{{- if .Capabilities.APIVersions.Has "batch/v1" }} apiVersion: batch/v1 {{- else }} apiVersion: batch/v1beta1 From 7d47c1dd8204a12dd21e0e9060f07f0383c595b1 Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Wed, 16 Feb 2022 22:40:09 +0100 Subject: [PATCH 5/8] Revert "fix(back8sup): capabilities if clause" This reverts commit 29032eb831c1cb1bc46826dae3730342bee15b41. --- charts/back8sup/templates/cronjob.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/back8sup/templates/cronjob.yaml b/charts/back8sup/templates/cronjob.yaml index cb36ea9ac..949053961 100644 --- a/charts/back8sup/templates/cronjob.yaml +++ b/charts/back8sup/templates/cronjob.yaml @@ -1,4 +1,4 @@ -{{- if .Capabilities.APIVersions.Has "batch/v1" }} +{{- if .Capabilities.APIVersions.Has "batch/v1/CronJob" }} apiVersion: batch/v1 {{- else }} apiVersion: batch/v1beta1 From 63a5d612223a6b00ce91995520cf82918ccef9ca Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Thu, 17 Feb 2022 17:45:17 +0100 Subject: [PATCH 6/8] fix(cronjob): try out with semver Signed-off-by: Toni Tauro --- charts/back8sup/templates/cronjob.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/back8sup/templates/cronjob.yaml b/charts/back8sup/templates/cronjob.yaml index 949053961..2e59419c6 100644 --- a/charts/back8sup/templates/cronjob.yaml +++ b/charts/back8sup/templates/cronjob.yaml @@ -1,4 +1,4 @@ -{{- if .Capabilities.APIVersions.Has "batch/v1/CronJob" }} +{{- if semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion }} apiVersion: batch/v1 {{- else }} apiVersion: batch/v1beta1 From 9b218adb088422801b4b83161f87493241aa7460 Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Thu, 17 Feb 2022 17:48:12 +0100 Subject: [PATCH 7/8] chore(helm): use 3.8.0 Signed-off-by: Toni Tauro --- .env | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 104f51163..837b5f2fd 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ ADFINIS_CHARTS_INFRA_NS="argocd" # hack tools ADFINIS_CHARTS_GOMPLATE_VERSION="3.9.0" -ADFINIS_CHARTS_HELM_VERSION="3.7.0" +ADFINIS_CHARTS_HELM_VERSION="3.8.0" ADFINIS_CHARTS_HELM_DOCS_VERSION="1.7.0" ADFINIS_CHARTS_YQ_VERSION="4.9.6" ADFINIS_CHARTS_PLUTO_VERSION="5.3.4" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cf95f1bb7..6a7812717 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: - name: Install Helm uses: azure/setup-helm@v1.1 with: - version: v3.7.0 + version: v3.8.0 - name: Add dependency chart repos run: yq e '."chart-repos"[]' hack/chart-testing/ct.yaml | tr "=" " " | xargs -L1 helm repo add diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index cc57c0b44..380dabea9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Helm uses: azure/setup-helm@v1.1 with: - version: v3.7.0 + version: v3.8.0 - name: install helm unittest run: | From 26bbca2b8f47eb7641d50fba056b728596ffdf25 Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Thu, 17 Feb 2022 17:50:20 +0100 Subject: [PATCH 8/8] chore(helm): update to 3.8.0 Signed-off-by: Toni Tauro --- .env | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 104f51163..837b5f2fd 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ ADFINIS_CHARTS_INFRA_NS="argocd" # hack tools ADFINIS_CHARTS_GOMPLATE_VERSION="3.9.0" -ADFINIS_CHARTS_HELM_VERSION="3.7.0" +ADFINIS_CHARTS_HELM_VERSION="3.8.0" ADFINIS_CHARTS_HELM_DOCS_VERSION="1.7.0" ADFINIS_CHARTS_YQ_VERSION="4.9.6" ADFINIS_CHARTS_PLUTO_VERSION="5.3.4" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cf95f1bb7..6a7812717 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: - name: Install Helm uses: azure/setup-helm@v1.1 with: - version: v3.7.0 + version: v3.8.0 - name: Add dependency chart repos run: yq e '."chart-repos"[]' hack/chart-testing/ct.yaml | tr "=" " " | xargs -L1 helm repo add diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index cc57c0b44..a70abbec3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Helm uses: azure/setup-helm@v1.1 with: - version: v3.7.0 + version: v3.8.0 - name: install helm unittest run: | @@ -48,7 +48,7 @@ jobs: - name: Set up Helm uses: azure/setup-helm@v1.1 with: - version: v3.7.0 + version: v3.8.0 - name: install helm unittest run: |