diff --git a/.github/workflows/ensure-capi-images.yaml b/.github/workflows/ensure-capi-images.yaml index 3f81f8d..041fdd6 100644 --- a/.github/workflows/ensure-capi-images.yaml +++ b/.github/workflows/ensure-capi-images.yaml @@ -7,10 +7,6 @@ on: description: The Git ref under test. required: true outputs: - kube-1-27-image: - value: ${{ jobs.produce_outputs.outputs.kube-1-27-image }} - kube-1-27-version: - value: ${{ jobs.produce_outputs.outputs.kube-1-27-version }} kube-1-28-image: value: ${{ jobs.produce_outputs.outputs.kube-1-28-image }} kube-1-28-version: @@ -19,6 +15,10 @@ on: value: ${{ jobs.produce_outputs.outputs.kube-1-29-image }} kube-1-29-version: value: ${{ jobs.produce_outputs.outputs.kube-1-29-version }} + kube-1-30-image: + value: ${{ jobs.produce_outputs.outputs.kube-1-30-image }} + kube-1-30-version: + value: ${{ jobs.produce_outputs.outputs.kube-1-30-version }} jobs: image_manifest: @@ -45,14 +45,14 @@ jobs: fail-fast: false matrix: include: - - name: kube-1-27 - image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-27-jammy }} - skip: ${{ github.event.pull_request.draft }} - name: kube-1-28 image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-28-jammy }} skip: ${{ github.event.pull_request.draft }} - name: kube-1-29 image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-29-jammy }} + skip: ${{ github.event.pull_request.draft }} + - name: kube-1-30 + image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-30-jammy }} skip: false steps: - name: Checkout @@ -101,12 +101,12 @@ jobs: runs-on: ubuntu-latest needs: [ensure_image] outputs: - kube-1-27-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-27 }} - kube-1-27-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-27 }} kube-1-28-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-28 }} kube-1-28-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-28 }} kube-1-29-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-29 }} kube-1-29-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-29 }} + kube-1-30-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-30 }} + kube-1-30-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-30 }} steps: - name: Read matrix outputs id: matrix-outputs diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f7f297a..6d3bbc8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -96,17 +96,17 @@ jobs: timeout-minutes: 180 if: ${{ vars.CI_S3_LOCK_HOST != '' }} - - name: Test clean Kubernetes 1.29 deployment + - name: Test clean Kubernetes 1.30 deployment uses: ./.github/actions/upgrade-and-test with: name: ci-${{ github.run_id }}-${{ github.job }} chart-version: ${{ inputs.chart-version }} - kubernetes-version: ${{ fromJson(inputs.images).kube-1-29-version }} - image-id: ${{ fromJson(inputs.images).kube-1-29-image }} + kubernetes-version: ${{ fromJson(inputs.images).kube-1-30-version }} + image-id: ${{ fromJson(inputs.images).kube-1-30-image }} sonobuoy-mode: ${{ inputs.tests-full && 'certified-conformance' || 'quick' }} sonobuoy-upload: ${{ inputs.tests-full && 'yes' || 'no' }} - - name: Delete Kubernetes 1.29 deployment + - name: Delete Kubernetes 1.30 deployment run: helm delete ci-${{ github.run_id }}-${{ github.job }} --wait if: ${{ always() }} @@ -194,13 +194,13 @@ jobs: timeout-minutes: 180 if: ${{ vars.CI_S3_LOCK_HOST != '' }} - - name: Deploy Kubernetes 1.29 for etcd volume test + - name: Deploy Kubernetes 1.30 for etcd volume test uses: ./.github/actions/upgrade-and-test with: name: ci-${{ github.run_id }}-${{ github.job }} chart-version: ${{ inputs.chart-version }} - kubernetes-version: ${{ fromJson(inputs.images).kube-1-29-version }} - image-id: ${{ fromJson(inputs.images).kube-1-29-image }} + kubernetes-version: ${{ fromJson(inputs.images).kube-1-30-version }} + image-id: ${{ fromJson(inputs.images).kube-1-30-image }} - name: Delete etcd volume test deployment run: helm delete ci-${{ github.run_id }}-${{ github.job }} --wait @@ -287,15 +287,7 @@ jobs: timeout-minutes: 180 if: ${{ vars.CI_S3_LOCK_HOST != '' }} - - name: Deploy Kubernetes 1.27 for Kubernetes upgrade test - uses: ./.github/actions/upgrade-and-test - with: - name: ci-${{ github.run_id }}-${{ github.job }} - chart-version: ${{ inputs.chart-version }} - kubernetes-version: ${{ fromJson(inputs.images).kube-1-27-version }} - image-id: ${{ fromJson(inputs.images).kube-1-27-image }} - - - name: Upgrade to Kubernetes 1.28 + - name: Deploy Kubernetes 1.28 for Kubernetes upgrade test uses: ./.github/actions/upgrade-and-test with: name: ci-${{ github.run_id }}-${{ github.job }} @@ -311,6 +303,14 @@ jobs: kubernetes-version: ${{ fromJson(inputs.images).kube-1-29-version }} image-id: ${{ fromJson(inputs.images).kube-1-29-image }} + - name: Upgrade to Kubernetes 1.30 + uses: ./.github/actions/upgrade-and-test + with: + name: ci-${{ github.run_id }}-${{ github.job }} + chart-version: ${{ inputs.chart-version }} + kubernetes-version: ${{ fromJson(inputs.images).kube-1-30-version }} + image-id: ${{ fromJson(inputs.images).kube-1-30-image }} + - name: Delete Kubernetes upgrade deployment run: helm delete ci-${{ github.run_id }}-${{ github.job }} --wait if: ${{ always() }} diff --git a/dependencies.json b/dependencies.json index 6199d8c..757955a 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,6 +1,6 @@ { "addon-provider": "0.5.6", - "azimuth-images": "0.9.0", + "azimuth-images": "0.10.0", "cluster-api": "v1.7.1", "cluster-api-janitor-openstack": "0.5.6", "cluster-api-provider-openstack": "v0.10.1",