diff options
| author |   danielhanrahan <daniel.hanrahan@est.tech> | 2022-02-28 14:08:08 +0000 |
|---|---|---|
| committer |   Fiachra Corcoran <fiachra.corcoran@est.tech> | 2022-04-23 10:43:14 +0000 |
| commit | 88326640e401f7a44ce3fe9364d02d1f7886e61a (patch) | |
| tree | b1179d0e1afd189976bccb1d0129f2ca837b0c66 /kubernetes/policy/components/policy-gui/templates/deployment.yaml | |
| parent | f757d0bf7b5304bc727e98463943261b4829087b (diff) | |
[POLICY] GUI changes for Spring boot migration
Update chart to run Spring Boot version of policy-gui
Remove obsolete nginx config
Issue-ID: POLICY-3980
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I34ff95be09a416e07d2f4ad8bdaea71c1a1e7111
Diffstat (limited to 'kubernetes/policy/components/policy-gui/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/policy/components/policy-gui/templates/deployment.yaml | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/kubernetes/policy/components/policy-gui/templates/deployment.yaml b/kubernetes/policy/components/policy-gui/templates/deployment.yaml index b67fa273de..a155715580 100644 --- a/kubernetes/policy/components/policy-gui/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-gui/templates/deployment.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2021 Nordix Foundation. +# Copyright (C) 2021-2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -62,6 +62,20 @@ spec: - name: {{ include "common.name" . }} image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} +{{- if .Values.global.aafEnabled }} + command: ["sh","-c"] + args: ["source {{ .Values.certInitializer.credsPath }}/.ci;/opt/app/policy/gui/bin/policy-gui.sh"] + env: +{{- else }} + command: ["/opt/app/policy/gui/bin/policy-gui.sh"] + env: + - name: KEYSTORE_PASSWD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "keystore-password" "key" "password") | indent 12 }} + - name: TRUSTSTORE_PASSWD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "truststore-password" "key" "password") | indent 12 }} +{{- end }} + - name: CLAMP_URL + value: https://policy-clamp-be:8443 ports: - containerPort: {{ .Values.service.internalPort }} # disable liveness probe when breakpoints set in debugger @@ -81,9 +95,6 @@ spec: volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }} - name: logs mountPath: {{ .Values.log.path }} - - mountPath: /etc/nginx/conf.d/default.conf - name: {{ include "common.fullname" . }}-config - subPath: default.conf resources: {{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} @@ -99,9 +110,6 @@ spec: - name: {{ include "common.fullname" . }}-config configMap: name: {{ include "common.fullname" . }} - items: - - key: default.conf - path: default.conf - name: logs emptyDir: {} {{ if .Values.global.centralizedLoggingEnabled }}{{ include "common.log.volumes" . | nindent 8 }}{{ end }} |