kubeovn · zhangzujian · Dec 23, 2025 · Dec 20, 2025
diff --git a/charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml b/charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml
@@ -162,7 +162,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
-          - name: KUBE_NODE_NAME
+          - name: NODE_NAME
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName

diff --git a/charts/kube-ovn-v2/templates/controller/controller-deployment.yaml b/charts/kube-ovn-v2/templates/controller/controller-deployment.yaml
@@ -177,11 +177,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: KUBE_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/charts/kube-ovn-v2/templates/monitor/monitor-deployment.yaml b/charts/kube-ovn-v2/templates/monitor/monitor-deployment.yaml
@@ -98,7 +98,7 @@ spec:
           env:
             - name: ENABLE_SSL
               value: "{{ .Values.networking.enableSsl }}"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml b/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml
@@ -128,7 +128,7 @@ spec:
               value: "{{- .Values.features.enableHardwareOffload }}"
             - name: TUNNEL_TYPE
               value: "{{- .Values.networking.tunnelType }}"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-dpdk-daemonset.yaml b/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-dpdk-daemonset.yaml
@@ -67,7 +67,7 @@ spec:
               value: "{{- .Values.networking.tunnelType }}"
             - name: DPDK_TUNNEL_IFACE
               value: "{{- .Values.agent.dpdkTunnelInterface }}"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/charts/kube-ovn/templates/controller-deploy.yaml b/charts/kube-ovn/templates/controller-deploy.yaml
@@ -168,11 +168,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: KUBE_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/charts/kube-ovn/templates/monitor-deploy.yaml b/charts/kube-ovn/templates/monitor-deploy.yaml
@@ -81,7 +81,7 @@ spec:
           env:
             - name: ENABLE_SSL
               value: "{{ .Values.networking.ENABLE_SSL }}"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/charts/kube-ovn/templates/ovn-dpdk-ds.yaml b/charts/kube-ovn/templates/ovn-dpdk-ds.yaml
@@ -54,7 +54,7 @@ spec:
               value: "{{- .Values.networking.TUNNEL_TYPE }}"
             - name: DPDK_TUNNEL_IFACE
               value: "{{- .Values.networking.DPDK_TUNNEL_IFACE }}"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/charts/kube-ovn/templates/ovncni-ds.yaml b/charts/kube-ovn/templates/ovncni-ds.yaml
@@ -143,7 +143,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
-          - name: KUBE_NODE_NAME
+          - name: NODE_NAME
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName

