From 4d457712260ac92d5fcf7e2cc5314d5bbe1fdb55 Mon Sep 17 00:00:00 2001
From: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
Date: Fri, 18 Aug 2023 09:53:00 +0800
Subject: [PATCH] Fix max unavailable (#3149)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 统一 ovs ovn  maxUnavailable

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
---
 charts/templates/ovn-dpdk-ds.yaml |  5 ++++-
 dist/images/install.sh            | 11 +++++++----
 yamls/ovn-dpdk.yaml               |  9 ++++++---
 yamls/ovn-ha.yaml                 |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/charts/templates/ovn-dpdk-ds.yaml b/charts/templates/ovn-dpdk-ds.yaml
index 9be3d6bf99d..714bbb69ff6 100644
--- a/charts/templates/ovn-dpdk-ds.yaml
+++ b/charts/templates/ovn-dpdk-ds.yaml
@@ -12,7 +12,10 @@ spec:
     matchLabels:
       app: ovs-dpdk
   updateStrategy:
-    type: OnDelete
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
   template:
     metadata:
       labels:
diff --git a/dist/images/install.sh b/dist/images/install.sh
index 8d6a4606fbb..1e854fe73bd 100755
--- a/dist/images/install.sh
+++ b/dist/images/install.sh
@@ -3331,13 +3331,16 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: ovs
+      app: ovs-dpdk
   updateStrategy:
-    type: OnDelete
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
   template:
     metadata:
       labels:
-        app: ovs
+        app: ovs-dpdk
         component: network
         type: infra
     spec:
@@ -3497,7 +3500,7 @@ spec:
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:
-      maxSurge: 100%
+      maxSurge: 1
       maxUnavailable: 0
   template:
     metadata:
diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
index 85748237316..13f5efca5fb 100644
--- a/yamls/ovn-dpdk.yaml
+++ b/yamls/ovn-dpdk.yaml
@@ -315,13 +315,16 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: ovs
+      app: ovs-dpdk
   updateStrategy:
-    type: OnDelete
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
   template:
     metadata:
       labels:
-        app: ovs
+        app: ovs-dpdk
         component: network
         type: infra
     spec:
diff --git a/yamls/ovn-ha.yaml b/yamls/ovn-ha.yaml
index 46f30e1031e..d8fe76afdc2 100644
--- a/yamls/ovn-ha.yaml
+++ b/yamls/ovn-ha.yaml
@@ -219,7 +219,7 @@ spec:
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:
-      maxSurge: 100%
+      maxSurge: 1
       maxUnavailable: 0
   template:
     metadata: