Merge pull request #258 from weizhouapache/e2e-upgrade-k8s-versions

e2e: upgrade k8s versions in test/e2e/config/cloudstack.yaml

Author: k8s-ci-robot

Makefile

@@ -270,7 +270,7 @@ test: generate-deepcopy-test generate-manifest-test generate-mocks lint $(GINKGO
 	@$(GINKGO_V2) --label-filter="!integ" --cover -coverprofile cover.out --covermode=atomic -v ./api/... ./controllers/... ./pkg/...; EXIT_STATUS=$$?;\
 		./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
 
-CLUSTER_TEMPLATES_INPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack/v1beta*/*/cluster-template* test/e2e/data/infrastructure-cloudstack/*/bases/* -type f)
+CLUSTER_TEMPLATES_INPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack/v1beta*/cluster-template* test/e2e/data/infrastructure-cloudstack/*/bases/* -type f)
 CLUSTER_TEMPLATES_OUTPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack -type d -name "cluster-template*" -exec echo {}.yaml \;)
 .PHONY: e2e-cluster-templates
 e2e-cluster-templates: $(CLUSTER_TEMPLATES_OUTPUT_FILES) ## Generate cluster template files for e2e testing.

test/e2e/config/cloudstack.yaml

@@ -110,9 +110,9 @@ providers:
 
 variables:
   KUBERNETES_VERSION_MANAGEMENT: "v1.25.3"
-  KUBERNETES_VERSION: "v1.22.6"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.22.6"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.23.3"
+  KUBERNETES_VERSION: "v1.24.14"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.23.3"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.24.14"
   CNI: "./data/cni/kindnet.yaml"
   IP_FAMILY: "IPv4"
   NODE_DRAIN_TIMEOUT: "60s"
@@ -138,9 +138,9 @@ variables:
   CLOUDSTACK_IMPOSSIBLE_CONTROL_PLANE_MACHINE_OFFERING: "Impossible Instance"
   CLOUDSTACK_WORKER_MACHINE_OFFERING: "Medium Instance"
   CLOUDSTACK_IMPOSSIBLE_WORKER_MACHINE_OFFERING: "Impossible Instance"
-  CLOUDSTACK_TEMPLATE_NAME: ubuntu-2004-kube-v1.22.6-kvm
-  CLOUDSTACK_UPGRADE_FROM_TEMPLATE_NAME: ubuntu-2004-kube-v1.22.6-kvm
-  CLOUDSTACK_UPGRADE_TO_TEMPLATE_NAME: ubuntu-2004-kube-v1.23.3-kvm
+  CLOUDSTACK_TEMPLATE_NAME: ubuntu-2004-kube-v1.24.14-kvm
+  CLOUDSTACK_UPGRADE_FROM_TEMPLATE_NAME: ubuntu-2004-kube-v1.23.3-kvm
+  CLOUDSTACK_UPGRADE_TO_TEMPLATE_NAME: ubuntu-2004-kube-v1.24.14-kvm
   CLOUDSTACK_INVALID_TEMPLATE_NAME: templateXXXX
   CLOUDSTACK_SSH_KEY_NAME: CAPCKeyPair6