Add load balancer source range for UI service (#83)

* add load balancer source range for UI service

* add load balancer source range for UI service

* adding unit test

* adding unit test
This commit is contained in:
savagete2860 2019-10-18 12:41:53 -04:00 committed by Jason O'Donnell
parent 9fd0ad6e20
commit f7aa2576d0
3 changed files with 34 additions and 0 deletions

View file

@ -30,6 +30,12 @@ spec:
nodePort: {{ .Values.ui.serviceNodePort }}
{{- end }}
type: {{ .Values.ui.serviceType }}
{{- if and (eq (.Values.ui.serviceType | toString) "LoadBalancer") (.Values.ui.loadBalancerSourceRanges) }}
loadBalancerSourceRanges:
{{- range $cidr := .Values.ui.loadBalancerSourceRanges }}
- {{ $cidr }}
{{- end }}
{{- end }}
{{- if and (eq (.Values.ui.serviceType | toString) "LoadBalancer") (.Values.ui.loadBalancerIP) }}
loadBalancerIP: {{ .Values.ui.loadBalancerIP }}
{{- end }}

View file

@ -133,6 +133,29 @@ load _helpers
[ "${actual}" = "null" ]
}
@test "ui/Service: set loadBalancerSourceRanges when LoadBalancer is configured as serviceType" {
cd `chart_dir`
local actual=$(helm template \
-x templates/ui-service.yaml \
--set 'server.dev.enabled=true' \
--set 'ui.serviceType=LoadBalancer' \
--set 'ui.enabled=true' \
--set 'ui.loadBalancerSourceRanges={"123.123.123.123"}' \
. | tee /dev/stderr |
yq -r '.spec.loadBalancerSourceRanges[0]' | tee /dev/stderr)
[ "${actual}" = "123.123.123.123" ]
local actual=$(helm template \
-x templates/ui-service.yaml \
--set 'server.dev.enabled=true' \
--set 'ui.serviceType=ClusterIP' \
--set 'ui.enabled=true' \
--set 'ui.loadBalancerSourceRanges={"123.123.123.123"}' \
. | tee /dev/stderr |
yq -r '.spec.loadBalancerSourceRanges[0]' | tee /dev/stderr)
[ "${actual}" = "null" ]
}
@test "ui/Service: specify annotations" {
cd `chart_dir`
local actual=$(helm template \

View file

@ -256,6 +256,11 @@ ui:
serviceType: "ClusterIP"
serviceNodePort: null
externalPort: 8200
# loadBalancerSourceRanges:
# - 10.0.0.0/16
# - 1.78.23.3/32
# loadBalancerIP:
# Extra annotations to attach to the ui service