From 6e4045097d7b92b1fae9b32cebcc5ee378561f6f Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Mon, 18 Dec 2023 14:13:27 -0600 Subject: [PATCH] Fix ovn ovsdb port number Change-Id: I7a83b5f51748d75c748180ba9288758f8528db1b --- ovn/Chart.yaml | 2 +- ovn/templates/bin/_ovn-controller-init.sh.tpl | 2 +- ovn/templates/bin/_ovn-northd.sh.tpl | 4 ++-- releasenotes/notes/ovn.yaml | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ovn/Chart.yaml b/ovn/Chart.yaml index 3fc498038..f99f0e23d 100644 --- a/ovn/Chart.yaml +++ b/ovn/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v23.3.0 description: OpenStack-Helm OVN name: ovn -version: 0.1.5 +version: 0.1.6 home: https://www.ovn.org icon: https://www.ovn.org/images/ovn-logo.png sources: diff --git a/ovn/templates/bin/_ovn-controller-init.sh.tpl b/ovn/templates/bin/_ovn-controller-init.sh.tpl index 248cfc97d..aa3ff6d18 100644 --- a/ovn/templates/bin/_ovn-controller-init.sh.tpl +++ b/ovn/templates/bin/_ovn-controller-init.sh.tpl @@ -49,7 +49,7 @@ set -e {{- if empty .Values.conf.ovn_remote -}} {{- $sb_svc_name := "ovn-ovsdb-sb" -}} {{- $sb_svc := (tuple $sb_svc_name "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup") -}} -{{- $sb_port := (tuple "ovn-ovsdb-sb" "internal" "raft" . | include "helm-toolkit.endpoints.endpoint_port_lookup") -}} +{{- $sb_port := (tuple "ovn-ovsdb-sb" "internal" "ovsdb" . | include "helm-toolkit.endpoints.endpoint_port_lookup") -}} {{- $sb_service_list := list -}} {{- range $i := until (.Values.pod.replicas.ovn_ovsdb_sb | int) -}} {{- $sb_service_list = printf "tcp:%s-%d.%s:%s" $sb_svc_name $i $sb_svc $sb_port | append $sb_service_list -}} diff --git a/ovn/templates/bin/_ovn-northd.sh.tpl b/ovn/templates/bin/_ovn-northd.sh.tpl index bb61c581a..fefd793cc 100644 --- a/ovn/templates/bin/_ovn-northd.sh.tpl +++ b/ovn/templates/bin/_ovn-northd.sh.tpl @@ -18,7 +18,7 @@ COMMAND="${@:-start}" {{- $nb_svc_name := "ovn-ovsdb-nb" -}} {{- $nb_svc := (tuple $nb_svc_name "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup") -}} -{{- $nb_port := (tuple "ovn-ovsdb-nb" "internal" "raft" . | include "helm-toolkit.endpoints.endpoint_port_lookup") -}} +{{- $nb_port := (tuple "ovn-ovsdb-nb" "internal" "ovsdb" . | include "helm-toolkit.endpoints.endpoint_port_lookup") -}} {{- $nb_service_list := list -}} {{- range $i := until (.Values.pod.replicas.ovn_ovsdb_nb | int) -}} {{- $nb_service_list = printf "tcp:%s-%d.%s:%s" $nb_svc_name $i $nb_svc $nb_port | append $nb_service_list -}} @@ -26,7 +26,7 @@ COMMAND="${@:-start}" {{- $sb_svc_name := "ovn-ovsdb-sb" -}} {{- $sb_svc := (tuple $sb_svc_name "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup") -}} -{{- $sb_port := (tuple "ovn-ovsdb-sb" "internal" "raft" . | include "helm-toolkit.endpoints.endpoint_port_lookup") -}} +{{- $sb_port := (tuple "ovn-ovsdb-sb" "internal" "ovsdb" . | include "helm-toolkit.endpoints.endpoint_port_lookup") -}} {{- $sb_service_list := list -}} {{- range $i := until (.Values.pod.replicas.ovn_ovsdb_sb | int) -}} {{- $sb_service_list = printf "tcp:%s-%d.%s:%s" $sb_svc_name $i $sb_svc $sb_port | append $sb_service_list -}} diff --git a/releasenotes/notes/ovn.yaml b/releasenotes/notes/ovn.yaml index cfd3ae99e..cc6f340d3 100644 --- a/releasenotes/notes/ovn.yaml +++ b/releasenotes/notes/ovn.yaml @@ -6,4 +6,5 @@ ovn: - 0.1.3 Fix system-id reuse - 0.1.4 Add support for OVN HA + refactor - 0.1.5 Add ubuntu_focal and ubuntu_jammy overrides + - 0.1.6 Fix ovsdb port number ...