some fixes for chart v2 (#5196)

zhangzujian · web-flow · commit 056d7944ff78 · 2025-04-29T15:55:26.000+08:00
Signed-off-by: zhangzujian &lt;zhangzujian.7@gmail.com&gt;
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -1573,7 +1573,7 @@ jobs:
         run: make check-kube-ovn-pod-restarts
 
       - name: Uninstall Kube-OVN
-        run: make kind-uninstall-chart
+        run: make uninstall-chart
 
   underlay-logical-gateway-installation-test:
     name: Underlay Logical Gateway Installation Test
diff --git a/Makefile b/Makefile
@@ -172,10 +172,8 @@ check-kube-ovn-pod-restarts:
 	bash hack/ci-check-crash.sh
 
 .PHONY: install-chart
-install-chart: untaint-control-plane
-	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
+install-chart:
+	kubectl label node --overwrite -l node-role.kubernetes.io/control-plane kube-ovn/role=master
 	helm install kubeovn ./charts/kube-ovn --wait \
 		--set global.images.kubeovn.tag=$(VERSION) \
 		--set OVN_DIR=$(shell echo $${OVN_DIR:-/etc/origin/ovn}) \
@@ -229,10 +227,24 @@ upgrade-chart:
 		--set func.ENABLE_ANP=$(shell echo $${ENABLE_ANP:-false})
 	kubectl -n kube-system wait pod --for=condition=ready -l app=ovs --timeout=60s
 
+.PHONY: install-chart-v2
+install-chart-v2:
+	kubectl label node --overwrite -l node-role.kubernetes.io/control-plane kube-ovn/role=master
+	helm install kubeovn ./charts/kube-ovn-v2 --wait
+
+.PHONY: upgrade-chart-v2
+upgrade-chart-v2:
+	helm upgrade kubeovn ./charts/kube-ovn-v2 --wait
+	kubectl -n kube-system wait pod --for=condition=ready -l app=ovs --timeout=60s
+
 .PHONY: uninstall
 uninstall:
 	bash dist/images/cleanup.sh
 
+.PHONY: uninstall-chart
+uninstall-chart:
+	helm uninstall kubeovn
+
 .PHONY: kubectl-ko-log
 kubectl-ko-log:
 	bash dist/images/kubectl-ko log all
diff --git a/charts/kube-ovn-v2/README.md b/charts/kube-ovn-v2/README.md
@@ -800,6 +800,15 @@ false
 </td>
 			<td>Namespace in which the CNI is deployed.</td>
 		</tr>
+		<tr>
+			<td>clusterDomain</td>
+			<td>string</td>
+			<td><pre lang="json">
+"cluster.local"
+</pre>
+</td>
+			<td>Domain used by the cluster.</td>
+		</tr>
 	</tbody>
 </table>
 <h3>Kubelet configuration</h3>
diff --git a/charts/kube-ovn-v2/templates/central/central-deployment.yaml b/charts/kube-ovn-v2/templates/central/central-deployment.yaml
@@ -2,6 +2,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: ovn-central
+  namespace: {{ .Values.namespace }}
   {{- with .Values.central.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/kube-ovn-v2/templates/controller/controller-deployment.yaml b/charts/kube-ovn-v2/templates/controller/controller-deployment.yaml
@@ -92,9 +92,9 @@ spec:
           {{- if eq .Values.networking.stack "Dual" -}}
           {{ .Values.networking.pods.cidr.v4 }},{{ .Values.networking.pods.cidr.v6 }}
           {{- else if eq .Values.networking.stack "IPv4" -}}
-          { .Values.networking.pods.cidr.v4 }}
+          {{ .Values.networking.pods.cidr.v4 }}
           {{- else if eq .Values.networking.stack "IPv6" -}}
-          { .Values.networking.pods.cidr.v6 }}
+          {{ .Values.networking.pods.cidr.v6 }}
           {{- end }}
           - --default-gateway=
           {{- if eq .Values.networking.stack "Dual" -}}
diff --git a/charts/kube-ovn-v2/templates/ic/ic-controller-deploy.yaml b/charts/kube-ovn-v2/templates/ic/ic-controller-deploy.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: ovn-ic-controller
-  namespace: kube-system
+  namespace: {{ .Values.namespace }}
   annotations:
     kubernetes.io/description: |
       OVN IC Client
diff --git a/charts/kube-ovn-v2/templates/webhook/certificate.yaml b/charts/kube-ovn-v2/templates/webhook/certificate.yaml
@@ -14,9 +14,9 @@ metadata:
   {{- end }}
 spec:
   dnsNames:
-    - kube-ovn-webhook.kube-system
-    - kube-ovn-webhook.kube-system.svc
-    - kube-ovn-webhook.kube-system.svc.cluster.local
+    - kube-ovn-webhook.{{ .Values.namespace }}
+    - kube-ovn-webhook.{{ .Values.namespace }}.svc
+    - kube-ovn-webhook.{{ .Values.namespace }}.svc.{{ .Values.clusterDomain }}
   issuerRef:
     kind: Issuer
     name: kube-ovn-webhook-selfsigned-issuer
diff --git a/charts/kube-ovn-v2/values.yaml b/charts/kube-ovn-v2/values.yaml
@@ -32,6 +32,10 @@ fullnameOverride: ""
 # @section -- Global parameters
 namespace: kube-system
 
+# -- Domain used by the cluster.
+# @section -- Global parameters
+clusterDomain: cluster.local
+
 # -- Comma-separated list of IPs for each master node.
 # If not specified, fallback to auto-identifying masters based on "masterNodesLabels"
 # @section -- Global parameters
diff --git a/charts/kube-ovn/templates/ic-controller-deploy.yaml b/charts/kube-ovn/templates/ic-controller-deploy.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: ovn-ic-controller
-  namespace: kube-system
+  namespace: {{ .Values.namespace }}
   annotations:
     kubernetes.io/description: |
       OVN IC Client
diff --git a/kind.mk b/kind.mk
@@ -201,11 +201,8 @@ kind-init-bgp-ha: kind-clean-bgp kind-init
 kind-load-image:
 	$(call kind_load_image,kube-ovn,$(REGISTRY)/kube-ovn:$(VERSION))
 
-.PHONY: kind-untaint-control-plane
-kind-untaint-control-plane: untaint-control-plane
-
 .PHONY: kind-install-chart
-kind-install-chart: kind-load-image install-chart
+kind-install-chart: kind-load-image untaint-control-plane install-chart
 
 .PHONY: kind-install-chart-ssl
 kind-install-chart-ssl:
@@ -214,14 +211,16 @@ kind-install-chart-ssl:
 .PHONY: kind-upgrade-chart
 kind-upgrade-chart: kind-load-image upgrade-chart
 
-.PHONY: kind-uninstall-chart
-kind-uninstall-chart:
-	helm uninstall kubeovn
+.PHONY: kind-install-chart-v2
+kind-install-chart-v2: kind-load-image untaint-control-plane install-chart-v2
+
+.PHONY: kind-upgrade-chart-v2
+kind-upgrade-chart-v2: kind-load-image upgrade-chart-v2
 
 .PHONY: kind-install
 kind-install: kind-load-image
 	kubectl config use-context kind-kube-ovn
-	@$(MAKE) kind-untaint-control-plane
+	@$(MAKE) untaint-control-plane
 	sed 's/VERSION=.*/VERSION=$(VERSION)/' dist/images/install.sh | bash
 	kubectl describe no
 
@@ -269,7 +268,7 @@ kind-install-ovn-ic-ipv4:
 	@ENABLE_IC=true $(MAKE) kind-install
 	$(call kind_load_image,kube-ovn1,$(REGISTRY)/kube-ovn:$(VERSION))
 	kubectl config use-context kind-kube-ovn1
-	@$(MAKE) kind-untaint-control-plane
+	@$(MAKE) untaint-control-plane
 	sed -e 's/10.16.0/10.18.0/g' \
 		-e 's/10.96.0/10.98.0/g' \
 		-e 's/100.64.0/100.68.0/g' \
@@ -300,7 +299,7 @@ kind-install-ovn-ic-ipv6:
 	@ENABLE_IC=true $(MAKE) kind-install-ipv6
 	$(call kind_load_image,kube-ovn1,$(REGISTRY)/kube-ovn:$(VERSION))
 	kubectl config use-context kind-kube-ovn1
-	@$(MAKE) kind-untaint-control-plane
+	@$(MAKE) untaint-control-plane
 	sed -e 's/fd00:10:16:/fd00:10:18:/g' \
 		-e 's/fd00:10:96:/fd00:10:98:/g' \
 		-e 's/fd00:100:64:/fd00:100:68:/g' \
@@ -319,7 +318,7 @@ kind-install-ovn-ic-dual:
 	@ENABLE_IC=true $(MAKE) kind-install-dual
 	$(call kind_load_image,kube-ovn1,$(REGISTRY)/kube-ovn:$(VERSION))
 	kubectl config use-context kind-kube-ovn1
-	@$(MAKE) kind-untaint-control-plane
+	@$(MAKE) untaint-control-plane
 	sed -e 's/10.16.0/10.18.0/g' \
 		-e 's/10.96.0/10.98.0/g' \
 		-e 's/100.64.0/100.68.0/g' \
@@ -343,7 +342,7 @@ kind-install-ovn-submariner: kind-install
 	$(call kind_load_image,kube-ovn1,$(REGISTRY)/kube-ovn:$(VERSION))
 
 	kubectl config use-context kind-kube-ovn1
-	@$(MAKE) kind-untaint-control-plane
+	@$(MAKE) untaint-control-plane
 	sed -e 's/10.16.0/10.18.0/g' \
 		-e 's/10.96.0.0/10.112.0.0/g' \
 		-e 's/100.64.0/100.68.0/g' \
@@ -367,7 +366,7 @@ kind-install-underlay: kind-install-underlay-ipv4
 kind-install-underlay-hairpin: kind-install-underlay-hairpin-ipv4
 
 .PHONY: kind-install-underlay-ipv4
-kind-install-underlay-ipv4: kind-disable-hairpin kind-load-image kind-untaint-control-plane
+kind-install-underlay-ipv4: kind-disable-hairpin kind-load-image untaint-control-plane
 	$(call docker_network_info,$(KIND_NETWORK_UNDERLAY),kube-ovn-control-plane)
 	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(UNDERLAY_NETWORK_IPV4_SUBNET))"@' \
 		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(UNDERLAY_NETWORK_IPV4_GATEWAY))"@' \
@@ -379,7 +378,7 @@ kind-install-underlay-ipv4: kind-disable-hairpin kind-load-image kind-untaint-co
 	kubectl describe no
 
 .PHONY: kind-install-underlay-hairpin-ipv4
