You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2021/09/10 16:35:00 UTC
[GitHub] [airflow] jedcunningham commented on a change in pull request #18147: Allow airflow standard images to run in openshift utilising the official helm chart #18136
jedcunningham commented on a change in pull request #18147:
URL: https://github.com/apache/airflow/pull/18147#discussion_r706291745
##########
File path: chart/templates/rbac/security-context-constraint-rolebinding.yaml
##########
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+################################
+## Airflow Pod Reader Role Binding
+#################################
+{{- if and .Values.rbac.create .Values.rbac.createSCCRoleBinding }}
+{{- $schedulerLaunchExecutors := list "LocalExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- $workerLaunchExecutors := list "CeleryExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- if .Values.multiNamespaceMode }}
+kind: ClusterRoleBinding
+{{- else }}
+kind: RoleBinding
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+{{- if not .Values.multiNamespaceMode }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+ name: {{ .Release.Name }}-scc-rolebinding
+ labels:
+ tier: airflow
+ release: {{ .Release.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ heritage: {{ .Release.Service }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: system:openshift:scc:anyuid
+subjects:
+ - kind: ServiceAccount
+ name: {{ include "webserver.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- if has .Values.executor $workerLaunchExecutors }}
Review comment:
```suggestion
{{- if and (has .Values.executor $workerLaunchExecutors) .Values.workers.serviceAccount.create }}
```
##########
File path: chart/CHANGELOG.txt
##########
@@ -3,6 +3,7 @@ Airflow Helm Chart 1.1.0, 2021-07-26
New Features
""""""""""""
+- Chart: Add support for running pods with anyuid ``securityContextConstraint`` (SCC) (#18136)
Review comment:
```suggestion
```
1.1.0 is already released, this will land in 1.2.0 and we will build the changelog then. Thanks for trying to be proactive though!
##########
File path: chart/templates/rbac/security-context-constraint-rolebinding.yaml
##########
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+################################
+## Airflow Pod Reader Role Binding
+#################################
+{{- if and .Values.rbac.create .Values.rbac.createSCCRoleBinding }}
+{{- $schedulerLaunchExecutors := list "LocalExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- $workerLaunchExecutors := list "CeleryExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- if .Values.multiNamespaceMode }}
+kind: ClusterRoleBinding
+{{- else }}
+kind: RoleBinding
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+{{- if not .Values.multiNamespaceMode }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+ name: {{ .Release.Name }}-scc-rolebinding
+ labels:
+ tier: airflow
+ release: {{ .Release.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ heritage: {{ .Release.Service }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: system:openshift:scc:anyuid
+subjects:
+ - kind: ServiceAccount
+ name: {{ include "webserver.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
Review comment:
```suggestion
{{- if .Values.webserver.serviceAccount.create }}
- kind: ServiceAccount
name: {{ include "webserver.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end }}
```
##########
File path: chart/templates/rbac/security-context-constraint-rolebinding.yaml
##########
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+################################
+## Airflow Pod Reader Role Binding
+#################################
+{{- if and .Values.rbac.create .Values.rbac.createSCCRoleBinding }}
+{{- $schedulerLaunchExecutors := list "LocalExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- $workerLaunchExecutors := list "CeleryExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- if .Values.multiNamespaceMode }}
+kind: ClusterRoleBinding
+{{- else }}
+kind: RoleBinding
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+{{- if not .Values.multiNamespaceMode }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+ name: {{ .Release.Name }}-scc-rolebinding
+ labels:
+ tier: airflow
+ release: {{ .Release.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ heritage: {{ .Release.Service }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: system:openshift:scc:anyuid
+subjects:
+ - kind: ServiceAccount
+ name: {{ include "webserver.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- if has .Values.executor $workerLaunchExecutors }}
+ - kind: ServiceAccount
+ name: {{ include "worker.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if has .Values.executor $schedulerLaunchExecutors }}
+ - kind: ServiceAccount
+ name: {{ include "scheduler.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if .Values.statsd.enabled }}
Review comment:
```suggestion
{{- if and .Values.statsd.enabled .Values.statsd.serviceAccount.create }}
```
##########
File path: chart/templates/rbac/security-context-constraint-rolebinding.yaml
##########
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+################################
+## Airflow Pod Reader Role Binding
+#################################
+{{- if and .Values.rbac.create .Values.rbac.createSCCRoleBinding }}
+{{- $schedulerLaunchExecutors := list "LocalExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- $workerLaunchExecutors := list "CeleryExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- if .Values.multiNamespaceMode }}
+kind: ClusterRoleBinding
+{{- else }}
+kind: RoleBinding
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+{{- if not .Values.multiNamespaceMode }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+ name: {{ .Release.Name }}-scc-rolebinding
+ labels:
+ tier: airflow
+ release: {{ .Release.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ heritage: {{ .Release.Service }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: system:openshift:scc:anyuid
+subjects:
+ - kind: ServiceAccount
+ name: {{ include "webserver.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- if has .Values.executor $workerLaunchExecutors }}
+ - kind: ServiceAccount
+ name: {{ include "worker.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if has .Values.executor $schedulerLaunchExecutors }}
Review comment:
```suggestion
{{- if and (has .Values.executor $schedulerLaunchExecutors) .Values.scheduler.serviceAccount.create }}
```
##########
File path: chart/templates/rbac/security-context-constraint-rolebinding.yaml
##########
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+################################
+## Airflow Pod Reader Role Binding
+#################################
+{{- if and .Values.rbac.create .Values.rbac.createSCCRoleBinding }}
+{{- $schedulerLaunchExecutors := list "LocalExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- $workerLaunchExecutors := list "CeleryExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- if .Values.multiNamespaceMode }}
+kind: ClusterRoleBinding
+{{- else }}
+kind: RoleBinding
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+{{- if not .Values.multiNamespaceMode }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+ name: {{ .Release.Name }}-scc-rolebinding
+ labels:
+ tier: airflow
+ release: {{ .Release.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ heritage: {{ .Release.Service }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: system:openshift:scc:anyuid
+subjects:
+ - kind: ServiceAccount
+ name: {{ include "webserver.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- if has .Values.executor $workerLaunchExecutors }}
+ - kind: ServiceAccount
+ name: {{ include "worker.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if has .Values.executor $schedulerLaunchExecutors }}
+ - kind: ServiceAccount
+ name: {{ include "scheduler.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if .Values.statsd.enabled }}
+ - kind: ServiceAccount
+ name: {{ include "statsd.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+ - kind: ServiceAccount
+ name: {{ include "flower.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
Review comment:
```suggestion
{{- if and .Values.flower.enabled (or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor")) .Values.flower.serviceAccount.create }}
- kind: ServiceAccount
name: {{ include "flower.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end }}
```
##########
File path: chart/templates/rbac/security-context-constraint-rolebinding.yaml
##########
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+################################
+## Airflow Pod Reader Role Binding
Review comment:
```suggestion
## Airflow SCC Role Binding
```
##########
File path: chart/values.yaml
##########
@@ -1251,7 +1252,7 @@ dags:
# Volume size for dags
size: 1Gi
# If using a custom storageClass, pass name here
- storageClassName:
+ storageClassName:
Review comment:
```suggestion
storageClassName:
```
Unintentional change?
##########
File path: chart/templates/rbac/security-context-constraint-rolebinding.yaml
##########
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+################################
+## Airflow Pod Reader Role Binding
+#################################
+{{- if and .Values.rbac.create .Values.rbac.createSCCRoleBinding }}
+{{- $schedulerLaunchExecutors := list "LocalExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- $workerLaunchExecutors := list "CeleryExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
+{{- if .Values.multiNamespaceMode }}
+kind: ClusterRoleBinding
+{{- else }}
+kind: RoleBinding
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+{{- if not .Values.multiNamespaceMode }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+ name: {{ .Release.Name }}-scc-rolebinding
+ labels:
+ tier: airflow
+ release: {{ .Release.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ heritage: {{ .Release.Service }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: system:openshift:scc:anyuid
+subjects:
+ - kind: ServiceAccount
+ name: {{ include "webserver.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- if has .Values.executor $workerLaunchExecutors }}
+ - kind: ServiceAccount
+ name: {{ include "worker.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if has .Values.executor $schedulerLaunchExecutors }}
+ - kind: ServiceAccount
+ name: {{ include "scheduler.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if .Values.statsd.enabled }}
+ - kind: ServiceAccount
+ name: {{ include "statsd.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+ - kind: ServiceAccount
+ name: {{ include "flower.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- if and (semverCompare ">=2.2.0" .Values.airflowVersion) (.Values.triggerer.serviceAccount.create ) }}
+ - kind: ServiceAccount
+ name: {{ include "triggerer.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if .Values.migrateDatabaseJob.serviceAccount.create }}
+ - kind: ServiceAccount
+ name: {{ include "migrateDatabaseJob.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if and .Values.createUserJob.serviceAccount.create .Values.webserver.defaultUser.enabled }}
+ - kind: ServiceAccount
+ name: {{ include "createUserJob.serviceAccountName" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- if .Values.cleanup.enabled }}
Review comment:
```suggestion
{{- if and .Values.cleanup.enabled .Values.cleanup.serviceAccount.create }}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org