add deployment strategy to IstioControlPlane k8s settings. (istio#234)

* add deployment strategy to k8s settings. * support reverse translate dployment strategy.
tangiel · Aug 27, 2019 · 1d01b4f · 1d01b4f
1 parent ed3f878
commit 1d01b4f
Show file tree

Hide file tree

Showing 16 changed files with 692 additions and 813 deletions.
diff --git a/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.yaml b/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.yaml
@@ -259,8 +259,6 @@ data:
       requests:
         cpu: 500m
         memory: 2048Mi
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
     telemetry:
       enabled: true
     tolerations: []

diff --git a/cmd/mesh/testdata/manifest-migrate/input/values.yaml b/cmd/mesh/testdata/manifest-migrate/input/values.yaml
@@ -493,8 +493,6 @@ istio_cni:
 istiocoredns:
   enabled: false
   replicaCount: 1
-  rollingMaxSurge: 100%
-  rollingMaxUnavailable: 25%
   coreDNSImage: coredns/coredns:1.1.2
   coreDNSPluginImage: istio/coredns-plugin:0.2-istio-1.1
   nodeSelector: {}

diff --git a/cmd/mesh/testdata/manifest-migrate/output/values.yaml b/cmd/mesh/testdata/manifest-migrate/output/values.yaml
@@ -9,6 +9,10 @@ autoInjection:
             requiredDuringSchedulingIgnoredDuringExecution: []
         nodeSelector: {}
         replicaCount: 1
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: true
 configManagement:
   components:
@@ -24,6 +28,10 @@ configManagement:
         resources:
           requests:
             cpu: 100m
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: true
 gateways:
   components:
@@ -58,6 +66,10 @@ gateways:
           requests:
             cpu: 100m
             memory: 128Mi
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
     ingressGateway:
       enabled: true
       k8s:
@@ -89,6 +101,10 @@ gateways:
           requests:
             cpu: 100m
             memory: 128Mi
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: true
 hub: gcr.io/istio-release
 policy:
@@ -118,6 +134,10 @@ policy:
         nodeSelector: {}
         podAnnotations: {}
         replicaCount: 1
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: true
 security:
   components:
@@ -132,6 +152,10 @@ security:
             requiredDuringSchedulingIgnoredDuringExecution: []
         nodeSelector: {}
         replicaCount: 1
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
     nodeAgent:
       enabled: false
   enabled: true
@@ -166,6 +190,10 @@ telemetry:
           requests:
             cpu: 1000m
             memory: 1G
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: true
 trafficManagement:
   components:
@@ -197,6 +225,10 @@ trafficManagement:
           requests:
             cpu: 500m
             memory: 2048Mi
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: true
 values:
   certmanager:
@@ -206,8 +238,6 @@ values:
     tag: v0.6.2
   galley:
     image: galley
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
   gateways:
     istio-egressgateway:
       connectTimeout: 10s
@@ -216,8 +246,6 @@ values:
         name: tls
         port: 15443
         targetPort: 15443
-      rollingMaxSurge: 100%
-      rollingMaxUnavailable: 25%
       secretVolumes:
         mountPath: /etc/istio/egressgateway-ca-certs
         name: egressgateway-ca-certs
@@ -238,8 +266,6 @@ values:
         name: tls
         port: 15443
         targetPort: 15443
-      rollingMaxSurge: 100%
-      rollingMaxUnavailable: 25%
       sds:
         image: node-agent-k8s
         resources:
@@ -395,8 +421,6 @@ values:
     coreDNSPluginImage: istio/coredns-plugin:0.2-istio-1.1
     enabled: false
     replicaCount: 1
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
   kiali:
     contextPath: /kiali
     createDemoSecret: false
@@ -422,17 +446,13 @@ values:
   mixer:
     policy:
       image: mixer
-      rollingMaxSurge: 100%
-      rollingMaxUnavailable: 25%
     telemetry:
       image: mixer
       loadshedding:
         latencyThreshold: 100ms
         mode: enforce
       reportBatchMaxEntries: 100
       reportBatchMaxTime: 1s
-      rollingMaxSurge: 100%
-      rollingMaxUnavailable: 25%
       sessionAffinityEnabled: false
       useMCP: true
   nodeagent:
@@ -452,8 +472,6 @@ values:
     keepaliveMaxServerConnectionAge: 30m
     policy:
       enabled: false
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
     telemetry:
       enabled: true
     traceSampling: 1
@@ -560,8 +578,6 @@ values:
         istio-remote: istio-sidecar-injector.istio-remote.svc
     enableNamespacesByDefault: true
     image: citadel
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
     selfSigned: true
     trustDomain: cluster.local
     workloadCertTtl: 2160h
@@ -570,8 +586,6 @@ values:
     image: sidecar_injector
     injectLabel: istio-injection
     rewriteAppHTTPProbe: false
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
     selfSigned: false
   tracing:
     enabled: false

diff --git a/cmd/mesh/testdata/profile-dump/output/all_off.yaml b/cmd/mesh/testdata/profile-dump/output/all_off.yaml
@@ -4,6 +4,10 @@ autoInjection:
       enabled: true
       k8s:
         replicaCount: 1
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: false
 configManagement:
   components:
@@ -14,6 +18,10 @@ configManagement:
         resources:
           requests:
             cpu: 100m
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: false
 defaultNamespace: istio-system
 gateways:
@@ -40,6 +48,10 @@ gateways:
           requests:
             cpu: 100m
             memory: 128Mi
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
     ingressGateway:
       enabled: true
       k8s:
@@ -62,6 +74,10 @@ gateways:
           requests:
             cpu: 100m
             memory: 128Mi
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: false
 hub: gcr.io/istio-release
 policy:
@@ -85,12 +101,23 @@ policy:
             kind: Deployment
             name: istio-policy
         replicaCount: 1
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: false
 profile: default
 security:
   components:
     certManager:
       enabled: false
+    citadel:
+      enabled: true
+      k8s:
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
     nodeAgent:
       enabled: false
   enabled: false
@@ -125,6 +152,10 @@ telemetry:
           requests:
             cpu: 1000m
             memory: 1G
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: false
 trafficManagement:
   components:
@@ -171,6 +202,10 @@ trafficManagement:
           requests:
             cpu: 500m
             memory: 2048Mi
+        strategy:
+          rollingUpdate:
+            maxSurge: 100%
+            maxUnavailable: 25%
   enabled: false
 values:
   certmanager:
@@ -182,14 +217,10 @@ values:
       istio-pilot-service-account.istio-system: istio-pilot.istio-system
     enableNamespacesByDefault: true
     image: citadel
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
     selfSigned: true
     trustDomain: cluster.local
   clusterResources: true
-  galley:
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
+  galley: null
   gateways:
     istio-egressgateway:
       autoscaleEnabled: true
@@ -205,8 +236,6 @@ values:
       - name: tls
         port: 15443
         targetPort: 15443
-      rollingMaxSurge: 100%
-      rollingMaxUnavailable: 25%
       secretVolumes:
       - mountPath: /etc/istio/egressgateway-certs
         name: egressgateway-certs
@@ -258,8 +287,6 @@ values:
       - name: tls
         port: 15443
         targetPort: 15443
-      rollingMaxSurge: 100%
-      rollingMaxUnavailable: 25%
       secretVolumes:
       - mountPath: /etc/istio/ingressgateway-certs
         name: ingressgateway-certs
@@ -505,8 +532,6 @@ values:
         kubernetesenv:
           enabled: true
       image: mixer
-      rollingMaxSurge: 100%
-      rollingMaxUnavailable: 25%
     telemetry:
       autoscaleEnabled: true
       image: mixer
@@ -519,8 +544,6 @@ values:
       replicaCount: 1
       reportBatchMaxEntries: 100
       reportBatchMaxTime: 1s
-      rollingMaxSurge: 100%
-      rollingMaxUnavailable: 25%
       sessionAffinityEnabled: false
       tolerations: []
       useMCP: true
@@ -552,8 +575,6 @@ values:
     policy:
       enabled: false
     replicaCount: 1
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
     telemetry:
       enabled: true
     tolerations: []
@@ -584,8 +605,6 @@ values:
     image: sidecar_injector
     injectLabel: istio-injection
     rewriteAppHTTPProbe: false
-    rollingMaxSurge: 100%
-    rollingMaxUnavailable: 25%
     selfSigned: false
   tracing:
     enabled: false
@@ -642,3 +661,4 @@ values:
           memory: 900Mi
       tag: 2.14.2
   version: ""
+