-kind-install-underlay-hairpin-ipv4: kind-enable-hairpin kind-load-image kind-untaint-control-plane
+kind-install-underlay-hairpin-ipv4: kind-enable-hairpin kind-load-image untaint-control-plane
 	$(call docker_network_info,$(KIND_NETWORK_UNDERLAY),kube-ovn-control-plane)
 	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(UNDERLAY_NETWORK_IPV4_SUBNET))"@' \
 		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(UNDERLAY_NETWORK_IPV4_GATEWAY))"@' \
@@ -391,7 +390,7 @@ kind-install-underlay-hairpin-ipv4: kind-enable-hairpin kind-load-image kind-unt
 	kubectl describe no
 
 .PHONY: kind-install-underlay-ipv6
-kind-install-underlay-ipv6: kind-disable-hairpin kind-load-image kind-untaint-control-plane
+kind-install-underlay-ipv6: kind-disable-hairpin kind-load-image untaint-control-plane
 	$(call docker_network_info,$(KIND_NETWORK_UNDERLAY),kube-ovn-control-plane)
 	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(UNDERLAY_NETWORK_IPV6_SUBNET))"@' \
 		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(UNDERLAY_NETWORK_IPV6_GATEWAY))"@' \
@@ -402,7 +401,7 @@ kind-install-underlay-ipv6: kind-disable-hairpin kind-load-image kind-untaint-co
 		IPV6=true ENABLE_VLAN=true VLAN_NIC=$(KIND_VLAN_NIC) bash
 
 .PHONY: kind-install-underlay-hairpin-ipv6
