feat: add loadBalancerIP (#578)

ory · Mar 15, 2023 · 61df88f · 61df88f
1 parent c1f6678
commit 61df88f
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 0 deletions.
diff --git a/helm/charts/hydra/templates/service-admin.yaml b/helm/charts/hydra/templates/service-admin.yaml
@@ -19,6 +19,11 @@ metadata:
     {{- end }}
 spec:
   type: {{ .Values.service.admin.type }}
+  {{- if eq .Values.service.admin.type "LoadBalancer" }}
+  {{- with .Values.service.admin.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.admin.port }}
       targetPort: http-admin

diff --git a/helm/charts/hydra/templates/service-public.yaml b/helm/charts/hydra/templates/service-public.yaml
@@ -17,6 +17,11 @@ metadata:
     {{- end }}
 spec:
   type: {{ .Values.service.public.type }}
+  {{- if eq .Values.service.public.type "LoadBalancer" }}
+  {{- with .Values.service.public.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.public.port }}
       targetPort: http-public

diff --git a/helm/charts/hydra/values.yaml b/helm/charts/hydra/values.yaml
@@ -28,6 +28,8 @@ service:
     enabled: true
     # -- The service type
     type: ClusterIP
+    # -- The load balancer IP
+    loadBalancerIP: ""
     # -- The service port
     port: 4444
     # -- The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio)
@@ -46,6 +48,8 @@ service:
     enabled: true
     # -- The service type
     type: ClusterIP
+    # -- The load balancer IP
+    loadBalancerIP: ""
     # -- The service port
     port: 4445
     # -- The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio)

diff --git a/helm/charts/keto/templates/service-extraServices.yaml b/helm/charts/keto/templates/service-extraServices.yaml
@@ -14,6 +14,11 @@ metadata:
     {{- include "keto.labels" $ | nindent 4 }}
 spec:
   type: {{ $ServiceData.type }}
+  {{- if eq $ServiceData.type "LoadBalancer" }}
+  {{- with $ServiceData.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ $ServiceData.port }}
       targetPort: {{ $ServiceData.name }}

diff --git a/helm/charts/keto/templates/service-metrics.yaml b/helm/charts/keto/templates/service-metrics.yaml
@@ -11,6 +11,11 @@ metadata:
     {{- include "keto.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.metrics.type }}
+  {{- if eq .Values.service.metrics.type "LoadBalancer" }}
+  {{- with .Values.service.metrics.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.metrics.port }}
       targetPort: {{ .Values.service.metrics.name }}

diff --git a/helm/charts/keto/templates/service-read.yaml b/helm/charts/keto/templates/service-read.yaml
@@ -11,6 +11,11 @@ metadata:
     {{- include "keto.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.read.type }}
+  {{- if eq .Values.service.read.type "LoadBalancer" }}
+  {{- with .Values.service.read.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.read.port }}
       targetPort: {{ .Values.service.read.name }}

diff --git a/helm/charts/keto/templates/service-write.yaml b/helm/charts/keto/templates/service-write.yaml
@@ -11,6 +11,11 @@ metadata:
     {{- include "keto.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.write.type }}
+  {{- if eq .Values.service.write.type "LoadBalancer" }}
+  {{- with .Values.service.write.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.write.port }}
       targetPort: {{ .Values.service.write.name }}

diff --git a/helm/charts/keto/values.yaml b/helm/charts/keto/values.yaml
@@ -152,18 +152,24 @@ service:
   read:
     enabled: true
     type: ClusterIP
+    # -- The load balancer IP
+    loadBalancerIP: ""
     name: grpc-read
     port: 80
   # -- Write service
   write:
     enabled: true
     type: ClusterIP
+    # -- The load balancer IP
+    loadBalancerIP: ""
     name: grpc-write
     port: 80
   # -- Metrics service
   metrics:
     enabled: false
     type: ClusterIP
+    # -- The load balancer IP
+    loadBalancerIP: ""
     name: http-metrics
     port: 80
     annotations: {}

diff --git a/helm/charts/kratos-selfservice-ui-node/templates/service.yaml b/helm/charts/kratos-selfservice-ui-node/templates/service.yaml
@@ -6,6 +6,11 @@ metadata:
 {{ include "kratos-selfservice-ui-node.labels" . | indent 4 }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if eq .Values.service.type "LoadBalancer" }}
+  {{- with .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: http

diff --git a/helm/charts/kratos-selfservice-ui-node/values.yaml b/helm/charts/kratos-selfservice-ui-node/values.yaml
@@ -20,6 +20,8 @@ fullnameOverride: ""
 # -- Service configuration
 service:
   type: ClusterIP
+  # -- The load balancer IP
+  loadBalancerIP: ""
   port: 80
   # -- The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio)
   name: http

diff --git a/helm/charts/kratos/templates/service-admin.yaml b/helm/charts/kratos/templates/service-admin.yaml
@@ -19,6 +19,11 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.admin.type }}
+  {{- if eq .Values.service.admin.type "LoadBalancer" }}
+  {{- with .Values.service.admin.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.admin.port }}
       targetPort: http-admin

diff --git a/helm/charts/kratos/templates/service-public.yaml b/helm/charts/kratos/templates/service-public.yaml
@@ -18,6 +18,11 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.public.type }}
+  {{- if eq .Values.service.public.type "LoadBalancer" }}
+  {{- with .Values.service.public.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.public.port }}
       targetPort: http-public

diff --git a/helm/charts/kratos/values.yaml b/helm/charts/kratos/values.yaml
@@ -27,6 +27,8 @@ service:
   admin:
     enabled: true
     type: ClusterIP
+    # -- Load balancer IP
+    loadBalancerIP: ""
     port: 80
     # -- The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio)
     name: http
@@ -40,6 +42,8 @@ service:
   public:
     enabled: true
     type: ClusterIP
+    # -- Load balancer IP
+    loadBalancerIP: ""
     port: 80
     # -- The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio)
     name: http

diff --git a/helm/charts/oathkeeper/templates/service-api.yaml b/helm/charts/oathkeeper/templates/service-api.yaml
@@ -18,6 +18,11 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.api.type }}
+  {{- if eq .Values.service.api.type "LoadBalancer" }}
+  {{- with .Values.service.api.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.api.port }}
       targetPort: http-api

diff --git a/helm/charts/oathkeeper/templates/service-metrics.yaml b/helm/charts/oathkeeper/templates/service-metrics.yaml
@@ -19,6 +19,11 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.metrics.type }}
+  {{- if eq .Values.service.metrics.type "LoadBalancer" }}
+  {{- with .Values.service.metrics.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.metrics.port }}
       targetPort: http-metrics

diff --git a/helm/charts/oathkeeper/templates/service-proxy.yaml b/helm/charts/oathkeeper/templates/service-proxy.yaml
@@ -18,6 +18,11 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.proxy.type }}
+  {{- if eq .Values.service.proxy.type "LoadBalancer" }}
+  {{- with .Values.service.proxy.loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+  {{- end }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.proxy.port }}
       targetPort: http-proxy

diff --git a/helm/charts/oathkeeper/values.yaml b/helm/charts/oathkeeper/values.yaml
@@ -42,6 +42,8 @@ service:
     enabled: true
     # -- The service type
     type: ClusterIP
+    # -- The load balancer IP
+    loadBalancerIP: ""
     # -- The service port
     port: 4455
     # -- The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio)
@@ -61,6 +63,8 @@ service:
     enabled: true
     # -- The service type
     type: ClusterIP
+    # -- The load balancer IP
+    loadBalancerIP: ""
     # -- The service port
     port: 4456
     # -- The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio)
@@ -80,6 +84,8 @@ service:
     enabled: true
     # -- The service type
     type: ClusterIP
+    # -- Load balancer IP
+    loadBalancerIP: ""
     # -- The service port
     port: 80
     # -- The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio)