remove hybrid overlay from node-identity.yaml

openshift · Mar 6, 2024 · a0428ed · a0428ed
1 parent 7aa1316
commit a0428ed
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/bindata/network/node-identity/managed/node-identity.yaml b/bindata/network/node-identity/managed/node-identity.yaml
@@ -109,10 +109,6 @@ spec:
                 exit 1
               fi
             done
-            ho_enable=
-{{- if .OVNHybridOverlayEnable }}
-            ho_enable="--enable-hybrid-overlay"
-{{ end }}
             echo "I$(date "+%m%d %H:%M:%S.%N") - network-node-identity - start webhook"
             # extra-allowed-user: service account `ovn-kubernetes-control-plane`
             # sets pod annotations in multi-homing layer3 network controller (cluster-manager)
@@ -121,7 +117,6 @@ spec:
                 --webhook-cert-dir=/etc/webhook-cert \
                 --webhook-host="" \
                 --webhook-port={{.NetworkNodeIdentityPort}} \
-                ${ho_enable} \
                 --disable-approver \
                 --extra-allowed-user="system:serviceaccount:openshift-ovn-kubernetes:ovn-kubernetes-control-plane" \
                 --loglevel="${LOGLEVEL}"

diff --git a/bindata/network/node-identity/self-hosted/node-identity.yaml b/bindata/network/node-identity/self-hosted/node-identity.yaml
@@ -45,18 +45,13 @@ spec:
               set +o allexport
             fi
 
-            ho_enable=
-{{- if .OVNHybridOverlayEnable }}
-            ho_enable="--enable-hybrid-overlay"
-{{ end }}
             echo "I$(date "+%m%d %H:%M:%S.%N") - network-node-identity - start webhook"
             # extra-allowed-user: service account `ovn-kubernetes-control-plane`
             # sets pod annotations in multi-homing layer3 network controller (cluster-manager)
             exec /usr/bin/ovnkube-identity  --k8s-apiserver={{.K8S_APISERVER}} \
                 --webhook-cert-dir="/etc/webhook-cert" \
                 --webhook-host={{.NetworkNodeIdentityAddress}} \
                 --webhook-port={{.NetworkNodeIdentityPort}} \
-                ${ho_enable} \
                 --disable-approver \
                 --extra-allowed-user="system:serviceaccount:openshift-ovn-kubernetes:ovn-kubernetes-control-plane" \
                 --wait-for-kubernetes-api={{.NetworkNodeIdentityTerminationDurationSeconds}}s \