Merge pull request #1581 from FloatXD/e2e-up-21

[Test] Update the K8S version in upgrade test && Cilium pod check

Author: FloatXD

hack/run-nightly-cluster-e2e.sh

@@ -146,26 +146,26 @@ func_prepare_config_yaml "${SOURCE_CONFIG_PATH}"  "${dest_config_path}"
 CLUSTER_OPERATION_NAME1="cluster1-install-"`date "+%H-%M-%S"`
 
 # set vars-conf-cm.yml
-sed -i "s/1.31.6/1.31.0/"  "${dest_config_path}"/vars-conf-cm.yml
+sed -i "s/1.31.6/1.31.6/"  "${dest_config_path}"/vars-conf-cm.yml
 
 sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME1}/"  "${dest_config_path}"/kubeanClusterOps.yml
 
 
-## prepare cluster upgrade job yml --> upgrade from v1.31.0 to v1.31.2
+## prepare cluster upgrade job yml --> upgrade from v1.31.6 to v1.31.9
 dest_config_path="${REPO_ROOT}"/test/kubean_sonobouy_nightlye2e/e2e-upgrade-cluster-y/
 func_prepare_config_yaml "${SOURCE_CONFIG_PATH}"  "${dest_config_path}"
 CLUSTER_OPERATION_NAME2="cluster1-upgrade-y"
 sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME2}/"  "${dest_config_path}"/kubeanClusterOps.yml
 sed -i "s/cluster.yml/upgrade-cluster.yml/" "${dest_config_path}"/kubeanClusterOps.yml
-sed -i "s/1.31.6/1.31.2/"  "${dest_config_path}"/vars-conf-cm.yml
+sed -i "s/1.31.6/1.31.9/"  "${dest_config_path}"/vars-conf-cm.yml
 
-## prepare cluster upgrade job yml --> upgrade from v1.31.2 to v1.31.6
+## prepare cluster upgrade job yml --> upgrade from v1.31.9 to v1.32.1
 dest_config_path="${REPO_ROOT}"/test/kubean_sonobouy_nightlye2e/e2e-upgrade-cluster-z/
 func_prepare_config_yaml "${SOURCE_CONFIG_PATH}"  "${dest_config_path}"
 CLUSTER_OPERATION_NAME3="cluster1-upgrade-z"
 sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME3}/"  "${dest_config_path}"/kubeanClusterOps.yml
 sed -i "s/cluster.yml/upgrade-cluster.yml/" "${dest_config_path}"/kubeanClusterOps.yml
-sed -i "s/1.31.6/1.31.6/"  "${dest_config_path}"/vars-conf-cm.yml
+sed -i "s/1.31.6/1.32.1/"  "${dest_config_path}"/vars-conf-cm.yml
 
 ginkgo -v -race -timeout=6h --fail-fast ./test/kubean_sonobouy_nightlye2e/  -- --kubeconfig="${KUBECONFIG_FILE}" \
           --clusterOperationName="${CLUSTER_OPERATION_NAME1}"  --vmipaddr="${vm_ip_addr1}" --vmipaddr2="${vm_ip_addr2}" \

test/kubean_cilium_cluster_e2e/create_cilium_cluster_test.go

@@ -85,14 +85,27 @@ var _ = ginkgo.Describe("create cilium clusters one master and one worker", func
 			gomega.ExpectWithOffset(2, err).NotTo(gomega.HaveOccurred(), "Failed new cluster1Client")
 
 			podList, _ := cluster1Client.CoreV1().Pods("kube-system").List(context.TODO(), metav1.ListOptions{})
-			ciliumPodNumber := 0
+			deploymentList, _ := cluster1Client.AppsV1().Deployments("kube-system").List(context.TODO(), metav1.ListOptions{})
+			daemonsetList, _ := cluster1Client.AppsV1().DaemonSets("kube-system").List(context.TODO(), metav1.ListOptions{})
+
 			for _, pod := range podList.Items {
 				if strings.Contains(pod.ObjectMeta.Name, "cilium") {
 					gomega.Expect(string(pod.Status.Phase)).To(gomega.Equal("Running"))
-					ciliumPodNumber += 1
 				}
 			}
-			gomega.Expect(ciliumPodNumber).To(gomega.Equal(4))
+			for _, dm := range deploymentList.Items {
+				if strings.Contains(dm.ObjectMeta.Name, "cilium") {
+					fmt.Println(dm.Name, "======>", dm.Status.Replicas)
+					gomega.Expect(dm.Status.ReadyReplicas).To(gomega.Equal(dm.Status.AvailableReplicas))
+				}
+			}
+			for _, ds := range daemonsetList.Items {
+				if strings.Contains(ds.ObjectMeta.Name, "cilium") {
+					fmt.Println(ds.Name, "======>", ds.Status.CurrentNumberScheduled, "===", ds.Status.DesiredNumberScheduled)
+					gomega.Expect(ds.Status.DesiredNumberScheduled).To(gomega.Equal(ds.Status.CurrentNumberScheduled))
+				}
+			}
+
 		})
 
 		ginkgo.It("create pod1, pod2, pod3", func() {

test/tools/config.go

@@ -32,9 +32,9 @@ const (
 )
 
 const (
-	OriginK8Version             = "v1.31.0"
-	UpgradeK8Version_Y          = "v1.31.2"
-	UpgradeK8Version_Z          = "v1.31.6"
+	OriginK8Version             = "v1.31.6"
+	UpgradeK8Version_Y          = "v1.31.9"
+	UpgradeK8Version_Z          = "v1.32.1"
 	NginxAlpha                  = "release-ci.daocloud.io/kubean/nginx:alpine"
 	E2eInstallClusterYamlFolder = "e2e-install-cluster"
 )