Skip to content

feat: Bump default k8s version for tests to v1.29.6 #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 18, 2024
Merged

feat: Bump default k8s version for tests to v1.29.6 #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed41afa
feat: Bump default k8s version for tests to v1.29.6
jimmidyson Jul 4, 2024
19c4b1d
fixup! ci: Specify Nutanix image in e2e config
jimmidyson Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ jobs:
NUTANIX_INSECURE: false
NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ${{ vars.NUTANIX_PRISM_ELEMENT_CLUSTER_NAME }}
NUTANIX_SUBNET_NAME: ${{ vars.NUTANIX_SUBNET_NAME }}
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: ${{ vars.NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME }}
NUTANIX_STORAGE_CONTAINER_NAME: ${{ vars.NUTANIX_STORAGE_CONTAINER_NAME }}
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.29.6-20240716233458

- if: success() || failure() # always run even if the previous step fails
name: Publish e2e test report
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.29.5
export KUBERNETES_VERSION=v1.29.6
```

```shell
Expand Down
2 changes: 1 addition & 1 deletion make/go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ E2E_PARALLEL_NODES ?= $(if $(filter $(E2E_DRYRUN),true),1,$(shell nproc --ignore
E2E_FLAKE_ATTEMPTS ?= 1
E2E_CONF_FILE ?= $(REPO_ROOT)/test/e2e/config/caren.yaml
E2E_CONF_FILE_ENVSUBST ?= $(basename $(E2E_CONF_FILE))-envsubst.yaml
export E2E_DEFAULT_KUBERNETES_VERSION ?= v1.29.5
export E2E_DEFAULT_KUBERNETES_VERSION ?= v1.29.6
ARTIFACTS ?= ${REPO_ROOT}/_artifacts

.PHONY: e2e-test
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config/caren.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ variables:
KUBERNETES_VERSION: "${E2E_DEFAULT_KUBERNETES_VERSION}"
# Override Kubernetes version for test workload clusters for specific providers by setting the env variables
# `KUBERNETES_VERSION_<PROVIDER>`, where `<PROVIDER>` is the uppercase provider name, e.g.
# `KUBERNETES_VERSION_DOCKER: v1.29.5`.
# `KUBERNETES_VERSION_DOCKER: v1.29.6`.
# KUBERNETES_VERSION_DOCKER: "${KINDEST_IMAGE_TAG}"
SERVICE_CIDR: "10.128.0.0/12"
POD_CIDR: "192.168.0.0/16"
Expand Down Expand Up @@ -200,7 +200,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: ""
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-1.29.6-20240704044125
# # Name of the subnet to be assigned to the VMs.
# NUTANIX_SUBNET_NAME: ""
# # Name of the storage container to CSI driver
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func init() {
flag.StringVar(
&bootstrapKubernetesVersion,
"e2e.bootstrap-kind-version",
"v1.29.5",
"v1.29.6",
"the version of the image used in bootstrap cluster",
)
}
Expand Down
Loading