Chart: Add loadBalancerSourceRanges in webserver and flower services (a…

…pache#17666)
BilalBAI · Aug 20, 2021 · 00dc3c4 · 00dc3c4
1 parent 22e87b3
commit 00dc3c4
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/chart/templates/flower/flower-service.yaml b/chart/templates/flower/flower-service.yaml
@@ -53,5 +53,9 @@ spec:
   {{- if .Values.flower.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.flower.service.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.flower.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- toYaml .Values.flower.service.loadBalancerSourceRanges | nindent 4 }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/chart/templates/webserver/webserver-service.yaml b/chart/templates/webserver/webserver-service.yaml
@@ -51,3 +51,7 @@ spec:
   {{- if .Values.webserver.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.webserver.service.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.webserver.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- toYaml .Values.webserver.service.loadBalancerSourceRanges | nindent 4 }}
+  {{- end }}
diff --git a/chart/tests/test_flower.py b/chart/tests/test_flower.py
@@ -280,6 +280,7 @@ def test_overrides(self):
                         "type": "LoadBalancer",
                         "loadBalancerIP": "127.0.0.1",
                         "annotations": {"foo": "bar"},
+                        "loadBalancerSourceRanges": ["10.123.0.0/16"],
                     }
                 },
             },
@@ -290,6 +291,7 @@ def test_overrides(self):
         assert "LoadBalancer" == jmespath.search("spec.type", docs[0])
         assert {"name": "flower-ui", "port": 9000} in jmespath.search("spec.ports", docs[0])
         assert "127.0.0.1" == jmespath.search("spec.loadBalancerIP", docs[0])
+        assert ["10.123.0.0/16"] == jmespath.search("spec.loadBalancerSourceRanges", docs[0])
 
     @pytest.mark.parametrize(
         "ports, expected_ports",

diff --git a/chart/tests/test_webserver.py b/chart/tests/test_webserver.py
@@ -452,6 +452,7 @@ def test_overrides(self):
                         "type": "LoadBalancer",
                         "loadBalancerIP": "127.0.0.1",
                         "annotations": {"foo": "bar"},
+                        "loadBalancerSourceRanges": ["10.123.0.0/16"],
                     }
                 },
             },
@@ -462,6 +463,7 @@ def test_overrides(self):
         assert "LoadBalancer" == jmespath.search("spec.type", docs[0])
         assert {"name": "airflow-ui", "port": 9000} in jmespath.search("spec.ports", docs[0])
         assert "127.0.0.1" == jmespath.search("spec.loadBalancerIP", docs[0])
+        assert ["10.123.0.0/16"] == jmespath.search("spec.loadBalancerSourceRanges", docs[0])
 
     @parameterized.expand(
         [

diff --git a/chart/values.schema.json b/chart/values.schema.json
@@ -1817,6 +1817,14 @@
                                 "null"
                             ],
                             "default": null
+                        },
+                        "loadBalancerSourceRanges": {
+                            "description": "Webserver Service loadBalancerSourceRanges.",
+                            "type": "array",
+                            "default": [],
+                            "examples": [
+                                "10.123.0.0/16"
+                            ]
                         }
                     }
                 },
@@ -1995,6 +2003,14 @@
                                 "null"
                             ],
                             "default": null
+                        },
+                        "loadBalancerSourceRanges": {
+                            "description": "Flower Service loadBalancerSourceRanges.",
+                            "type": "array",
+                            "default": [],
+                            "examples": [
+                                "10.123.0.0/16"
+                            ]
                         }
                     }
                 },

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -701,6 +701,10 @@ webserver:
     #     port: 80
     #     targetPort: 8888
     loadBalancerIP: ~
+    ## Limit load balancer source ips to list of CIDRs
+    # loadBalancerSourceRanges:
+    #   - "10.123.0.0/16"
+    loadBalancerSourceRanges: []
 
   # Select certain nodes for airflow webserver pods.
   nodeSelector: {}
@@ -781,6 +785,10 @@ flower:
     #     port: 8080
     #     targetPort: flower-ui
     loadBalancerIP: ~
+    ## Limit load balancer source ips to list of CIDRs
+    # loadBalancerSourceRanges:
+    #   - "10.123.0.0/16"
+    loadBalancerSourceRanges: []
 
   # Launch additional containers into the flower pods.
   extraContainers: []