From 05d75cad630b314e41083c74149a997cb3f44895 Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:01:08 +0100 Subject: [PATCH 1/6] Fix backwards compatibility for k8s 1.24 --- templates/poddisruptionbudget.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/poddisruptionbudget.yaml b/templates/poddisruptionbudget.yaml index f526e63..5a551d3 100644 --- a/templates/poddisruptionbudget.yaml +++ b/templates/poddisruptionbudget.yaml @@ -1,5 +1,9 @@ {{- if .Values.podDisruptionBudget -}} +{{- if .Capabilities.APIVersions.Has "policy/v1" -}} apiVersion: policy/v1 +{{- else}} +apiVersion: policy/v1beta1 +{{- end }} kind: PodDisruptionBudget metadata: name: {{ template "docker-registry.fullname" . }} From a1b77cb212af6ef4c0f847a926aaf9fbe51664de Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:09:33 +0100 Subject: [PATCH 2/6] Publish helm chart as release asset --- .github/workflows/healm_publish.yaml | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/healm_publish.yaml diff --git a/.github/workflows/healm_publish.yaml b/.github/workflows/healm_publish.yaml new file mode 100644 index 0000000..26c557e --- /dev/null +++ b/.github/workflows/healm_publish.yaml @@ -0,0 +1,29 @@ +name: helm-publish + +on: + release: + types: [prereleased, released] + +env: + HELM_CHARTS_PATH: "." + +jobs: + upload-helm-charts: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - uses: azure/setup-helm@v1 + + - name: Package helm charts + run: helm package . + working-directory: ${{ env.HELM_CHARTS_PATH }} + + - name: Rename helm chart archives + run: for filename in *.tgz; do mv "$filename" "helm-chart-$filename"; done + working-directory: ${{ env.HELM_CHARTS_PATH }} + + - uses: softprops/action-gh-release@v1 + with: + files: ${{ env.HELM_CHARTS_PATH }}/*.tgz From 38acafc68059c204739be33dc8b55c0a4b6f9b1d Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:20:25 +0100 Subject: [PATCH 3/6] Fix backwards compatibility for k8s 1.24 --- templates/poddisruptionbudget.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/poddisruptionbudget.yaml b/templates/poddisruptionbudget.yaml index f526e63..e35494e 100644 --- a/templates/poddisruptionbudget.yaml +++ b/templates/poddisruptionbudget.yaml @@ -1,5 +1,9 @@ {{- if .Values.podDisruptionBudget -}} +{{- if .Capabilities.APIVersions.Has "policy/v1beta1" -}} +apiVersion: policy/v1beta1 +{{- else}} apiVersion: policy/v1 +{{- end }} kind: PodDisruptionBudget metadata: name: {{ template "docker-registry.fullname" . }} From 9193ce0ae8c82e6c32bc92f04f24b27890499c7b Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:49:33 +0100 Subject: [PATCH 4/6] Bump chart version This reverts commit 345f178c44ab853fb603dab5bba6c58eae3e954b. --- Chart.yaml | 2 +- templates/poddisruptionbudget.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 31ec13c..b0e582a 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Docker Registry name: docker-registry -version: 2.2.2 +version: 2.2.3 appVersion: 2.8.1 home: https://hub.docker.com/_/registry/ icon: https://helm.twun.io/docker-registry.png diff --git a/templates/poddisruptionbudget.yaml b/templates/poddisruptionbudget.yaml index e35494e..5a551d3 100644 --- a/templates/poddisruptionbudget.yaml +++ b/templates/poddisruptionbudget.yaml @@ -1,8 +1,8 @@ {{- if .Values.podDisruptionBudget -}} -{{- if .Capabilities.APIVersions.Has "policy/v1beta1" -}} -apiVersion: policy/v1beta1 -{{- else}} +{{- if .Capabilities.APIVersions.Has "policy/v1" -}} apiVersion: policy/v1 +{{- else}} +apiVersion: policy/v1beta1 {{- end }} kind: PodDisruptionBudget metadata: From 456d4f03087063ac9fcca6b3e47600eefbd109db Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Wed, 6 Mar 2024 07:20:19 +0100 Subject: [PATCH 5/6] Remove .github/workflows/healm_publish.yaml --- .github/workflows/healm_publish.yaml | 29 ---------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github/workflows/healm_publish.yaml diff --git a/.github/workflows/healm_publish.yaml b/.github/workflows/healm_publish.yaml deleted file mode 100644 index 26c557e..0000000 --- a/.github/workflows/healm_publish.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: helm-publish - -on: - release: - types: [prereleased, released] - -env: - HELM_CHARTS_PATH: "." - -jobs: - upload-helm-charts: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - uses: azure/setup-helm@v1 - - - name: Package helm charts - run: helm package . - working-directory: ${{ env.HELM_CHARTS_PATH }} - - - name: Rename helm chart archives - run: for filename in *.tgz; do mv "$filename" "helm-chart-$filename"; done - working-directory: ${{ env.HELM_CHARTS_PATH }} - - - uses: softprops/action-gh-release@v1 - with: - files: ${{ env.HELM_CHARTS_PATH }}/*.tgz From c112edabe57397682fbca867a380cf00578557d2 Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Fri, 8 Mar 2024 06:45:07 +0100 Subject: [PATCH 6/6] Revert version --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index b0e582a..31ec13c 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Docker Registry name: docker-registry -version: 2.2.3 +version: 2.2.2 appVersion: 2.8.1 home: https://hub.docker.com/_/registry/ icon: https://helm.twun.io/docker-registry.png