diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c1742498c..26e0c2b62 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -64,19 +64,22 @@ jobs: strategy: matrix: config: - - {"provider": "Nutanix", "kubernetesVersion": "v1.29.6"} + - {"provider": "Nutanix", "kubernetesVersion": "v1.29.6", "osImage": "nkp-rocky-9.4-release-1.29.6-20240816215147"} + - {"provider": "Nutanix", "kubernetesVersion": "v1.30.5", "osImage": "nkp-rocky-9.4-release-1.30.5-20240930171619"} - {"provider": "Docker", "kubernetesVersion": "v1.29.8"} - - {"provider": "Docker", "kubernetesVersion": "v1.30.4"} + - {"provider": "Docker", "kubernetesVersion": "v1.30.5"} - {"provider": "Docker", "kubernetesVersion": "v1.31.0"} # Uncomment below once we have the ability to run e2e tests on other providers from GHA. # - {"provider": "AWS", "kubernetesVersion": "v1.29.6"} fail-fast: false + name: e2e-quick-start (${{ matrix.config.provider }}, ${{ matrix.config.kubernetesVersion }}) uses: ./.github/workflows/e2e.yml with: focus: Quick start provider: ${{ matrix.config.provider }} kubernetes-version: ${{ matrix.config.kubernetesVersion }} runs-on: ${{ matrix.config.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }} + os-image: ${{ matrix.config.provider == 'Nutanix' && matrix.config.osImage || '' }} secrets: inherit permissions: contents: read @@ -93,7 +96,7 @@ jobs: matrix: config: - {"provider": "Docker", "kubernetesVersion": "v1.29.8"} - - {"provider": "Docker", "kubernetesVersion": "v1.30.4"} + - {"provider": "Docker", "kubernetesVersion": "v1.30.5"} - {"provider": "Docker", "kubernetesVersion": "v1.31.0"} # Uncomment below once we have the ability to run e2e tests on other providers from GHA. # - {"provider": "Nutanix", "kubernetesVersion": "v1.29.6"} diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 94d902032..6b4c0ec31 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -22,6 +22,10 @@ on: description: The version of Kubernetes to test with type: string required: true + os-image: + description: The OS image to use for the machine template + type: string + required: false jobs: e2e-test: @@ -87,6 +91,7 @@ jobs: NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ${{ vars.NUTANIX_PRISM_ELEMENT_CLUSTER_NAME }} NUTANIX_SUBNET_NAME: ${{ vars.NUTANIX_SUBNET_NAME }} NUTANIX_STORAGE_CONTAINER_NAME: ${{ vars.NUTANIX_STORAGE_CONTAINER_NAME }} + NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: ${{ inputs.os-image }} KINDEST_IMAGE_TAG: ${{ inputs.kubernetes-version }} E2E_KUBERNETES_VERSION: ${{ inputs.kubernetes-version }} diff --git a/README.md b/README.md index eab99eb57..ed7218874 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ For example, the following command will create a Docker cluster with Cilium CNI ```shell export CLUSTER_NAME=docker-cluster-cilium-helm-addon export CLUSTER_FILE=examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml -export KUBERNETES_VERSION=v1.30.4 +export KUBERNETES_VERSION=v1.30.5 ``` ```shell diff --git a/make/kind.mk b/make/kind.mk index fa58ce31c..870892a64 100644 --- a/make/kind.mk +++ b/make/kind.mk @@ -10,7 +10,7 @@ KINDEST_NODE_IMAGE ?= ghcr.io/mesosphere/kind-node KINDEST_NODE_VERSION_v1.27 ?= v1.27.16 KINDEST_NODE_VERSION_v1.28 ?= v1.28.13 KINDEST_NODE_VERSION_v1.29 ?= v1.29.8 -KINDEST_NODE_VERSION_v1.30 ?= v1.30.4 +KINDEST_NODE_VERSION_v1.30 ?= v1.30.5 KINDEST_NODE_VERSION_v1.31 ?= v1.31.0 # Allow easy override of Kubernetes version to use via `make KIND_KUBERNETES_VERSION=v1.23` to use in CI KIND_KUBERNETES_VERSION ?= v1.31 diff --git a/test/e2e/config/caren.yaml b/test/e2e/config/caren.yaml index e8a3235aa..7d4d3119e 100644 --- a/test/e2e/config/caren.yaml +++ b/test/e2e/config/caren.yaml @@ -201,7 +201,7 @@ variables: # # Name of the Prism Element cluster. # NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: "" # # Name of the OS image pre-uploaded in PC. - NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.29.6-20240816215147 + NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.30.5-20240930171619 # # Name of the subnet to be assigned to the VMs. # NUTANIX_SUBNET_NAME: "" # # Name of the storage container to CSI driver diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 476e801f9..92ae2814c 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -69,7 +69,7 @@ func init() { flag.StringVar( &bootstrapKubernetesVersion, "e2e.bootstrap-kind-version", - "v1.29.6", + "v1.30.5", "the version of the image used in bootstrap cluster", ) }