From e45f80a2c5144931eeaa0457ef7b12c0b18126be Mon Sep 17 00:00:00 2001 From: "Deavon M. McCaffery" Date: Wed, 4 May 2022 09:01:34 +0100 Subject: [PATCH] build: update release to push to ghcr * publish to ghcr for every release * bump versions to publish first build Signed-off-by: Deavon M. McCaffery --- .github/workflows/release.yml | 21 +++++++++++++++++++ .gitignore | 3 +++ charts/flux2-notification/Chart.yaml | 2 +- charts/flux2-notification/README.md | 2 +- .../tests/__snapshot__/alert_test.yaml.snap | 2 +- .../__snapshot__/provider_test.yaml.snap | 2 +- .../tests/__snapshot__/secret_test.yaml.snap | 2 +- charts/flux2-sync/Chart.yaml | 2 +- charts/flux2-sync/README.md | 2 +- .../tests/__snapshot__/secret_test.yaml.snap | 2 +- charts/flux2/Chart.yaml | 2 +- charts/flux2/README.md | 2 +- .../helm-controller_test.yaml.snap | 2 +- ...image-automation-controller_test.yaml.snap | 2 +- .../image-reflector-controller_test.yaml.snap | 2 +- ...kustomize-controller-secret_test.yaml.snap | 2 +- .../kustomize-controller_test.yaml.snap | 2 +- .../notification-controller_test.yaml.snap | 2 +- .../source-controller_test.yaml.snap | 2 +- 19 files changed, 41 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a31c33f..0a9c991 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,10 @@ on: branches: - main +permissions: + contents: write + packages: write + jobs: release: runs-on: ubuntu-latest @@ -28,3 +32,20 @@ jobs: uses: helm/chart-releaser-action@v1.2.1 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Push Charts to GHCR + run: | + for pkg in .cr-release-packages/*; do + if [ -z "${pkg:-}" ]; then + break + fi + + helm push "${pkg}" oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/charts + done diff --git a/.gitignore b/.gitignore index 5aa8d3b..0066718 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ # helm chart dependencies charts/*/charts/ charts/*/Chart.lock + +# release packages +.cr-release-packages/ diff --git a/charts/flux2-notification/Chart.yaml b/charts/flux2-notification/Chart.yaml index bcbfe9e..a1cf558 100644 --- a/charts/flux2-notification/Chart.yaml +++ b/charts/flux2-notification/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: flux2-notification type: application -version: 0.5.3 +version: 0.5.4 appVersion: 0.30.2 description: A Helm chart for flux2 alerts and the needed providers and secrets sources: diff --git a/charts/flux2-notification/README.md b/charts/flux2-notification/README.md index 24e06be..0bfec8f 100644 --- a/charts/flux2-notification/README.md +++ b/charts/flux2-notification/README.md @@ -1,6 +1,6 @@ # flux2-notification -![Version: 0.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.30.2](https://img.shields.io/badge/AppVersion-0.30.2-informational?style=flat-square) +![Version: 0.5.4](https://img.shields.io/badge/Version-0.5.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.30.2](https://img.shields.io/badge/AppVersion-0.30.2-informational?style=flat-square) A Helm chart for flux2 alerts and the needed providers and secrets diff --git a/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap index 6fd581c..15bad75 100644 --- a/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap +++ b/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 - helm.sh/chart: flux2-notification-0.5.3 + helm.sh/chart: flux2-notification-0.5.4 name: all-kustomizations namespace: NAMESPACE spec: diff --git a/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap index e53da43..116f9a0 100644 --- a/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap +++ b/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 - helm.sh/chart: flux2-notification-0.5.3 + helm.sh/chart: flux2-notification-0.5.4 name: on-call-slack namespace: NAMESPACE spec: diff --git a/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap index 2621a92..d539918 100644 --- a/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap +++ b/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot of default values: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 - helm.sh/chart: flux2-notification-0.5.3 + helm.sh/chart: flux2-notification-0.5.4 name: webhook-url namespace: NAMESPACE stringData: diff --git a/charts/flux2-sync/Chart.yaml b/charts/flux2-sync/Chart.yaml index 013a516..9bb0629 100644 --- a/charts/flux2-sync/Chart.yaml +++ b/charts/flux2-sync/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: flux2-sync -version: 0.3.7 +version: 0.3.8 description: A Helm chart for flux2 GitRepository to sync with sources: diff --git a/charts/flux2-sync/README.md b/charts/flux2-sync/README.md index 26729dd..26a6fc6 100644 --- a/charts/flux2-sync/README.md +++ b/charts/flux2-sync/README.md @@ -1,6 +1,6 @@ # flux2-sync -![Version: 0.3.7](https://img.shields.io/badge/Version-0.3.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.3.8](https://img.shields.io/badge/Version-0.3.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for flux2 GitRepository to sync with diff --git a/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap b/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap index 14b80d1..acf57dc 100644 --- a/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap +++ b/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/instance: NAMESPACE app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux - helm.sh/chart: flux2-sync-0.3.7 + helm.sh/chart: flux2-sync-0.3.8 name: RELEASE-NAME namespace: NAMESPACE type: Opaque diff --git a/charts/flux2/Chart.yaml b/charts/flux2/Chart.yaml index 4709343..b33f538 100644 --- a/charts/flux2/Chart.yaml +++ b/charts/flux2/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: flux2 description: A Helm chart for flux2 type: application -version: 0.19.1 +version: 0.19.2 appVersion: 0.30.2 sources: - https://github.com/fluxcd-community/helm-charts diff --git a/charts/flux2/README.md b/charts/flux2/README.md index bfadd86..a92ba2f 100644 --- a/charts/flux2/README.md +++ b/charts/flux2/README.md @@ -1,6 +1,6 @@ # flux2 -![Version: 0.19.1](https://img.shields.io/badge/Version-0.19.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.30.2](https://img.shields.io/badge/AppVersion-0.30.2-informational?style=flat-square) +![Version: 0.19.2](https://img.shields.io/badge/Version-0.19.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.30.2](https://img.shields.io/badge/AppVersion-0.30.2-informational?style=flat-square) A Helm chart for flux2 diff --git a/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap index 274b14b..cda1d7b 100644 --- a/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap @@ -9,7 +9,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 control-plane: controller - helm.sh/chart: flux2-0.19.1 + helm.sh/chart: flux2-0.19.2 name: helm-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap index b8d0182..36dd061 100644 --- a/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap @@ -9,7 +9,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 control-plane: controller - helm.sh/chart: flux2-0.19.1 + helm.sh/chart: flux2-0.19.2 name: image-automation-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap index 4c0015f..014eec2 100644 --- a/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap @@ -9,7 +9,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 control-plane: controller - helm.sh/chart: flux2-0.19.1 + helm.sh/chart: flux2-0.19.2 name: image-reflector-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap b/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap index 8fcb995..7172b97 100644 --- a/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 - helm.sh/chart: flux2-0.19.1 + helm.sh/chart: flux2-0.19.2 name: test1 namespace: NAMESPACE type: Opaque diff --git a/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap index 1ff07bd..2903a2f 100644 --- a/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap @@ -9,7 +9,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 control-plane: controller - helm.sh/chart: flux2-0.19.1 + helm.sh/chart: flux2-0.19.2 name: kustomize-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap index 244e4bd..f990824 100644 --- a/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap @@ -9,7 +9,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 control-plane: controller - helm.sh/chart: flux2-0.19.1 + helm.sh/chart: flux2-0.19.2 name: notification-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap index 50b9a7b..6233c73 100644 --- a/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap @@ -9,7 +9,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 0.30.2 control-plane: controller - helm.sh/chart: flux2-0.19.1 + helm.sh/chart: flux2-0.19.2 name: source-controller spec: replicas: 1