diff --git a/.github/workflows/ensure-capi-images.yaml b/.github/workflows/ensure-capi-images.yaml index 18f8e03..1beb865 100644 --- a/.github/workflows/ensure-capi-images.yaml +++ b/.github/workflows/ensure-capi-images.yaml @@ -2,10 +2,6 @@ name: Ensure CAPI images on: workflow_call: outputs: - kube-1-25-image: - value: ${{ jobs.produce_outputs.outputs.kube-1-25-image }} - kube-1-25-version: - value: ${{ jobs.produce_outputs.outputs.kube-1-25-version }} kube-1-26-image: value: ${{ jobs.produce_outputs.outputs.kube-1-26-image }} kube-1-26-version: @@ -14,6 +10,10 @@ on: 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: + value: ${{ jobs.produce_outputs.outputs.kube-1-28-version }} jobs: image_manifest: @@ -38,14 +38,14 @@ jobs: fail-fast: false matrix: include: - - name: kube-1-25 - image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-25-focal }} - skip: ${{ github.event.pull_request.draft }} - name: kube-1-26 image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-26-focal }} skip: ${{ github.event.pull_request.draft }} - name: kube-1-27 image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-27-focal }} + skip: ${{ github.event.pull_request.draft }} + - name: kube-1-28 + image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-28-focal }} skip: false steps: - name: Checkout @@ -92,12 +92,12 @@ jobs: runs-on: ubuntu-latest needs: [ensure_image] outputs: - kube-1-25-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-25 }} - kube-1-25-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-25 }} kube-1-26-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-26 }} kube-1-26-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-26 }} 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 }} steps: - name: Read matrix outputs id: matrix-outputs diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c5aa486..348ecd4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -172,16 +172,16 @@ jobs: # For the smoke test, we do a clean deployment of the latest supported version ##### - - name: Test clean Kubernetes 1.27 deployment + - name: Test clean Kubernetes 1.28 deployment uses: ./.github/actions/upgrade-and-test with: name: ci-${{ github.run_id }}-kube-latest - kubernetes-version: ${{ fromJson(inputs.images).kube-1-27-version }} - image-id: ${{ fromJson(inputs.images).kube-1-27-image }} + kubernetes-version: ${{ fromJson(inputs.images).kube-1-28-version }} + image-id: ${{ fromJson(inputs.images).kube-1-28-image }} sonobuoy-upload: "yes" if: ${{ !inputs.tests-full }} - - name: Delete Kubernetes 1.27 deployment + - name: Delete Kubernetes 1.28 deployment run: helm delete ci-${{ github.run_id }}-kube-latest --wait if: ${{ !inputs.tests-full && always() }} @@ -197,12 +197,12 @@ jobs: echo "tag-name=${TAG_NAME}" >> "$GITHUB_OUTPUT" if: ${{ inputs.tests-full }} - - name: Deploy Kubernetes 1.27 with latest tag for chart upgrade test + - name: Deploy Kubernetes 1.28 with latest tag for chart upgrade test uses: ./.github/actions/upgrade-and-test with: name: ci-${{ github.run_id }}-chart-upgrade - kubernetes-version: ${{ fromJson(inputs.images).kube-1-27-version }} - image-id: ${{ fromJson(inputs.images).kube-1-27-image }} + kubernetes-version: ${{ fromJson(inputs.images).kube-1-28-version }} + image-id: ${{ fromJson(inputs.images).kube-1-28-image }} chart-version: ${{ steps.latest-tag.outputs.tag-name }} if: ${{ inputs.tests-full }} @@ -210,8 +210,8 @@ jobs: uses: ./.github/actions/upgrade-and-test with: name: ci-${{ github.run_id }}-chart-upgrade - kubernetes-version: ${{ fromJson(inputs.images).kube-1-27-version }} - image-id: ${{ fromJson(inputs.images).kube-1-27-image }} + kubernetes-version: ${{ fromJson(inputs.images).kube-1-28-version }} + image-id: ${{ fromJson(inputs.images).kube-1-28-image }} if: ${{ inputs.tests-full }} - name: Delete chart upgrade deployment @@ -223,15 +223,7 @@ jobs: # This will run a sonobuoy smoke test after every step with a full test at the end ##### - - name: Deploy Kubernetes 1.25 for Kubernetes upgrade test - uses: ./.github/actions/upgrade-and-test - with: - name: ci-${{ github.run_id }}-kube-upgrade - kubernetes-version: ${{ fromJson(inputs.images).kube-1-25-version }} - image-id: ${{ fromJson(inputs.images).kube-1-25-image }} - if: ${{ inputs.tests-full }} - - - name: Upgrade to Kubernetes 1.26 + - name: Deploy Kubernetes 1.26 for Kubernetes upgrade test uses: ./.github/actions/upgrade-and-test with: name: ci-${{ github.run_id }}-kube-upgrade @@ -245,6 +237,14 @@ jobs: name: ci-${{ github.run_id }}-kube-upgrade kubernetes-version: ${{ fromJson(inputs.images).kube-1-27-version }} image-id: ${{ fromJson(inputs.images).kube-1-27-image }} + if: ${{ inputs.tests-full }} + + - name: Upgrade to Kubernetes 1.28 + uses: ./.github/actions/upgrade-and-test + with: + name: ci-${{ github.run_id }}-kube-upgrade + kubernetes-version: ${{ fromJson(inputs.images).kube-1-28-version }} + image-id: ${{ fromJson(inputs.images).kube-1-28-image }} sonobuoy-mode: full sonobuoy-upload: "yes" if: ${{ inputs.tests-full }}