diff --git a/helmchart/single-sign-on/templates/deployment-login.yaml b/helmchart/single-sign-on/templates/deployment-login.yaml index afa5c009d3100a02190ee1b276a32dd1c283319c..5900a56a8340c91aeb9b2f059d247fcc6e3b5e67 100644 --- a/helmchart/single-sign-on/templates/deployment-login.yaml +++ b/helmchart/single-sign-on/templates/deployment-login.yaml @@ -21,6 +21,8 @@ spec: image: {{ .Values.login.image.repository }}:{{ .Values.login.image.tag }} imagePullPolicy: {{ .Values.login.image.pullPolicy }} env: + - name: FLASK_RUN_HOST + value: 0.0.0.0 - name: HYDRA_ADMIN_URL value: http://{{ .Release.Name }}-hydra-admin:4445 - name: KRATOS_ADMIN_URL @@ -31,6 +33,8 @@ spec: value: https://{{ .Values.singleSignOnHost }}/login - name: DATABASE_URL value: postgresql://stackspin:stackspin@{{ .Release.Name }}-postgresql/stackspin + - name: APP_SETTINGS + value: config.DevelopmentConfig ports: - name: login-http containerPort: 5000 diff --git a/helmchart/single-sign-on/templates/ingress.yaml b/helmchart/single-sign-on/templates/ingress.yaml index 67c5b65789fbf4ceb5a056201ac328cdf1811a44..100e5322d888080a3e93a2b8322f2e075bf48305 100644 --- a/helmchart/single-sign-on/templates/ingress.yaml +++ b/helmchart/single-sign-on/templates/ingress.yaml @@ -6,17 +6,18 @@ metadata: {{ include "single-sign-on.labels" . | indent 4 }} annotations: kubernetes.io/tls-acme: "true" + nginx.ingress.kubernetes.io/rewrite-target: /$1 spec: rules: - host: {{ .Values.singleSignOnHost }} http: paths: - - path: /api + - path: /api/(.*) pathType: Prefix backend: serviceName: {{ include "single-sign-on.fullname" . }}-kratos-public servicePort: 80 - - path: /login + - path: /login/(.*) pathType: Prefix backend: serviceName: {{ include "single-sign-on.fullname" . }}-login diff --git a/helmchart/single-sign-on/values.yaml b/helmchart/single-sign-on/values.yaml index 3a039c69e06eb4ef9c1ef4887e8d9016f8916a5c..96092392d0e70189afa78f1e2c1674fadb4b39bc 100644 --- a/helmchart/single-sign-on/values.yaml +++ b/helmchart/single-sign-on/values.yaml @@ -201,7 +201,8 @@ hydra: login: image: << : &IMAGE_DEFAULTS_SSO { tag: "104-allow-cli-to-set-password-create-inital-admin-user", pullPolicy: "Always" } - repository: "open.greenhost.net:4567/openappstack/single-sign-on/login" +# << : &IMAGE_DEFAULTS_SSO { tag: "master", pullPolicy: "Always" } + repository: "open.greenhost.net:4567/stackspin/single-sign-on/login" podAnnotations: {} # oAuthClients is a list of clients that are created during the installation process