-kind-install-underlay-hairpin-ipv6: kind-enable-hairpin kind-load-image kind-untaint-control-plane
+kind-install-underlay-hairpin-ipv6: kind-enable-hairpin kind-load-image untaint-control-plane
 	$(call docker_network_info,$(KIND_NETWORK_UNDERLAY),kube-ovn-control-plane)
 	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(UNDERLAY_NETWORK_IPV6_SUBNET))"@' \
 		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(UNDERLAY_NETWORK_IPV6_GATEWAY))"@' \
@@ -413,7 +412,7 @@ kind-install-underlay-hairpin-ipv6: kind-enable-hairpin kind-load-image kind-unt
 		IPV6=true ENABLE_VLAN=true VLAN_NIC=$(KIND_VLAN_NIC) bash
 
 .PHONY: kind-install-underlay-dual
-kind-install-underlay-dual: kind-disable-hairpin kind-load-image kind-untaint-control-plane
+kind-install-underlay-dual: kind-disable-hairpin kind-load-image untaint-control-plane
 	$(call docker_network_info,$(KIND_NETWORK_UNDERLAY),kube-ovn-control-plane)
 	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(UNDERLAY_NETWORK_IPV4_SUBNET)),$($(UNDERLAY_NETWORK_IPV6_SUBNET))"@' \
 		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(UNDERLAY_NETWORK_IPV4_GATEWAY)),$($(UNDERLAY_NETWORK_IPV6_GATEWAY))"@' \
@@ -424,7 +423,7 @@ kind-install-underlay-dual: kind-disable-hairpin kind-load-image kind-untaint-co
 		DUAL_STACK=true ENABLE_VLAN=true VLAN_NIC=$(KIND_VLAN_NIC) bash
 
 .PHONY: kind-install-underlay-hairpin-dual
