Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reduce Docker Layers
[aaf/authz.git]
/
auth
/
helm
/
aaf
/
templates
/
aaf-gui.yaml
diff --git
a/auth/helm/aaf/templates/aaf-gui.yaml
b/auth/helm/aaf/templates/aaf-gui.yaml
index
758b6b2
..
c737c7a
100644
(file)
--- a/
auth/helm/aaf/templates/aaf-gui.yaml
+++ b/
auth/helm/aaf/templates/aaf-gui.yaml
@@
-63,10
+63,12
@@
spec:
- name: aaf-config-container
image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- name: aaf-config-container
image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- command: ["bash","
/opt/app/aaf_config/
bin/agent.sh"]
+ command: ["bash","
-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm &&
bin/agent.sh"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
name: aaf-config-vol
volumeMounts:
- mountPath: "/opt/app/osaaf"
name: aaf-config-vol
+ - mountPath: "/opt/app/aaf/status"
+ name: aaf-status-vol
env:
- name: AAF_ENV
value: "{{ .Values.services.aaf_env }}"
env:
- name: AAF_ENV
value: "{{ .Values.services.aaf_env }}"
@@
-81,9
+83,15
@@
spec:
fieldRef:
fieldPath: metadata.namespace
- name: aaf_locate_url
fieldRef:
fieldPath: metadata.namespace
- name: aaf_locate_url
- value: "https://
{{.Values.services.locate.fqdn}}.{{.Values.services.ns
}}:{{.Values.services.locate.internal_port}}"
+ value: "https://
aaf-locate.{{.Release.Namespace
}}:{{.Values.services.locate.internal_port}}"
- name: aaf_locator_public_fqdn
value: "{{.Values.services.public_fqdn}}"
- name: aaf_locator_public_fqdn
value: "{{.Values.services.public_fqdn}}"
+ - name: aaf_locator_name
+ value: "{{.Values.services.aaf_locator_name}}"
+ - name: aaf_locator_name_helm
+ value: "{{.Values.services.aaf_locator_name_helm}}"
+ - name: aaf_deployed_version
+ value: "{{ .Values.image.version }}"
- name: CASSANDRA_CLUSTER
value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
# - name: CASSANDRA_USER
- name: CASSANDRA_CLUSTER
value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
# - name: CASSANDRA_USER
@@
-97,7
+105,7
@@
spec:
### AAF-GUI
###
- name: aaf-gui
### AAF-GUI
###
- name: aaf-gui
- image: {{ .Values.image.repository }}onap/aaf/aaf_
gui
:{{ .Values.image.version }}
+ image: {{ .Values.image.repository }}onap/aaf/aaf_
core
:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"]
volumeMounts:
imagePullPolicy: IfNotPresent
command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"]
volumeMounts: