SMAR-2708 update configuration to be more flexible and relly and standart default values

egid-fertal-inno · egid-fertal-inno · commit 70556eb9ef8e · 2024-06-25T15:19:07.000Z
diff --git a/templates/_matcher.tpl b/templates/_matcher.tpl
@@ -21,8 +21,9 @@ metadata:
 spec:
   replicas: {{ .Values.matcher.replicas }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: {{ .Values.api.replicas }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/auth-api-deployment.yaml b/templates/auth-api-deployment.yaml
@@ -19,8 +19,9 @@ spec:
   replicas: {{ .Values.authApi.replicas }}
   {{- end }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/countly-publisher-deployment.yaml b/templates/countly-publisher-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/db-synchronization-leader-deployment.yaml b/templates/db-synchronization-leader-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: {{ .Values.dbSynchronizationLeader.replicas }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/detector-deployment.yaml b/templates/detector-deployment.yaml
@@ -6,6 +6,9 @@ metadata:
   name: {{ $name | quote }}
   labels:
     {{- include "smartface.detector.labels" . | nindent 4 }}
+    {{- if .Values.updateStrategy }}
+    debug: "ano"
+    {{- end }}
   annotations:
     {{- with .Values.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -18,8 +21,9 @@ spec:
   replicas: {{ .Values.detector.replicas }}
   {{- end }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/edge-streams/access-controller-deployment.yaml b/templates/edge-streams/access-controller-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/edge-streams/base-deployment.yaml b/templates/edge-streams/base-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/edge-streams/edge-stream-processor-deployment.yaml b/templates/edge-streams/edge-stream-processor-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: {{ .Values.edgeStreamProcessor.replicas }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/edge-streams/edge-streams-state-sync-deployment.yaml b/templates/edge-streams/edge-streams-state-sync-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/edge-streams/face-matcher-deployment.yaml b/templates/edge-streams/face-matcher-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: {{ .Values.faceMatcher.replicas }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/edge-streams/stream-data-db-worker-deployment.yaml b/templates/edge-streams/stream-data-db-worker-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: {{ .Values.streamDataDbWorker.replicas }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/extractor-deployment.yaml b/templates/extractor-deployment.yaml
@@ -18,8 +18,9 @@ spec:
   replicas: {{ .Values.extractor.replicas }}
   {{- end }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/graphql-deployment.yaml b/templates/graphql-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: {{ .Values.graphqlApi.replicas }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/liveness-deployment.yaml b/templates/liveness-deployment.yaml
@@ -16,8 +16,9 @@ metadata:
 spec:
   replicas: {{ .Values.liveness.replicas }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/templates/readonly-api/api-nginx-deployment.yaml b/templates/readonly-api/api-nginx-deployment.yaml
@@ -5,8 +5,9 @@ metadata:
   name: {{ .Values.readonlyApi.noAuthName | quote }}
 spec:
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       app: {{ .Values.readonlyApi.noAuthName | quote }}
diff --git a/templates/readonly-api/auth-api-nginx-deployment.yaml b/templates/readonly-api/auth-api-nginx-deployment.yaml
@@ -5,8 +5,9 @@ metadata:
   name: {{ .Values.readonlyApi.authName | quote }}
 spec:
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       app: {{ .Values.readonlyApi.authName | quote }}
diff --git a/templates/station-deployment.yaml b/templates/station-deployment.yaml
@@ -17,8 +17,9 @@ metadata:
 spec:
   replicas: 1
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
-  strategy:
-    type: {{ .Values.updateStrategy.type }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- $selectorLabels | nindent 6 }}
diff --git a/values.yaml b/values.yaml
@@ -20,7 +20,7 @@ serviceAnnotations: {}
 # -- Common labels for all services
 serviceLabels: {}
 # -- Common revisionHistoryLimit for all deployments
-revisionHistoryLimit: 10
+revisionHistoryLimit:
 # -- Common updateStrategy for all deployments
 ## e.g:
 ## updateStrategy:
@@ -29,8 +29,7 @@ revisionHistoryLimit: 10
 ##    maxSurge: 25%
 ##    maxUnavailable: 25%
 ##
-updateStrategy:
-  type: "RollingUpdate"
+updateStrategy: {}
 
 # -- docker secrets used to pull images with
 imagePullSecrets:
