Skip to content

Commit 51249fb

Browse files
committed
MGMT-21314: CNO enable advanced gateway detection in ovnkube in dpu host mode
1 parent 2227fdd commit 51249fb

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

bindata/network/ovn-kubernetes/common/008-script-lib.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -512,11 +512,13 @@ data:
512512

513513
echo "I$(date "+%m%d %H:%M:%S.%N") - starting ovnkube-node"
514514

515-
516-
if [ "{{.OVN_NODE_MODE}}" == "dpu-host" ]; then
515+
# Use OVN_NODE_MODE environment variable, default to "full" if not set
516+
OVN_NODE_MODE=${OVN_NODE_MODE:-full}
517+
if [ "${OVN_NODE_MODE}" == "dpu-host" ]; then
517518
// this is required for the dpu-host mode to configure right gateway interface
518519
// https://github.com/ovn-kubernetes/ovn-kubernetes/pull/5327/files
519520
gateway_interface=derive-from-mgmt-port
521+
ovnkube_node_mode="--ovnkube-node-mode dpu-host"
520522
else
521523
gateway_interface=br-ex
522524
fi
@@ -664,9 +666,7 @@ data:
664666
--inactivity-probe="${OVN_CONTROLLER_INACTIVITY_PROBE}" \
665667
${gateway_mode_flags} \
666668
${node_mgmt_port_netdev_flags} \
667-
{{- if eq .OVN_NODE_MODE "dpu-host" }}
668-
--ovnkube-node-mode dpu-host \
669-
{{- end }}
669+
${ovnkube_node_mode} \
670670
--metrics-bind-address "127.0.0.1:${metrics_port}" \
671671
--ovn-metrics-bind-address "127.0.0.1:${ovn_metrics_port}" \
672672
--metrics-enable-pprof \

bindata/network/ovn-kubernetes/managed/ovnkube-node.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,8 @@ spec:
394394
value: "{{.OVN_CONTROLLER_INACTIVITY_PROBE}}"
395395
- name: OVN_KUBE_LOG_LEVEL
396396
value: "4"
397+
- name: OVN_NODE_MODE
398+
value: "{{.OVN_NODE_MODE}}"
397399
{{ if .NetFlowCollectors }}
398400
- name: NETFLOW_COLLECTORS
399401
value: "{{.NetFlowCollectors}}"

bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,8 @@ spec:
538538
value: "{{.OVN_CONTROLLER_INACTIVITY_PROBE}}"
539539
- name: OVN_KUBE_LOG_LEVEL
540540
value: "4"
541+
- name: OVN_NODE_MODE
542+
value: "{{.OVN_NODE_MODE}}"
541543
{{ if .NetFlowCollectors }}
542544
- name: NETFLOW_COLLECTORS
543545
value: "{{.NetFlowCollectors}}"
@@ -566,6 +568,7 @@ spec:
566568
- name: OVNKUBE_NODE_MGMT_PORT_DP_RESOURCE_NAME
567569
value: {{ .MgmtPortResourceName }}
568570
{{ end }}
571+
{{ end }}
569572
- name: K8S_NODE
570573
valueFrom:
571574
fieldRef:

0 commit comments

Comments
 (0)