diff --git a/charts/kube-ovn/templates/ovsovn-ds.yaml b/charts/kube-ovn/templates/ovsovn-ds.yaml
@@ -115,7 +115,7 @@ spec:
               value: "{{- .Values.func.HW_OFFLOAD }}"
             - name: TUNNEL_TYPE
               value: "{{- .Values.networking.TUNNEL_TYPE }}"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -136,7 +136,7 @@ func CmdMain() {
 
 	recorder := record.NewBroadcaster().NewRecorder(scheme.Scheme, apiv1.EventSource{
 		Component: ovnLeaderResource,
-		Host:      os.Getenv(util.HostnameEnv),
+		Host:      os.Getenv(util.EnvNodeName),
 	})
 	rl, err := resourcelock.NewFromKubeconfig(resourcelock.LeasesResourceLock,
 		config.PodNamespace,

diff --git a/cmd/daemon/cniserver.go b/cmd/daemon/cniserver.go
@@ -101,7 +101,7 @@ func main() {
 		kubeinformers.WithTweakListOptions(func(listOption *v1.ListOptions) {
 			listOption.FieldSelector = fmt.Sprintf("metadata.name=%s", util.DefaultOVNIPSecCA)
 		}),
-		kubeinformers.WithNamespace(os.Getenv("POD_NAMESPACE")),
+		kubeinformers.WithNamespace(os.Getenv(util.EnvPodNamespace)),
 	)
 
 	ctl, err := daemon.NewController(config, stopCh, podInformerFactory, nodeInformerFactory, caSecretInformerFactory, kubeovnInformerFactory)

diff --git a/cmd/webhook/server.go b/cmd/webhook/server.go
@@ -75,7 +75,7 @@ func CmdMain() {
 		Metrics: metricsserver.Options{
 			BindAddress: "0",
 		},
-		HealthProbeBindAddress: util.JoinHostPort(os.Getenv("POD_IP"), *healthProbePort),
+		HealthProbeBindAddress: util.JoinHostPort(os.Getenv(util.EnvPodIP), *healthProbePort),
 	})
 	if err != nil {
 		panic(err)

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -4460,7 +4460,7 @@ spec:
               value: "$HW_OFFLOAD"
             - name: TUNNEL_TYPE
               value: "$TUNNEL_TYPE"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
@@ -4611,7 +4611,7 @@ spec:
               value: "$TUNNEL_TYPE"
             - name: DPDK_TUNNEL_IFACE
               value: "$DPDK_TUNNEL_IFACE"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
@@ -4888,11 +4888,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: KUBE_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
@@ -5091,7 +5087,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
-          - name: KUBE_NODE_NAME
+          - name: NODE_NAME
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
@@ -5311,7 +5307,7 @@ spec:
           env:
             - name: ENABLE_SSL
               value: "$ENABLE_SSL"
-            - name: KUBE_NODE_NAME
+            - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName

diff --git a/dist/images/ovsdb-inspect.sh b/dist/images/ovsdb-inspect.sh
@@ -41,7 +41,7 @@ init-ovs-ctr
 
 for i in $(kubectl -n kube-system get pods -o wide | grep ovs-ovn | awk '{print $1}');
   do
-    NODE=$(ovs-exec $i "printenv KUBE_NODE_NAME")
+    NODE=$(ovs-exec $i "printenv NODE_NAME")
     NODEIP=$(ovs-exec $i "printenv OVN_DB_IPS")
     NSNAME=$(kubectl get pods -o wide -A | grep $NODE | grep -v $NODEIP | awk '{print $2 "." $1}')
     for j in $NSNAME;

diff --git a/dist/images/start-ovs.sh b/dist/images/start-ovs.sh
@@ -143,7 +143,7 @@ ovs-vsctl set open . external-ids:ovn-remote="$(gen_conn_str 6642)"
 ovs-vsctl set open . external-ids:ovn-remote-probe-interval="${OVN_REMOTE_PROBE_INTERVAL}"
 ovs-vsctl set open . external-ids:ovn-openflow-probe-interval="${OVN_REMOTE_OPENFLOW_INTERVAL}"
 ovs-vsctl set open . external-ids:ovn-encap-type="${TUNNEL_TYPE}"
-ovs-vsctl set open . external-ids:hostname="${KUBE_NODE_NAME}"
+ovs-vsctl set open . external-ids:hostname="${NODE_NAME}"
 
 # Start ovn-controller
 if [[ "$ENABLE_SSL" == "false" ]]; then

diff --git a/pkg/controller/config.go b/pkg/controller/config.go
@@ -288,8 +288,8 @@ func ParseFlags() (*Configuration, error) {
 		DefaultHostInterface:           *argDefaultInterfaceName,
 		DefaultExchangeLinkName:        *argDefaultExchangeLinkName,
 		DefaultVlanName:                *argDefaultVlanName,
-		PodName:                        os.Getenv("POD_NAME"),
-		PodNamespace:                   os.Getenv("KUBE_NAMESPACE"),
+		PodName:                        os.Getenv(util.EnvPodName),
+		PodNamespace:                   os.Getenv(util.EnvPodNamespace),
 		PodNicType:                     *argPodNicType,
 		EnableLb:                       *argEnableLb,
 		EnableNP:                       *argEnableNP,
@@ -442,8 +442,8 @@ func (config *Configuration) initKubeClient() error {
 	}
 	config.ExtClient = ExtClient
 
-	cfg.ContentType = "application/vnd.kubernetes.protobuf"
-	cfg.AcceptContentTypes = "application/vnd.kubernetes.protobuf,application/json"
+	cfg.ContentType = util.ContentTypeProtobuf
+	cfg.AcceptContentTypes = util.AcceptContentTypes
 	kubeClient, err := kubernetes.NewForConfig(cfg)
 	if err != nil {
 		klog.Errorf("init kubernetes client failed %v", err)
@@ -478,8 +478,8 @@ func (config *Configuration) initKubeFactoryClient() error {
 	}
 	config.KubeOvnFactoryClient = kubeOvnClient
 
-	cfg.ContentType = "application/vnd.kubernetes.protobuf"
-	cfg.AcceptContentTypes = "application/vnd.kubernetes.protobuf,application/json"
+	cfg.ContentType = util.ContentTypeProtobuf
+	cfg.AcceptContentTypes = util.AcceptContentTypes
 	kubeClient, err := kubernetes.NewForConfig(cfg)
 	if err != nil {
 		klog.Errorf("init kubernetes client failed %v", err)

diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -34,6 +34,7 @@ import (
 	kubeovnfake "github.com/kubeovn/kube-ovn/pkg/client/clientset/versioned/fake"
 	kubeovninformerfactory "github.com/kubeovn/kube-ovn/pkg/client/informers/externalversions"
 	kubeovninformer "github.com/kubeovn/kube-ovn/pkg/client/informers/externalversions/kubeovn/v1"
+	"github.com/kubeovn/kube-ovn/pkg/util"
 )
 
 type fakeControllerInformers struct {
@@ -72,7 +73,7 @@ func newFakeControllerWithOptions(t *testing.T, opts *FakeControllerOptions) (*f
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "default",
 			Annotations: map[string]string{
-				"ovn.kubernetes.io/logical_switch": "ovn-default",
+				util.LogicalSwitchAnnotation: util.DefaultSubnet,
 			},
 		},
 	}
@@ -243,7 +244,7 @@ func TestFakeControllerWithOptions(t *testing.T) {
 				Name:      "test-pod",
 				Namespace: "default",
 				Annotations: map[string]string{
-					"k8s.v1.cni.cncf.io/networks": `[{"name": "net1"}]`,
+					nadv1.NetworkAttachmentAnnot: `[{"name": "net1"}]`,
 				},
 			},
 		},