Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
9 changes: 7 additions & 2 deletions chart/templates/rbac/pod-log-reader-rolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
################################
## Airflow Pod Reader Role Binding
#################################
{{- if and .Values.rbac.create (or .Values.webserver.allowPodLogReading .Values.triggerer.enabled) }}
{{- if and .Values.rbac.create (or (and .Values.webserver.allowPodLogReading (semverCompare "<3.0.0" .Values.airflowVersion)) (and .Values.apiServer.allowPodLogReading (semverCompare ">=3.0.0" .Values.airflowVersion)) .Values.triggerer.enabled) }}
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.multiNamespaceMode }}
kind: ClusterRoleBinding
Expand Down Expand Up @@ -55,11 +55,16 @@ roleRef:
name: {{ include "airflow.fullname" . }}-pod-log-reader-role
{{- end }}
subjects:
{{- if .Values.webserver.allowPodLogReading }}
{{- if and .Values.webserver.allowPodLogReading (semverCompare "<3.0.0" .Values.airflowVersion) }}
- kind: ServiceAccount
name: {{ include "webserver.serviceAccountName" . }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if and .Values.apiServer.allowPodLogReading (semverCompare ">=3.0.0" .Values.airflowVersion) }}
- kind: ServiceAccount
name: {{ include "apiServer.serviceAccountName" . }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if .Values.triggerer.enabled }}
- kind: ServiceAccount
name: {{ include "triggerer.serviceAccountName" . }}
Expand Down
1 change: 1 addition & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,7 @@ apiServer:
command: ~
# Args to use when running the Airflow API server (templated).
args: ["bash", "-c", "exec airflow api-server"]
allowPodLogReading: true
env: []
serviceAccount:
# default value is true
Expand Down
17 changes: 11 additions & 6 deletions helm_tests/security/test_rbac_pod_log_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,24 @@ class TestPodReader:
"""Tests RBAC Pod Reader."""

@pytest.mark.parametrize(
"triggerer, webserver, expected",
"triggerer, webserver, airflow_version, expected",
[
(True, True, ["release-name-airflow-webserver", "release-name-airflow-triggerer"]),
(True, False, ["release-name-airflow-triggerer"]),
(False, True, ["release-name-airflow-webserver"]),
(False, False, []),
(True, True, "2.9.0", ["release-name-airflow-webserver", "release-name-airflow-triggerer"]),
(True, False, "2.9.0", ["release-name-airflow-triggerer"]),
(False, True, "2.9.0", ["release-name-airflow-webserver"]),
(False, False, "2.9.0", []),
(True, True, "3.0.0", ["release-name-airflow-api-server", "release-name-airflow-triggerer"]),
(True, False, "3.0.0", ["release-name-airflow-api-server", "release-name-airflow-triggerer"]),
(False, True, "3.0.0", ["release-name-airflow-api-server"]),
],
)
def test_pod_log_reader_rolebinding(self, triggerer, webserver, expected):
def test_pod_log_reader_rolebinding(self, triggerer, webserver, airflow_version, expected):
docs = render_chart(
values={
"triggerer": {"enabled": triggerer},
"webserver": {"allowPodLogReading": webserver},
"apiServer": {"allowPodLogReading": airflow_version >= "3.0.0"},
"airflowVersion": airflow_version,
},
show_only=["templates/rbac/pod-log-reader-rolebinding.yaml"],
)
Expand Down