From 65661ab0d972eed3baf48b53db284e6d8d64bdfa Mon Sep 17 00:00:00 2001 From: nginx-bot <68849795+nginx-bot@users.noreply.github.com> Date: Tue, 26 Mar 2024 05:20:56 -0700 Subject: [PATCH 1/3] Release 3.5.0 (#5280) --- docs/content/technical-specifications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/technical-specifications.md b/docs/content/technical-specifications.md index 61f3b5ca8c..13d0198f69 100644 --- a/docs/content/technical-specifications.md +++ b/docs/content/technical-specifications.md @@ -24,7 +24,7 @@ We explicitly test NGINX Ingress Controller on a range of Kubernetes platforms f {{< bootstrap-table "table table-bordered table-striped table-responsive" >}} | NIC Version | Supported Kubernetes Version | NIC Helm Chart Version | NIC Operator Version | NGINX / NGINX Plus version | | --- | --- | --- | --- | --- | -| 3.5.0 | 1.29 - 1.23 | 1.2.0 | 2.1.2 | 1.25.4 / R31 P1 | +| 3.5.0 | 1.29 - 1.23 | 1.2.0 | 2.2.0 | 1.25.4 / R31 P1 | | 3.4.3 | 1.29 - 1.23 | 1.1.3 | 2.1.2 | 1.25.4 / R31 P1 | | 3.3.2 | 1.28 - 1.22 | 1.0.2 | 2.0.2 | 1.25.3 / R30 | | 3.2.1 | 1.27 - 1.22 | 0.18.1 | 1.5.1 | 1.25.2 / R30 | From cbaae97920f30f031e7dbd1cd214f1a5d3d21379 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Wed, 10 Apr 2024 16:06:13 +0100 Subject: [PATCH 2/3] republish helm chart 1.2.0 --- .github/workflows/publish-helm.yml | 95 ++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 .github/workflows/publish-helm.yml diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml new file mode 100644 index 0000000000..b44a781d17 --- /dev/null +++ b/.github/workflows/publish-helm.yml @@ -0,0 +1,95 @@ +name: Publish Helm Chart + +on: + push: + branches: + - republish-helm + +defaults: + run: + shell: bash + +concurrency: + group: ${{ github.ref_name }}-publish-helm + cancel-in-progress: true + +permissions: + contents: read + +jobs: + checks: + name: Checks and variables + runs-on: ubuntu-22.04 + outputs: + chart_version: ${{ steps.vars.outputs.chart_version }} + ic_version: ${{ steps.vars.outputs.ic_version }} + steps: + - name: Checkout Repository + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + with: + ref: refs/heads/release-3.5 + + - name: Output Variables + id: vars + run: | + source .github/data/version.txt + echo "ic_version=${IC_VERSION}" >> $GITHUB_OUTPUT + echo "chart_version=${HELM_CHART_VERSION}" >> $GITHUB_OUTPUT + cat $GITHUB_OUTPUT + + publish-helm: + name: Package and Publish Helm Chart + runs-on: ubuntu-22.04 + needs: [checks] + permissions: + contents: write # for pushing to Helm Charts repository + packages: write # for helm to push to GHCR + steps: + - name: Checkout Repository + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + with: + ref: refs/heads/release-3.5 + path: kic + + - name: Login to GitHub Container Registry + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: DockerHub Login + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Package + id: package + run: | + helm_versions="--app-version ${{ needs.checks.outputs.ic_version }} --version ${{ needs.checks.outputs.chart_version }}" + output=$(helm package ${helm_versions} kic/charts/nginx-ingress) + echo "path=$(basename -- $(echo $output | cut -d: -f2))" >> $GITHUB_OUTPUT + + - name: Push to OCI registries + run: | + helm push ${{ steps.package.outputs.path }} oci://ghcr.io/nginxinc/charts + helm push ${{ steps.package.outputs.path }} oci://registry-1.docker.io/nginxcharts + + - name: Checkout Repository + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + with: + repository: nginxinc/helm-charts + fetch-depth: 1 + token: ${{ secrets.NGINX_PAT }} + path: helm-charts + + - name: Push Helm Chart to Helm Charts Repository + run: | + mv ${{ steps.package.outputs.path }} ${{ github.workspace }}/helm-charts/stable/ + cd ${{ github.workspace }}/helm-charts + helm repo index stable --url https://helm.nginx.com/stable + git add -A + git -c user.name='NGINX Kubernetes Team' -c user.email='kubernetes@nginx.com' \ + commit -m "NGINX Ingress Controller - Release ${{ needs.checks.outputs.chart_version }}" + git push -u origin master From 2c350d8b59d87586993901da195822d7967aeb5b Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Wed, 10 Apr 2024 16:16:16 +0100 Subject: [PATCH 3/3] update to workflow_dispatch --- .github/workflows/publish-helm.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml index b44a781d17..f9780eb277 100644 --- a/.github/workflows/publish-helm.yml +++ b/.github/workflows/publish-helm.yml @@ -1,9 +1,11 @@ name: Publish Helm Chart on: - push: - branches: - - republish-helm + workflow_dispatch: + inputs: + branch: + description: "Release Helm chart from branch" + required: true defaults: run: @@ -27,7 +29,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: - ref: refs/heads/release-3.5 + ref: refs/heads/${{ inputs.branch }} - name: Output Variables id: vars @@ -48,7 +50,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: - ref: refs/heads/release-3.5 + ref: refs/heads/${{ inputs.branch }} path: kic - name: Login to GitHub Container Registry