[airflow] branch main updated: Chart: Remove unnecessary `or` function in template files (#34415)

[jedcunningham]

This is an automated email from the ASF dual-hosted git repository.

jedcunningham pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new bb7e53c7d3 Chart: Remove unnecessary `or` function in template files 
(#34415)
bb7e53c7d3 is described below

commit bb7e53c7d312a89f1b41de709043d92ca3e9998d
Author: Kim Minwoo <rlaalsdn0...@gmail.com>
AuthorDate: Wed Sep 27 07:29:44 2023 +0900

    Chart: Remove unnecessary `or` function in template files (#34415)
---
 chart/templates/cleanup/cleanup-cronjob.yaml        | 2 +-
 chart/templates/webserver/webserver-deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/templates/cleanup/cleanup-cronjob.yaml 
b/chart/templates/cleanup/cleanup-cronjob.yaml
index d7b56c6f01..073dd70001 100644
--- a/chart/templates/cleanup/cleanup-cronjob.yaml
+++ b/chart/templates/cleanup/cleanup-cronjob.yaml
@@ -92,7 +92,7 @@ spec:
             - name: airflow-cleanup-pods
               image: {{ template "airflow_image" . }}
               imagePullPolicy: {{ .Values.images.airflow.pullPolicy }}
-              securityContext: {{ or $containerSecurityContext 
.Values.cleanup.securityContexts.container .Values.securityContexts.containers 
| nindent 16 }}
+              securityContext: {{ $containerSecurityContext | nindent 16 }}
               {{- if .Values.cleanup.command }}
               command: {{ tpl (toYaml .Values.cleanup.command) . | nindent 16 
}}
               {{- end }}
diff --git a/chart/templates/webserver/webserver-deployment.yaml 
b/chart/templates/webserver/webserver-deployment.yaml
index dcbe67b9e9..41a9d5ec63 100644
--- a/chart/templates/webserver/webserver-deployment.yaml
+++ b/chart/templates/webserver/webserver-deployment.yaml
@@ -172,7 +172,7 @@ spec:
         - name: webserver
           image: {{ template "airflow_image" . }}
           imagePullPolicy: {{ .Values.images.airflow.pullPolicy }}
-          securityContext: {{ or $containerSecurityContext 
.Values.webserver.securityContexts.container .Values.securityContexts.container 
| nindent 12 }}
+          securityContext: {{ $containerSecurityContext | nindent 12 }}
           {{- if $containerLifecycleHooks  }}
           lifecycle: {{- tpl (toYaml $containerLifecycleHooks) . | nindent 12 
}}
           {{- end }}