Commit 5b4953ae authored by William Tucker's avatar William Tucker
Browse files

Corrected resource URL for auth module

parent 99db502e

deploy/kubernetes/chart/templates/_helpers.tpl

+0 −2
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ Generate auth config for ingress. 
{{- define "esgf.ingress.auth" }}

{{- if .Values.auth.enabled }}

nginx.ingress.kubernetes.io/auth-url: http://{{ include "esgf.component.fullname" (list . "auth") }}.{{ .Release.Namespace }}.svc.cluster.local:8080/verify/

nginx.ingress.kubernetes.io/auth-snippet: |

  proxy_set_header X-Original-URI $request_uri;

{{- if .Values.ingress.authSignin }}

nginx.ingress.kubernetes.io/auth-signin: {{ .Values.ingress.authSignin }}

{{- else }}

deploy/kubernetes/chart/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ auth: 
      package_path: esgf

      rule_name: allow

    RESOURCE_URI_QUERY_KEY: rd

    RESOURCE_URI_HEADER_KEY: HTTP_X_ORIGINAL_URI

    RESOURCE_URI_HEADER_KEY: HTTP_X_ORIGINAL_URL

    # OAuth Bearer Token auth settings

    OAUTH_CLIENT_ID:

    OAUTH_CLIENT_SECRET:

images/auth-service/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

ARG GIT_REPOSITORY=https://github.com/cedadev/django-auth-service.git

ARG GIT_VERSION=88efa02

ARG GIT_VERSION=4560b8f



FROM ${ESGF_REPOSITORY_BASE}/python-build:${ESGF_IMAGES_VERSION} as python-build