From 959998eb056ddb00897cd3f5b71af511cb3be8aa Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Mon, 24 Jun 2024 13:16:59 +0000 Subject: [PATCH 01/15] SMAR-2708 add required configuration to helm chart --- templates/_matcher.tpl | 3 +++ templates/api-deployment.yaml | 3 +++ templates/auth-api-deployment.yaml | 3 +++ templates/countly-publisher-deployment.yaml | 3 +++ templates/db-synchronization-leader-deployment.yaml | 3 +++ templates/detector-deployment.yaml | 3 +++ templates/extractor-deployment.yaml | 3 +++ templates/graphql-deployment.yaml | 3 +++ templates/liveness-deployment.yaml | 3 +++ templates/station-deployment.yaml | 3 +++ values.yaml | 3 +++ 11 files changed, 33 insertions(+) diff --git a/templates/_matcher.tpl b/templates/_matcher.tpl index 6743784..67b271c 100644 --- a/templates/_matcher.tpl +++ b/templates/_matcher.tpl @@ -20,6 +20,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.matcher.replicas }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml index be62b43..6122799 100644 --- a/templates/api-deployment.yaml +++ b/templates/api-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.api.replicas }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/auth-api-deployment.yaml b/templates/auth-api-deployment.yaml index 7d3fa24..0a8066b 100644 --- a/templates/auth-api-deployment.yaml +++ b/templates/auth-api-deployment.yaml @@ -18,6 +18,9 @@ spec: {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.api.enabled ) }} replicas: {{ .Values.authApi.replicas }} {{- end }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/countly-publisher-deployment.yaml b/templates/countly-publisher-deployment.yaml index af40ce4..55f54f3 100644 --- a/templates/countly-publisher-deployment.yaml +++ b/templates/countly-publisher-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/db-synchronization-leader-deployment.yaml b/templates/db-synchronization-leader-deployment.yaml index 871fea9..f1d5d63 100644 --- a/templates/db-synchronization-leader-deployment.yaml +++ b/templates/db-synchronization-leader-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.dbSynchronizationLeader.replicas }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/detector-deployment.yaml b/templates/detector-deployment.yaml index faf06f8..8155e8b 100644 --- a/templates/detector-deployment.yaml +++ b/templates/detector-deployment.yaml @@ -17,6 +17,9 @@ spec: {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.detector.enabled ) }} replicas: {{ .Values.detector.replicas }} {{- end }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/extractor-deployment.yaml b/templates/extractor-deployment.yaml index 1763b6f..4af26c7 100644 --- a/templates/extractor-deployment.yaml +++ b/templates/extractor-deployment.yaml @@ -17,6 +17,9 @@ spec: {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.extractor.enabled ) }} replicas: {{ .Values.extractor.replicas }} {{- end }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/graphql-deployment.yaml b/templates/graphql-deployment.yaml index 652b98d..9e45301 100644 --- a/templates/graphql-deployment.yaml +++ b/templates/graphql-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.graphqlApi.replicas }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/liveness-deployment.yaml b/templates/liveness-deployment.yaml index 9941c00..fe0d933 100644 --- a/templates/liveness-deployment.yaml +++ b/templates/liveness-deployment.yaml @@ -15,6 +15,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.liveness.replicas }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/station-deployment.yaml b/templates/station-deployment.yaml index c667acb..d8919cc 100644 --- a/templates/station-deployment.yaml +++ b/templates/station-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/values.yaml b/values.yaml index 2a99ceb..30854f6 100644 --- a/values.yaml +++ b/values.yaml @@ -6,6 +6,9 @@ global: image: # -- Overrides the Docker registry globally for all images registry: "registry.gitlab.com" + deployments: + revisionHistoryLimit: 10 + strategy: "RollingUpdate" # -- Overrides the chart's name nameOverride: null From dc2c4739b88bb6abe77d9849837bc8bf2a26272b Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Mon, 24 Jun 2024 15:23:17 +0000 Subject: [PATCH 02/15] SMAR-2708 clean up forgoten values --- values.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/values.yaml b/values.yaml index 30854f6..a5944fd 100644 --- a/values.yaml +++ b/values.yaml @@ -6,9 +6,6 @@ global: image: # -- Overrides the Docker registry globally for all images registry: "registry.gitlab.com" - deployments: - revisionHistoryLimit: 10 - strategy: "RollingUpdate" # -- Overrides the chart's name nameOverride: null @@ -22,6 +19,11 @@ podLabels: {} serviceAnnotations: {} # -- Common labels for all services serviceLabels: {} +# -- Common revisionHistoryLimit for all deployments +revisionHistoryLimit: 10 +# -- Common updateStrategy for all deployments +updateStrategy: + type: "RollingUpdate" # -- docker secrets used to pull images with imagePullSecrets: From d3ce7f5ab35e38640a59f3432cd326100b14e2e6 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Mon, 24 Jun 2024 16:18:49 +0000 Subject: [PATCH 03/15] SMAR-2708 make configurable another deployments --- templates/edge-streams/access-controller-deployment.yaml | 3 +++ templates/edge-streams/base-deployment.yaml | 3 +++ templates/edge-streams/edge-stream-processor-deployment.yaml | 3 +++ templates/edge-streams/edge-streams-state-sync-deployment.yaml | 3 +++ templates/edge-streams/face-matcher-deployment.yaml | 3 +++ templates/edge-streams/stream-data-db-worker-deployment.yaml | 3 +++ templates/readonly-api/api-nginx-deployment.yaml | 3 +++ templates/readonly-api/auth-api-nginx-deployment.yaml | 3 +++ 8 files changed, 24 insertions(+) diff --git a/templates/edge-streams/access-controller-deployment.yaml b/templates/edge-streams/access-controller-deployment.yaml index cb2d5bd..3167cd9 100644 --- a/templates/edge-streams/access-controller-deployment.yaml +++ b/templates/edge-streams/access-controller-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/edge-streams/base-deployment.yaml b/templates/edge-streams/base-deployment.yaml index 1ddeb7b..d565646 100644 --- a/templates/edge-streams/base-deployment.yaml +++ b/templates/edge-streams/base-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} 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 index 9d39abd..319e9ee 100644 --- a/templates/edge-streams/edge-stream-processor-deployment.yaml +++ b/templates/edge-streams/edge-stream-processor-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.edgeStreamProcessor.replicas }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} 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 index de6a023..e4fdc2f 100644 --- a/templates/edge-streams/edge-streams-state-sync-deployment.yaml +++ b/templates/edge-streams/edge-streams-state-sync-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/edge-streams/face-matcher-deployment.yaml b/templates/edge-streams/face-matcher-deployment.yaml index 0bc61a3..be3ce2a 100644 --- a/templates/edge-streams/face-matcher-deployment.yaml +++ b/templates/edge-streams/face-matcher-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.faceMatcher.replicas }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} 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 index d713a86..98ec979 100644 --- a/templates/edge-streams/stream-data-db-worker-deployment.yaml +++ b/templates/edge-streams/stream-data-db-worker-deployment.yaml @@ -16,6 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.streamDataDbWorker.replicas }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: {{- $selectorLabels | nindent 6 }} diff --git a/templates/readonly-api/api-nginx-deployment.yaml b/templates/readonly-api/api-nginx-deployment.yaml index a99966e..3e6f440 100644 --- a/templates/readonly-api/api-nginx-deployment.yaml +++ b/templates/readonly-api/api-nginx-deployment.yaml @@ -4,6 +4,9 @@ kind: Deployment metadata: name: {{ .Values.readonlyApi.noAuthName | quote }} spec: + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} 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 index dd27e71..ba8cea5 100644 --- a/templates/readonly-api/auth-api-nginx-deployment.yaml +++ b/templates/readonly-api/auth-api-nginx-deployment.yaml @@ -4,6 +4,9 @@ kind: Deployment metadata: name: {{ .Values.readonlyApi.authName | quote }} spec: + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + strategy: + type: {{ .Values.updateStrategy.type }} selector: matchLabels: app: {{ .Values.readonlyApi.authName | quote }} From 17e6eabcca612418ead17c4e41cb6919dd1aa15e Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Mon, 24 Jun 2024 16:45:59 +0000 Subject: [PATCH 04/15] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 982c397..18d8025 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added test pods supporting `helm test` command - There are multiple test pods, some of which run based on what is possible to test in the selected chart configuration - Added support for tenant management API (ingress) +- Make deployment revisionHistoryLimit and updateStrategy configurable via values ### Changed - Bumped version of `sf-tenant-management` subchart From dd882db850df80dded4909b521ffcc442e4ac8d4 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Tue, 25 Jun 2024 11:20:44 +0000 Subject: [PATCH 05/15] SMAR-2708 update help text --- values.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/values.yaml b/values.yaml index a5944fd..ebd79da 100644 --- a/values.yaml +++ b/values.yaml @@ -22,6 +22,13 @@ serviceLabels: {} # -- Common revisionHistoryLimit for all deployments revisionHistoryLimit: 10 # -- Common updateStrategy for all deployments +## e.g: +## updateStrategy: +## type: RollingUpdate +## rollingUpdate: +## maxSurge: 25% +## maxUnavailable: 25% +## updateStrategy: type: "RollingUpdate" From 075d0dc62bd18f0a6c7b9245f4ecaa3d755dde37 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Tue, 25 Jun 2024 11:56:08 +0000 Subject: [PATCH 06/15] SMAR-2708 precommit helm docs file change --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bf53fb5..9de04e8 100644 --- a/README.md +++ b/README.md @@ -512,6 +512,7 @@ metadata: | readonlyApi.nodeSelector | object | `{}` | | | readonlyApi.proxyContainer.resources | object | `{}` | | | readonlyApi.tolerations | list | `[]` | | +| revisionHistoryLimit | int | `10` | Common revisionHistoryLimit for all deployments | | serviceAccount.annotations | object | `{}` | Annotations for the service account | | serviceAccount.automountServiceAccountToken | bool | `true` | Set this toggle to false to opt out of automounting API credentials for the service account | | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | @@ -574,6 +575,7 @@ metadata: | tests.podAnnotations | object | `{}` | Annotations for test pods | | tests.podLabels | object | `{}` | Additional labels for test pods | | tests.tolerations | list | `[]` | | +| updateStrategy | object | `{"type":"RollingUpdate"}` | Common updateStrategy for all deployments # e.g: # updateStrategy: # type: RollingUpdate # rollingUpdate: # maxSurge: 25% # maxUnavailable: 25% # | | wlStreamPopulationJob.enabled | bool | `false` | | | wlStreamPopulationJob.image.digest | string | `nil` | Overrides the image tag with an image digest | | wlStreamPopulationJob.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy | From 70556eb9ef8ebef3c2c48f69643dfc3dfb0be92e Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Tue, 25 Jun 2024 15:19:07 +0000 Subject: [PATCH 07/15] SMAR-2708 update configuration to be more flexible and relly and standart default values --- templates/_matcher.tpl | 5 +++-- templates/api-deployment.yaml | 5 +++-- templates/auth-api-deployment.yaml | 5 +++-- templates/countly-publisher-deployment.yaml | 5 +++-- templates/db-synchronization-leader-deployment.yaml | 5 +++-- templates/detector-deployment.yaml | 8 ++++++-- templates/edge-streams/access-controller-deployment.yaml | 5 +++-- templates/edge-streams/base-deployment.yaml | 5 +++-- .../edge-streams/edge-stream-processor-deployment.yaml | 5 +++-- .../edge-streams/edge-streams-state-sync-deployment.yaml | 5 +++-- templates/edge-streams/face-matcher-deployment.yaml | 5 +++-- .../edge-streams/stream-data-db-worker-deployment.yaml | 5 +++-- templates/extractor-deployment.yaml | 5 +++-- templates/graphql-deployment.yaml | 5 +++-- templates/liveness-deployment.yaml | 5 +++-- templates/readonly-api/api-nginx-deployment.yaml | 5 +++-- templates/readonly-api/auth-api-nginx-deployment.yaml | 5 +++-- templates/station-deployment.yaml | 5 +++-- values.yaml | 5 ++--- 19 files changed, 59 insertions(+), 39 deletions(-) diff --git a/templates/_matcher.tpl b/templates/_matcher.tpl index 67b271c..6b96424 100644 --- 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 index 6122799..a9d72ef 100644 --- 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 index 0a8066b..144a375 100644 --- 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 index 55f54f3..104bca1 100644 --- 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 index f1d5d63..1fe6294 100644 --- 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 index 8155e8b..f91ce23 100644 --- 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 index 3167cd9..d3192c5 100644 --- 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 index d565646..02cc540 100644 --- 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 index 319e9ee..62ed854 100644 --- 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 index e4fdc2f..c67c516 100644 --- 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 index be3ce2a..b5ed3a8 100644 --- 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 index 98ec979..84eab70 100644 --- 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 index 4af26c7..9af7868 100644 --- 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 index 9e45301..ec31ce3 100644 --- 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 index fe0d933..a491895 100644 --- 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 index 3e6f440..f387742 100644 --- 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 index ba8cea5..6aea32f 100644 --- 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 index d8919cc..ded2c6d 100644 --- 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 index ebd79da..6956d26 100644 --- 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: From 8c83755a8755e977c7d2c05045e6c0ca8ead643c Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Tue, 25 Jun 2024 17:24:18 +0200 Subject: [PATCH 08/15] update readme with helm-doc --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9de04e8..7f652fb 100644 --- a/README.md +++ b/README.md @@ -512,7 +512,7 @@ metadata: | readonlyApi.nodeSelector | object | `{}` | | | readonlyApi.proxyContainer.resources | object | `{}` | | | readonlyApi.tolerations | list | `[]` | | -| revisionHistoryLimit | int | `10` | Common revisionHistoryLimit for all deployments | +| revisionHistoryLimit | string | `nil` | Common revisionHistoryLimit for all deployments | | serviceAccount.annotations | object | `{}` | Annotations for the service account | | serviceAccount.automountServiceAccountToken | bool | `true` | Set this toggle to false to opt out of automounting API credentials for the service account | | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | @@ -575,7 +575,7 @@ metadata: | tests.podAnnotations | object | `{}` | Annotations for test pods | | tests.podLabels | object | `{}` | Additional labels for test pods | | tests.tolerations | list | `[]` | | -| updateStrategy | object | `{"type":"RollingUpdate"}` | Common updateStrategy for all deployments # e.g: # updateStrategy: # type: RollingUpdate # rollingUpdate: # maxSurge: 25% # maxUnavailable: 25% # | +| updateStrategy | object | `{}` | Common updateStrategy for all deployments # e.g: # updateStrategy: # type: RollingUpdate # rollingUpdate: # maxSurge: 25% # maxUnavailable: 25% # | | wlStreamPopulationJob.enabled | bool | `false` | | | wlStreamPopulationJob.image.digest | string | `nil` | Overrides the image tag with an image digest | | wlStreamPopulationJob.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy | From a117dbdb40b81e11d883c8ef9de8aa5068ac397f Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Tue, 25 Jun 2024 17:45:13 +0200 Subject: [PATCH 09/15] SMAR-2708 remove debug code --- templates/detector-deployment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/detector-deployment.yaml b/templates/detector-deployment.yaml index f91ce23..ac0e962 100644 --- a/templates/detector-deployment.yaml +++ b/templates/detector-deployment.yaml @@ -6,8 +6,6 @@ metadata: name: {{ $name | quote }} labels: {{- include "smartface.detector.labels" . | nindent 4 }} - {{- if .Values.updateStrategy }} - debug: "ano" {{- end }} annotations: {{- with .Values.annotations }} From 4fce62e71e2aa9fc845965134d6657e5a92d9453 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Tue, 25 Jun 2024 17:47:24 +0200 Subject: [PATCH 10/15] SMAR-2708 fixing typo --- templates/detector-deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/detector-deployment.yaml b/templates/detector-deployment.yaml index ac0e962..25e4f4e 100644 --- a/templates/detector-deployment.yaml +++ b/templates/detector-deployment.yaml @@ -6,7 +6,6 @@ metadata: name: {{ $name | quote }} labels: {{- include "smartface.detector.labels" . | nindent 4 }} - {{- end }} annotations: {{- with .Values.annotations }} {{- toYaml . | nindent 4 }} From 5088b53267f2c1c8583efdeaebc77a9d737a3b1a Mon Sep 17 00:00:00 2001 From: egid-fertal-inno Date: Wed, 26 Jun 2024 09:30:46 +0200 Subject: [PATCH 11/15] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Peter Pokojný --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d8025..5d3df87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Added test pods supporting `helm test` command - There are multiple test pods, some of which run based on what is possible to test in the selected chart configuration - Added support for tenant management API (ingress) -- Make deployment revisionHistoryLimit and updateStrategy configurable via values +- Deployment revisionHistoryLimit and updateStrategy are configurable via values ### Changed - Bumped version of `sf-tenant-management` subchart From 418514457c92e93979b7708cbca2d8bd46d7a8ae Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Wed, 26 Jun 2024 14:03:51 +0200 Subject: [PATCH 12/15] SMAR-2708 update to review --- .gitignore | 2 ++ templates/api-deployment.yaml | 2 ++ templates/auth-api-deployment.yaml | 2 ++ templates/countly-publisher-deployment.yaml | 2 ++ templates/db-synchronization-leader-deployment.yaml | 2 ++ templates/detector-deployment.yaml | 2 ++ templates/edge-streams/access-controller-deployment.yaml | 2 ++ templates/edge-streams/base-deployment.yaml | 2 ++ templates/edge-streams/edge-stream-processor-deployment.yaml | 2 ++ templates/edge-streams/edge-streams-state-sync-deployment.yaml | 2 ++ templates/edge-streams/face-matcher-deployment.yaml | 2 ++ templates/edge-streams/stream-data-db-worker-deployment.yaml | 2 ++ templates/extractor-deployment.yaml | 2 ++ templates/graphql-deployment.yaml | 2 ++ templates/liveness-deployment.yaml | 2 ++ templates/readonly-api/api-nginx-deployment.yaml | 2 ++ templates/readonly-api/auth-api-nginx-deployment.yaml | 2 ++ templates/station-deployment.yaml | 2 ++ 18 files changed, 36 insertions(+) diff --git a/.gitignore b/.gitignore index c27caed..3639c7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.tgz *.zip +.devcontainer/ +egid.values.yaml diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml index a9d72ef..a88fb19 100644 --- a/templates/api-deployment.yaml +++ b/templates/api-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.api.replicas }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/auth-api-deployment.yaml b/templates/auth-api-deployment.yaml index 144a375..a9045e2 100644 --- a/templates/auth-api-deployment.yaml +++ b/templates/auth-api-deployment.yaml @@ -18,7 +18,9 @@ spec: {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.api.enabled ) }} replicas: {{ .Values.authApi.replicas }} {{- end }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/countly-publisher-deployment.yaml b/templates/countly-publisher-deployment.yaml index 104bca1..e5cbf09 100644 --- a/templates/countly-publisher-deployment.yaml +++ b/templates/countly-publisher-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/db-synchronization-leader-deployment.yaml b/templates/db-synchronization-leader-deployment.yaml index 1fe6294..826035d 100644 --- a/templates/db-synchronization-leader-deployment.yaml +++ b/templates/db-synchronization-leader-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.dbSynchronizationLeader.replicas }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/detector-deployment.yaml b/templates/detector-deployment.yaml index 25e4f4e..9cf7015 100644 --- a/templates/detector-deployment.yaml +++ b/templates/detector-deployment.yaml @@ -17,7 +17,9 @@ spec: {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.detector.enabled ) }} replicas: {{ .Values.detector.replicas }} {{- end }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/edge-streams/access-controller-deployment.yaml b/templates/edge-streams/access-controller-deployment.yaml index d3192c5..8fb1eb7 100644 --- a/templates/edge-streams/access-controller-deployment.yaml +++ b/templates/edge-streams/access-controller-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/edge-streams/base-deployment.yaml b/templates/edge-streams/base-deployment.yaml index 02cc540..aa22917 100644 --- a/templates/edge-streams/base-deployment.yaml +++ b/templates/edge-streams/base-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/edge-streams/edge-stream-processor-deployment.yaml b/templates/edge-streams/edge-stream-processor-deployment.yaml index 62ed854..873da08 100644 --- a/templates/edge-streams/edge-stream-processor-deployment.yaml +++ b/templates/edge-streams/edge-stream-processor-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.edgeStreamProcessor.replicas }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/edge-streams/edge-streams-state-sync-deployment.yaml b/templates/edge-streams/edge-streams-state-sync-deployment.yaml index c67c516..d609fd1 100644 --- a/templates/edge-streams/edge-streams-state-sync-deployment.yaml +++ b/templates/edge-streams/edge-streams-state-sync-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/edge-streams/face-matcher-deployment.yaml b/templates/edge-streams/face-matcher-deployment.yaml index b5ed3a8..a8f5d5b 100644 --- a/templates/edge-streams/face-matcher-deployment.yaml +++ b/templates/edge-streams/face-matcher-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.faceMatcher.replicas }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/edge-streams/stream-data-db-worker-deployment.yaml b/templates/edge-streams/stream-data-db-worker-deployment.yaml index 84eab70..36dd69c 100644 --- a/templates/edge-streams/stream-data-db-worker-deployment.yaml +++ b/templates/edge-streams/stream-data-db-worker-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.streamDataDbWorker.replicas }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/extractor-deployment.yaml b/templates/extractor-deployment.yaml index 9af7868..f831fc9 100644 --- a/templates/extractor-deployment.yaml +++ b/templates/extractor-deployment.yaml @@ -17,7 +17,9 @@ spec: {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.extractor.enabled ) }} replicas: {{ .Values.extractor.replicas }} {{- end }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/graphql-deployment.yaml b/templates/graphql-deployment.yaml index ec31ce3..314cd70 100644 --- a/templates/graphql-deployment.yaml +++ b/templates/graphql-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.graphqlApi.replicas }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/liveness-deployment.yaml b/templates/liveness-deployment.yaml index a491895..a5362b4 100644 --- a/templates/liveness-deployment.yaml +++ b/templates/liveness-deployment.yaml @@ -15,7 +15,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.liveness.replicas }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/readonly-api/api-nginx-deployment.yaml b/templates/readonly-api/api-nginx-deployment.yaml index f387742..ad13fce 100644 --- a/templates/readonly-api/api-nginx-deployment.yaml +++ b/templates/readonly-api/api-nginx-deployment.yaml @@ -4,7 +4,9 @@ kind: Deployment metadata: name: {{ .Values.readonlyApi.noAuthName | quote }} spec: + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/readonly-api/auth-api-nginx-deployment.yaml b/templates/readonly-api/auth-api-nginx-deployment.yaml index 6aea32f..bb9d154 100644 --- a/templates/readonly-api/auth-api-nginx-deployment.yaml +++ b/templates/readonly-api/auth-api-nginx-deployment.yaml @@ -4,7 +4,9 @@ kind: Deployment metadata: name: {{ .Values.readonlyApi.authName | quote }} spec: + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} diff --git a/templates/station-deployment.yaml b/templates/station-deployment.yaml index ded2c6d..220c2a7 100644 --- a/templates/station-deployment.yaml +++ b/templates/station-deployment.yaml @@ -16,7 +16,9 @@ metadata: {{- end }} spec: replicas: 1 + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} From b5d2b789b2a077cd83ee1a05f542af0f6bdb80ef Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Wed, 26 Jun 2024 14:04:36 +0200 Subject: [PATCH 13/15] SMAR-2708 update to review --- values.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/values.yaml b/values.yaml index 6956d26..add8ff9 100644 --- a/values.yaml +++ b/values.yaml @@ -22,13 +22,6 @@ serviceLabels: {} # -- Common revisionHistoryLimit for all deployments revisionHistoryLimit: # -- Common updateStrategy for all deployments -## e.g: -## updateStrategy: -## type: RollingUpdate -## rollingUpdate: -## maxSurge: 25% -## maxUnavailable: 25% -## updateStrategy: {} # -- docker secrets used to pull images with From d11b1f2b999ea1248d06b2bc3f993fe7cf282c34 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Wed, 26 Jun 2024 14:07:25 +0200 Subject: [PATCH 14/15] SMAR-2708 added to forgotten tpl file --- templates/_matcher.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/_matcher.tpl b/templates/_matcher.tpl index 6b96424..0b813ba 100644 --- a/templates/_matcher.tpl +++ b/templates/_matcher.tpl @@ -20,7 +20,9 @@ metadata: {{- end }} spec: replicas: {{ .Values.matcher.replicas }} + {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} {{- if .Values.updateStrategy }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} {{- end }} From febb112b8a2af5632b1d4a88a2eed5f00c23cd79 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Wed, 26 Jun 2024 14:23:29 +0200 Subject: [PATCH 15/15] SMAR-2708 helm.doc update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f652fb..a223018 100644 --- a/README.md +++ b/README.md @@ -575,7 +575,7 @@ metadata: | tests.podAnnotations | object | `{}` | Annotations for test pods | | tests.podLabels | object | `{}` | Additional labels for test pods | | tests.tolerations | list | `[]` | | -| updateStrategy | object | `{}` | Common updateStrategy for all deployments # e.g: # updateStrategy: # type: RollingUpdate # rollingUpdate: # maxSurge: 25% # maxUnavailable: 25% # | +| updateStrategy | object | `{}` | Common updateStrategy for all deployments | | wlStreamPopulationJob.enabled | bool | `false` | | | wlStreamPopulationJob.image.digest | string | `nil` | Overrides the image tag with an image digest | | wlStreamPopulationJob.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |