From 7ee483faace86ed3ec6865710f352b9072ea300d Mon Sep 17 00:00:00 2001 From: Dr Nic Williams Date: Sat, 4 Jan 2020 16:11:47 +1000 Subject: [PATCH] [GKE] allow setting svc spec.loadBalancerIP for GKE reserved/static IPs [fixes #291] --- deploy/helm/kubecf/templates/ingress.yaml | 9 +++++++++ deploy/helm/kubecf/values.yaml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/deploy/helm/kubecf/templates/ingress.yaml b/deploy/helm/kubecf/templates/ingress.yaml index 1d3c5b6c6a..8462b90bcf 100644 --- a/deploy/helm/kubecf/templates/ingress.yaml +++ b/deploy/helm/kubecf/templates/ingress.yaml @@ -134,6 +134,9 @@ spec: {{- if $service.clusterIP }} clusterIP: {{ $service.clusterIP | quote }} {{- end }} + {{- if $service.loadBalancerIP }} + loadBalancerIP: {{ $service.loadBalancerIP | quote }} + {{- end }} {{- end }} --- {{- with $service := index .Values.services "ssh-proxy" }} @@ -166,6 +169,9 @@ spec: {{- if $service.clusterIP }} clusterIP: {{ $service.clusterIP | quote }} {{- end }} + {{- if $service.loadBalancerIP }} + loadBalancerIP: {{ $service.loadBalancerIP | quote }} + {{- end }} {{- end }} --- {{- with $service := index .Values.services "tcp-router" }} @@ -201,5 +207,8 @@ spec: {{- if $service.clusterIP }} clusterIP: {{ $service.clusterIP | quote }} {{- end }} + {{- if $service.loadBalancerIP }} + loadBalancerIP: {{ $service.loadBalancerIP | quote }} + {{- end }} {{- end }} {{- end }} diff --git a/deploy/helm/kubecf/values.yaml b/deploy/helm/kubecf/values.yaml index 79c1850c07..b743f233d7 100644 --- a/deploy/helm/kubecf/values.yaml +++ b/deploy/helm/kubecf/values.yaml @@ -29,7 +29,7 @@ kube: # The storage class to be used for the instance groups that need it (e.g. bits, database and # singleton-blobstore). If it's not set, the default storage class will be used. storage_class: ~ - # The service_cluster_ip_range and pos_cluster_ip_range are used by the internal security group + # The service_cluster_ip_range and pod_cluster_ip_range are used by the internal security group # definition to allow apps to communicate with internal service brokers (e.g. credhub). # service_cluster_ip_range can be fetched with the following command, assuming that the API # server started with the `--service-cluster-ip-range` flag: