Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/smar-2708 add additional configuration for deployments in helm #18

Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@ metadata:
| readonlyApi.nodeSelector | object | `{}` | |
| readonlyApi.proxyContainer.resources | object | `{}` | |
| readonlyApi.tolerations | list | `[]` | |
| 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 |
Expand Down Expand Up @@ -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 | `{}` | 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 |
Expand Down
4 changes: 4 additions & 0 deletions templates/_matcher.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ metadata:
{{- end }}
spec:
replicas: {{ .Values.matcher.replicas }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/api-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: {{ .Values.api.replicas }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/auth-api-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ 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 }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/countly-publisher-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: 1
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/db-synchronization-leader-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: {{ .Values.dbSynchronizationLeader.replicas }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/detector-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ 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 }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/edge-streams/access-controller-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: 1
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/edge-streams/base-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: 1
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/edge-streams/edge-stream-processor-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: {{ .Values.edgeStreamProcessor.replicas }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: 1
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/edge-streams/face-matcher-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: {{ .Values.faceMatcher.replicas }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/edge-streams/stream-data-db-worker-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: {{ .Values.streamDataDbWorker.replicas }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/extractor-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ 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 }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/graphql-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: {{ .Values.graphqlApi.replicas }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/liveness-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ metadata:
{{- end }}
spec:
replicas: {{ .Values.liveness.replicas }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions templates/readonly-api/api-nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ kind: Deployment
metadata:
name: {{ .Values.readonlyApi.noAuthName | quote }}
spec:
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
app: {{ .Values.readonlyApi.noAuthName | quote }}
Expand Down
4 changes: 4 additions & 0 deletions templates/readonly-api/auth-api-nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ kind: Deployment
metadata:
name: {{ .Values.readonlyApi.authName | quote }}
spec:
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
app: {{ .Values.readonlyApi.authName | quote }}
Expand Down
4 changes: 4 additions & 0 deletions templates/station-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ metadata:
{{- end }}
spec:
replicas: 1
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- $selectorLabels | nindent 6 }}
Expand Down
11 changes: 11 additions & 0 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ podLabels: {}
serviceAnnotations: {}
# -- Common labels for all services
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
imagePullSecrets:
Expand Down
Loading