-kind-install-underlay-hairpin-dual: kind-enable-hairpin kind-load-image kind-untaint-control-plane
+kind-install-underlay-hairpin-dual: kind-enable-hairpin kind-load-image untaint-control-plane
 	$(call docker_network_info,$(KIND_NETWORK_UNDERLAY),kube-ovn-control-plane)
 	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(UNDERLAY_NETWORK_IPV4_SUBNET)),$($(UNDERLAY_NETWORK_IPV6_SUBNET))"@' \
 		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(UNDERLAY_NETWORK_IPV4_GATEWAY)),$($(UNDERLAY_NETWORK_IPV6_GATEWAY))"@' \
@@ -442,7 +441,7 @@ kind-install-underlay-u2o-%:
 	@$(MAKE) U2O_INTERCONNECTION=true kind-install-underlay-$*
 
 .PHONY: kind-install-underlay-logical-gateway-dual
-kind-install-underlay-logical-gateway-dual: kind-disable-hairpin kind-load-image kind-untaint-control-plane
+kind-install-underlay-logical-gateway-dual: kind-disable-hairpin kind-load-image untaint-control-plane
 	$(call docker_network_info,$(KIND_NETWORK_UNDERLAY),kube-ovn-control-plane)
 	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(UNDERLAY_NETWORK_IPV4_SUBNET)),$($(UNDERLAY_NETWORK_IPV6_SUBNET))"@' \
 		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(UNDERLAY_NETWORK_IPV4_GATEWAY))9,$($(UNDERLAY_NETWORK_IPV6_GATEWAY))f"@' \
