Skip to content

Commit 88d3ee8

Browse files
authored
feat: Bump default k8s version for tests to v1.29.6 (#784)
**What problem does this PR solve?**: **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent d51805f commit 88d3ee8

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ jobs:
8282
NUTANIX_INSECURE: false
8383
NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ${{ vars.NUTANIX_PRISM_ELEMENT_CLUSTER_NAME }}
8484
NUTANIX_SUBNET_NAME: ${{ vars.NUTANIX_SUBNET_NAME }}
85-
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: ${{ vars.NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME }}
8685
NUTANIX_STORAGE_CONTAINER_NAME: ${{ vars.NUTANIX_STORAGE_CONTAINER_NAME }}
86+
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.29.6-20240716233458
8787

8888
- if: success() || failure() # always run even if the previous step fails
8989
name: Publish e2e test report

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For example, the following command will create a Docker cluster with Cilium CNI
4444
```shell
4545
export CLUSTER_NAME=docker-cluster-cilium-helm-addon
4646
export CLUSTER_FILE=examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml
47-
export KUBERNETES_VERSION=v1.29.5
47+
export KUBERNETES_VERSION=v1.29.6
4848
```
4949

5050
```shell

make/go.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ E2E_PARALLEL_NODES ?= $(if $(filter $(E2E_DRYRUN),true),1,$(shell nproc --ignore
8080
E2E_FLAKE_ATTEMPTS ?= 1
8181
E2E_CONF_FILE ?= $(REPO_ROOT)/test/e2e/config/caren.yaml
8282
E2E_CONF_FILE_ENVSUBST ?= $(basename $(E2E_CONF_FILE))-envsubst.yaml
83-
export E2E_DEFAULT_KUBERNETES_VERSION ?= v1.29.5
83+
export E2E_DEFAULT_KUBERNETES_VERSION ?= v1.29.6
8484
ARTIFACTS ?= ${REPO_ROOT}/_artifacts
8585

8686
.PHONY: e2e-test

test/e2e/config/caren.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ variables:
167167
KUBERNETES_VERSION: "${E2E_DEFAULT_KUBERNETES_VERSION}"
168168
# Override Kubernetes version for test workload clusters for specific providers by setting the env variables
169169
# `KUBERNETES_VERSION_<PROVIDER>`, where `<PROVIDER>` is the uppercase provider name, e.g.
170-
# `KUBERNETES_VERSION_DOCKER: v1.29.5`.
170+
# `KUBERNETES_VERSION_DOCKER: v1.29.6`.
171171
# KUBERNETES_VERSION_DOCKER: "${KINDEST_IMAGE_TAG}"
172172
SERVICE_CIDR: "10.128.0.0/12"
173173
POD_CIDR: "192.168.0.0/16"
@@ -200,7 +200,7 @@ variables:
200200
# # Name of the Prism Element cluster.
201201
# NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ""
202202
# # Name of the OS image pre-uploaded in PC.
203-
# NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: ""
203+
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-1.29.6-20240704044125
204204
# # Name of the subnet to be assigned to the VMs.
205205
# NUTANIX_SUBNET_NAME: ""
206206
# # Name of the storage container to CSI driver

test/e2e/e2e_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func init() {
7575
flag.StringVar(
7676
&bootstrapKubernetesVersion,
7777
"e2e.bootstrap-kind-version",
78-
"v1.29.5",
78+
"v1.29.6",
7979
"the version of the image used in bootstrap cluster",
8080
)
8181
}

0 commit comments

Comments
 (0)