diff --git a/chart/templates/api/deployment.yaml b/chart/templates/api/deployment.yaml index 58632fb4..1be6e3c6 100644 --- a/chart/templates/api/deployment.yaml +++ b/chart/templates/api/deployment.yaml @@ -107,7 +107,7 @@ spec: resources: {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.api.kyoo_api.containerSecurityContext }} + {{- with (mergeOverwrite (deepCopy .Values.global.containerSecurityContext) .Values.api.kyoo_api.containerSecurityContext) }} securityContext: {{- toYaml . | nindent 12 }} {{- end }} diff --git a/chart/templates/auth/deployment.yaml b/chart/templates/auth/deployment.yaml index 0fc08893..15e92357 100644 --- a/chart/templates/auth/deployment.yaml +++ b/chart/templates/auth/deployment.yaml @@ -153,7 +153,7 @@ spec: resources: {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.auth.kyoo_auth.containerSecurityContext }} + {{- with (mergeOverwrite (deepCopy .Values.global.containerSecurityContext) .Values.auth.kyoo_auth.containerSecurityContext) }} securityContext: {{- toYaml . | nindent 12 }} {{- end }} diff --git a/chart/templates/front/deployment.yaml b/chart/templates/front/deployment.yaml index 005070d1..eea984c0 100644 --- a/chart/templates/front/deployment.yaml +++ b/chart/templates/front/deployment.yaml @@ -73,7 +73,7 @@ spec: resources: {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.front.kyoo_front.containerSecurityContext }} + {{- with (mergeOverwrite (deepCopy .Values.global.containerSecurityContext) .Values.front.kyoo_front.containerSecurityContext) }} securityContext: {{- toYaml . | nindent 12 }} {{- end }} diff --git a/chart/templates/scanner/deployment.yaml b/chart/templates/scanner/deployment.yaml index c6e331e5..88fe88db 100644 --- a/chart/templates/scanner/deployment.yaml +++ b/chart/templates/scanner/deployment.yaml @@ -118,7 +118,7 @@ spec: resources: {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.scanner.kyoo_scanner.containerSecurityContext }} + {{- with (mergeOverwrite (deepCopy .Values.global.containerSecurityContext) .Values.scanner.kyoo_scanner.containerSecurityContext) }} securityContext: {{- toYaml . | nindent 12 }} {{- end }} diff --git a/chart/templates/traefikproxy/deployment.yaml b/chart/templates/traefikproxy/deployment.yaml index 97c3a911..34c8178f 100644 --- a/chart/templates/traefikproxy/deployment.yaml +++ b/chart/templates/traefikproxy/deployment.yaml @@ -78,7 +78,7 @@ spec: resources: {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.traefikproxy.traefik.containerSecurityContext }} + {{- with (mergeOverwrite (deepCopy .Values.global.containerSecurityContext) .Values.traefikproxy.traefik.containerSecurityContext) }} securityContext: {{- toYaml . | nindent 12 }} {{- end }} diff --git a/chart/templates/transcoder/deployment.yaml b/chart/templates/transcoder/deployment.yaml index 71f819f2..cce5f9a5 100644 --- a/chart/templates/transcoder/deployment.yaml +++ b/chart/templates/transcoder/deployment.yaml @@ -125,7 +125,7 @@ spec: resources: {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.transcoder.kyoo_transcoder.containerSecurityContext }} + {{- with (mergeOverwrite (deepCopy .Values.global.containerSecurityContext) .Values.transcoder.kyoo_transcoder.containerSecurityContext) }} securityContext: {{- toYaml . | nindent 12 }} {{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index 8a09a57a..3a640e4d 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -13,6 +13,8 @@ global: persistentVolumeClaimAnnotations: {} podAnnotations: {} podLabels: {} + securityContext: {} + containerSecurityContext: {} extraEnv: [] extraVolumes: [] extraVolumeMounts: [] @@ -442,14 +444,14 @@ traefikproxy: containerSecurityContext: {} extraVolumeMounts: [] extraArgs: - - '--entryPoints.web.address=:80/tcp' - - '--entryPoints.websecure.address=:443/tcp' - - '--entryPoints.web.forwardedHeaders.insecure=true' - - '--entryPoints.websecure.forwardedHeaders.insecure=true' - - '--api.dashboard=true' - - '--api.insecure=true' - - '--log.level=INFO' - - '--providers.file.filename=/dynamic_config/dynamic_config.yaml' + - "--entryPoints.web.address=:80/tcp" + - "--entryPoints.websecure.address=:443/tcp" + - "--entryPoints.web.forwardedHeaders.insecure=true" + - "--entryPoints.websecure.forwardedHeaders.insecure=true" + - "--api.dashboard=true" + - "--api.insecure=true" + - "--log.level=INFO" + - "--providers.file.filename=/dynamic_config/dynamic_config.yaml" extraEnv: [] image: repository: docker.io/traefik