ovn: reduce down time during upgrading from version 21.06 (#3881)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
kubeovn · Mar 28, 2024 · 64cd8d3 · 64cd8d3
1 parent b347841
commit 64cd8d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/kube-ovn/templates/central-deploy.yaml b/charts/kube-ovn/templates/central-deploy.yaml
@@ -82,7 +82,7 @@ spec:
               value: "{{ .Values.networking.ENABLE_COMPACT }}"
             {{- if include "kubeovn.ovs-ovn.updateStrategy" . | eq "OnDelete" }}
             - name: OVN_VERSION_COMPATIBILITY
-              value: "22.03"
+              value: "21.06"
             {{- end }}
           resources:
             requests:

diff --git a/charts/kube-ovn/templates/upgrade-ovs-ovn.yaml b/charts/kube-ovn/templates/upgrade-ovs-ovn.yaml
@@ -140,7 +140,7 @@ spec:
             - name: ENABLE_SSL
               value: "{{ .Values.networking.ENABLE_SSL }}"
             - name: OVN_DB_IPS
-              value: "{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}"
+              value: "{{ .Values.MASTER_NODES }}"
           command:
             - bash
             - -eo

diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base
@@ -46,7 +46,7 @@ RUN cd /usr/src/ && git clone -b branch-22.12 --depth=1 https://github.com/ovn-o
     # lflow: do not send direct traffic between lports to conntrack
     curl -s https://github.com/kubeovn/ovn/commit/54cbe0d1ba2051e640dd3e53498f373362547691.patch | git apply && \
     # northd: add nb option version_compatibility
-    curl -s https://github.com/kubeovn/ovn/commit/174561abd707239f134501c4320cbf9b29af0305.patch | git apply
+    curl -s https://github.com/kubeovn/ovn/commit/06f5a7c684a6030036e2663eecf934b37c3e666e.patch | git apply
 
 RUN apt install -y build-essential fakeroot \
     autoconf automake bzip2 debhelper-compat dh-exec dh-python dh-sequence-python3 dh-sequence-sphinxdoc \