jedcunningham commented on code in PR #27419:
URL: https://github.com/apache/airflow/pull/27419#discussion_r1034194499
##
chart/values.yaml:
##
@@ -976,6 +978,7 @@ webserver:
# # Flask-WTF flag for CSRF
# CSRF_ENABLED = True
+ webserverConfigConfigmapName: ~
Review Comment:
```suggestion
webserverConfigConfigMapName: ~
```
We should match the casing used by k8s.
##
tests/charts/test_webserver.py:
##
@@ -738,6 +750,45 @@ def test_webserver_config_configmap(self):
== jmespath.search('data."webserver_config.py"', docs[0]).strip()
)
+def test_webserver_config_configmap_name_volume_mounts(self):
+configmap_name = "my-configmap"
+docs = render_chart(
+values={
+"scheduler": {"logGroomerSidecar": {"enabled": True},
"waitForMigrations": {"enabled": True}},
+"triggerer": {"waitForMigrations": {"enabled": True}},
+"webserver": {
+"waitForMigrations": {"enabled": True},
+"webserverConfig": "CSRF_ENABLED = True # {{
.Release.Name }}",
+"webserverConfigConfigmapName": configmap_name,
+},
+"workers": {"kerberosSidecar": {"enabled": True},
"persistence": {"enabled": True}},
+},
+show_only=[
+"templates/scheduler/scheduler-deployment.yaml",
+"templates/triggerer/triggerer-deployment.yaml",
+"templates/webserver/webserver-deployment.yaml",
+"templates/workers/worker-deployment.yaml",
Review Comment:
This test should probably be moved to `test_airflow_common.py` instead.
##
tests/charts/test_webserver.py:
##
@@ -738,6 +750,45 @@ def test_webserver_config_configmap(self):
== jmespath.search('data."webserver_config.py"', docs[0]).strip()
)
+def test_webserver_config_configmap_name_volume_mounts(self):
+configmap_name = "my-configmap"
+docs = render_chart(
+values={
+"scheduler": {"logGroomerSidecar": {"enabled": True},
"waitForMigrations": {"enabled": True}},
+"triggerer": {"waitForMigrations": {"enabled": True}},
+"webserver": {
+"waitForMigrations": {"enabled": True},
+"webserverConfig": "CSRF_ENABLED = True # {{
.Release.Name }}",
+"webserverConfigConfigmapName": configmap_name,
+},
+"workers": {"kerberosSidecar": {"enabled": True},
"persistence": {"enabled": True}},
Review Comment:
```suggestion
"workers": {"kerberosSidecar": {"enabled": True}},
```
And here.
##
tests/charts/test_webserver.py:
##
@@ -738,6 +750,45 @@ def test_webserver_config_configmap(self):
== jmespath.search('data."webserver_config.py"', docs[0]).strip()
)
+def test_webserver_config_configmap_name_volume_mounts(self):
+configmap_name = "my-configmap"
+docs = render_chart(
+values={
+"scheduler": {"logGroomerSidecar": {"enabled": True},
"waitForMigrations": {"enabled": True}},
+"triggerer": {"waitForMigrations": {"enabled": True}},
+"webserver": {
+"waitForMigrations": {"enabled": True},
Review Comment:
```suggestion
```
Same here.
##
tests/charts/test_webserver.py:
##
@@ -738,6 +750,45 @@ def test_webserver_config_configmap(self):
== jmespath.search('data."webserver_config.py"', docs[0]).strip()
)
+def test_webserver_config_configmap_name_volume_mounts(self):
+configmap_name = "my-configmap"
+docs = render_chart(
+values={
+"scheduler": {"logGroomerSidecar": {"enabled": True},
"waitForMigrations": {"enabled": True}},
+"triggerer": {"waitForMigrations": {"enabled": True}},
Review Comment:
```suggestion
```
We don't need to set these defaults.
--
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-unsubscr...@airflow.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
