fix chart install/upgrade e2e (#2426)

Author: zhangzujian

.github/workflows/build-x86-image.yaml

@@ -763,11 +763,7 @@ jobs:
           sudo chown -R $(id -un). ~/.kube/
 
       - name: Install Kube-OVN
-        run: |
-          make kind-install-chart
-          kubectl rollout status deployment/ovn-central -n kube-system --timeout 300s
-          kubectl rollout status deployment/kube-ovn-controller -n kube-system --timeout 300s
-          kubectl rollout status daemonset/kube-ovn-cni -n kube-system --timeout 300s
+        run: make kind-install-chart
 
       - name: Cleanup
         run: sh dist/images/cleanup.sh

Makefile

@@ -286,26 +286,33 @@ kind-untaint-control-plane:
 		done; \
 	done
 
-.PHONY: kind-upgrade-chart
-kind-upgrade-chart:
-	$(eval MASTERNODES = $(shell docker exec -i kube-ovn-control-plane kubectl get nodes -l node-role.kubernetes.io/control-plane=""  -o jsonpath='{.items[*].status.addresses[].address}'))
-	$(eval EMPTY := )
-	$(eval SPACE := $(EMPTY))
-	$(eval MASTERS = $(subst SPACE,,,$(strip $$(MASTERNODES))))
-	helm upgrade --debug kubeovn ./kubeovn-helm --set MASTER_NODES=$(MASTERNODES)
-	kubectl -n kube-system get pods -o wide
-
 .PHONY: kind-install-chart
 kind-install-chart: kind-load-image kind-untaint-control-plane
-	kubectl label no -lbeta.kubernetes.io/os=linux kubernetes.io/os=linux --overwrite
-	kubectl label no -lnode-role.kubernetes.io/control-plane  kube-ovn/role=master --overwrite
-	kubectl label no -lovn.kubernetes.io/ovs_dp_type!=userspace ovn.kubernetes.io/ovs_dp_type=kernel  --overwrite
-	$(eval MASTERNODES = $(shell docker exec -i kube-ovn-control-plane kubectl get nodes -l node-role.kubernetes.io/control-plane=""  -o jsonpath='{.items[*].status.addresses[].address}'))
-	$(eval EMPTY := )
-	$(eval SPACE := $(EMPTY))
-	$(eval MASTERS = $(subst SPACE,,,$(strip $$(MASTERNODES))))
-	helm install kubeovn ./kubeovn-helm --set MASTER_NODES=$(MASTERNODES)
-	kubectl -n kube-system get pods -o wide
+	kubectl label node -lbeta.kubernetes.io/os=linux kubernetes.io/os=linux --overwrite
+	kubectl label node -lnode-role.kubernetes.io/control-plane kube-ovn/role=master --overwrite
+	kubectl label node -lovn.kubernetes.io/ovs_dp_type!=userspace ovn.kubernetes.io/ovs_dp_type=kernel --overwrite
+	ips=$$(kubectl get node -lkube-ovn/role=master --no-headers -o wide | awk '{print $$6}') && \
+	helm install kubeovn ./kubeovn-helm \
+		--set global.images.kubeovn.tag=$(VERSION) \
+		--set replicaCount=$$(echo $$ips | awk '{print NF}') \
+		--set MASTER_NODES="$$(echo $$ips | tr \\n ',' | sed -e 's/,$$//' -e 's/,/\\,/g')"
+	kubectl rollout status deployment/ovn-central -n kube-system --timeout 300s
+	kubectl rollout status deployment/kube-ovn-controller -n kube-system --timeout 120s
+	kubectl rollout status daemonset/kube-ovn-cni -n kube-system --timeout 120s
+	kubectl rollout status daemonset/kube-ovn-pinger -n kube-system --timeout 120s
+	kubectl rollout status deployment/coredns -n kube-system --timeout 60s
+
+.PHONY: kind-upgrade-chart
+kind-upgrade-chart: kind-load-image
+	$(eval OVN_DB_IPS = $(shell kubectl get no -lkube-ovn/role=master --no-headers -o wide | awk '{print $$6}' | tr \\n ',' | sed -e 's/,$$//' -e 's/,/\\,/g'))
+	helm upgrade kubeovn ./kubeovn-helm \
+		--set global.images.kubeovn.tag=$(VERSION) \
+		--set replicaCount=$$(echo $(OVN_DB_IPS) | awk -F ',' '{print NF}') \
+		--set MASTER_NODES='$(OVN_DB_IPS)'
+	kubectl rollout status deployment/ovn-central -n kube-system --timeout 300s
+	kubectl rollout status deployment/kube-ovn-controller -n kube-system --timeout 300s
+	kubectl rollout status daemonset/kube-ovn-cni -n kube-system --timeout 120s
+	kubectl rollout status daemonset/kube-ovn-pinger -n kube-system --timeout 120s
 
 .PHONY: kind-install
 kind-install: kind-load-image

kubeovn-helm/templates/kube-ovn-crd.yaml

@@ -867,6 +867,10 @@ spec:
                   type: string
                 udpSessionLoadBalancer:
                   type: string
+                sctpLoadBalancer:
+                  type: string
+                sctpSessionLoadBalancer:
+                  type: string
               type: object
           type: object
       served: true

kubeovn-helm/templates/ovn-CR.yaml

@@ -57,6 +57,7 @@ rules:
       - watch
       - patch
       - update
+      - delete
   - apiGroups:
       - ""
       - networking.k8s.io

kubeovn-helm/templates/post-upgrade.yaml

@@ -53,4 +53,14 @@ spec:
       containers:
         - name: post-upgrade-job
           image: "{{ .Values.global.registry.address}}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }}"
-          command: ["/kube-ovn/upgrade-ovs.sh"]
+          command:
+            - sh
+            - -c
+            - /kube-ovn/upgrade-ovs.sh 2>&1 | tee -a /var/log/kube-ovn/upgrade-ovs.log
+          volumeMounts:
+            - mountPath: /var/log/kube-ovn
+              name: kube-ovn-log
+      volumes:
+        - name: kube-ovn-log
+          hostPath:
+            path: /var/log/kube-ovn