From 3cb8bcb43c3a1242fe24c1d4203fab774675d67e Mon Sep 17 00:00:00 2001 From: "lan.tian" Date: Tue, 16 Sep 2025 09:14:10 +0800 Subject: [PATCH 1/2] set ovnkube-cluster-manager as default container --- .../ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml b/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml index c49b3c0574..2152f293b3 100644 --- a/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml +++ b/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml @@ -22,6 +22,7 @@ spec: metadata: annotations: target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' + kubectl.kubernetes.io/default-container: ovnkube-cluster-manager labels: app: ovnkube-control-plane component: network From fe94807f0a2721c90f6f519c655653c0de98a6de Mon Sep 17 00:00:00 2001 From: "lan.tian" Date: Fri, 3 Oct 2025 07:48:43 +0800 Subject: [PATCH 2/2] set default container for ovnkube-control-plane and ovnkube-node --- .../network/ovn-kubernetes/managed/ovnkube-control-plane.yaml | 1 + bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml | 1 + bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml b/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml index 5a4c72d1ff..84a6da04d3 100644 --- a/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml +++ b/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml @@ -33,6 +33,7 @@ spec: annotations: hypershift.openshift.io/release-image: {{.ReleaseImage}} target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' + kubectl.kubernetes.io/default-container: ovnkube-control-plane labels: app: ovnkube-control-plane component: network diff --git a/bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml b/bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml index f7c3c084ae..bfd9d6f976 100644 --- a/bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml +++ b/bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml @@ -40,6 +40,7 @@ spec: network.operator.openshift.io/ovnkube-script-lib-hash: "{{.OVNKubeConfigHash}}" # prevent blocks when node critical pods get evicted prior to workloads cluster-autoscaler.kubernetes.io/enable-ds-eviction: "false" + kubectl.kubernetes.io/default-container: ovnkube-controller labels: {{ if eq .OVN_NODE_MODE "dpu-host" }} app: ovnkube-node-dpu-host diff --git a/bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml b/bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml index fd3076dbcf..d661e6d68d 100644 --- a/bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml +++ b/bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml @@ -40,6 +40,7 @@ spec: network.operator.openshift.io/ovnkube-script-lib-hash: "{{.OVNKubeConfigHash}}" # prevent blocks when node critical pods get evicted prior to workloads cluster-autoscaler.kubernetes.io/enable-ds-eviction: "false" + kubectl.kubernetes.io/default-container: ovnkube-controller labels: {{ if eq .OVN_NODE_MODE "dpu-host" }} app: ovnkube-node-dpu-host