From ba48169b004ae4c5caf7a77555b9e1b2b7e46139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Mon, 4 Sep 2023 14:00:55 +0800 Subject: [PATCH] chart: fix ovs-ovn upgrade (#3164) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张祖建 --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c10546fd6a7f..21267fa2eaff 100644 --- a/Makefile +++ b/Makefile @@ -263,16 +263,17 @@ kind-install-chart: kind-load-image kind-untaint-control-plane kubectl label node -lbeta.kubernetes.io/os=linux kubernetes.io/os=linux --overwrite kubectl label node -lnode-role.kubernetes.io/control-plane kube-ovn/role=master --overwrite kubectl label node -lovn.kubernetes.io/ovs_dp_type!=userspace ovn.kubernetes.io/ovs_dp_type=kernel --overwrite - ips=$$(kubectl get node -lkube-ovn/role=master --no-headers -o wide | awk '{print $$6}') && \ + ips=$$(kubectl get node -lkube-ovn/role=master --no-headers -o wide | awk '{print $$6}' | tr '\n' ',' | sed 's/,$$//') && \ helm install kubeovn ./kubeovn-helm \ --set global.images.kubeovn.tag=$(VERSION) \ - --set replicaCount=$$(echo $$ips | awk '{print NF}') \ - --set cni_conf.MASTER_NODES="$$(echo $$ips | tr \\n ',' | sed -e 's/,$$//' -e 's/,/\\,/g')" - kubectl rollout status deployment/ovn-central -n kube-system --timeout 300s - kubectl rollout status deployment/kube-ovn-controller -n kube-system --timeout 120s - kubectl rollout status daemonset/kube-ovn-cni -n kube-system --timeout 120s - kubectl rollout status daemonset/kube-ovn-pinger -n kube-system --timeout 120s - kubectl rollout status deployment/coredns -n kube-system --timeout 60s + --set replicaCount=$$(echo $$ips | awk -F ',' '{print NF}') \ + --set cni_conf.MASTER_NODES="$$(echo $$ips | sed 's/,/\\,/g')" + sleep 60 + kubectl -n kube-system rollout status --timeout=1s deployment/ovn-central + kubectl -n kube-system rollout status --timeout=1s daemonset/ovs-ovn + kubectl -n kube-system rollout status --timeout=1s deployment/kube-ovn-controller + kubectl -n kube-system rollout status --timeout=1s daemonset/kube-ovn-cni + kubectl -n kube-system rollout status --timeout=1s daemonset/kube-ovn-pinger .PHONY: kind-install kind-install: kind-load-image