Skip to content

Commit 0b3356e

Browse files
authored
Merge pull request #5241 from flavio-fernandes/interconnect_get_node_zone
ovnkube.sh: get_node_zone: default to node name as zone
2 parents ef65658 + 9a6e8e3 commit 0b3356e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

dist/images/ovnkube.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,12 @@ function memory_trim_on_compaction_supported {
815815
function get_node_zone() {
816816
zone=$(kubectl --subresource=status --server=${K8S_APISERVER} --token=${k8s_token} --certificate-authority=${K8S_CACERT} \
817817
get node ${K8S_NODE} -o=jsonpath={'.metadata.labels.k8s\.ovn\.org/zone-name'})
818-
if [ "$zone" == "" ]; then
819-
zone="global"
818+
if [ -z "$zone" ]; then
819+
if [[ ${ovn_enable_interconnect} == "true" ]]; then
820+
zone="${K8S_NODE}"
821+
else
822+
zone="global"
823+
fi
820824
fi
821825
echo "$zone"
822826
}

0 commit comments

Comments
 (0)