Commit triggered by a change on the main branch of helm-charts-dev

EOEPCA · Jan 11, 2024 · 88bf6bf · 88bf6bf
1 parent 0424c06
commit 88bf6bf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/charts/identity-gatekeeper/Chart.yaml b/charts/identity-gatekeeper/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.4
+version: 1.0.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/identity-gatekeeper/templates/_helpers.tpl b/charts/identity-gatekeeper/templates/_helpers.tpl
@@ -82,8 +82,22 @@ Return the target Kubernetes version
 {{- end -}}
 
 {{/*
-Create the name of the service account to use
+Internal base URL for the services (minus port number)
+*/}}
+{{- define "identity-gatekeeper.baseServiceUrl" -}}
+http://{{ include "identity-gatekeeper.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
+{{- end }}
+
+{{/*
+Internal URL for the proxy service
 */}}
 {{- define "identity-gatekeeper.proxyServiceUrl" -}}
-http://{{ include "identity-gatekeeper.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.proxy.port }}
+http://{{ include "identity-gatekeeper.baseServiceUrl" . }}:{{ .Values.service.proxy.port }}
+{{- end }}
+
+{{/*
+Internal URL for the admin service
+*/}}
+{{- define "identity-gatekeeper.adminServiceUrl" -}}
+http://{{ include "identity-gatekeeper.baseServiceUrl" . }}:{{ .Values.service.admin.port }}
 {{- end }}
diff --git a/charts/identity-gatekeeper/values.yaml b/charts/identity-gatekeeper/values.yaml
@@ -103,9 +103,12 @@ ingress:
       # Open endpoints provided by gatekeeper itself
       # - which should passthru to gatekeeper, rather than the 'target' protected service,
       # without need for any auth.
-      location /oauth/(authorize|callback|expired|health|login|logout|token|metrics|discovery) {
+      location ~ /oauth/(authorize|callback|expired|login|logout|token|discovery) {
         proxy_pass {{ include "identity-gatekeeper.proxyServiceUrl" . }}/$request_uri;
       }
+      location ~ /oauth/(health|metrics) {
+        proxy_pass {{ include "identity-gatekeeper.adminServiceUrl" . }}/$request_uri;
+      }
       # Endpoint for the nginx 'auth_request' - which directs to gatekeeper
       location ^~ /auth {
         internal;