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-locate.yaml
diff --git
a/auth/helm/aaf/templates/aaf-locate.yaml
b/auth/helm/aaf/templates/aaf-locate.yaml
index
a6a2e25
..
44531d9
100644
(file)
--- a/
auth/helm/aaf/templates/aaf-locate.yaml
+++ b/
auth/helm/aaf/templates/aaf-locate.yaml
@@
-62,10
+62,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 }}"
@@
-80,11
+82,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: CASSANDRA_CLUSTER
- name: CASSANDRA_CLUSTER
- value: "{{.Values.services.cass.fqdn}}.{{.
Values.services.ns
}}"
+ value: "{{.Values.services.cass.fqdn}}.{{.
Release.Namespace
}}"
# - name: CASSANDRA_USER
# value: ""
# - name: CASSANDRA_PASSWORD
# - name: CASSANDRA_USER
# value: ""
# - name: CASSANDRA_PASSWORD
@@
-96,9
+102,9
@@
spec:
### AAF-LOCATE
###
- name: aaf-locate
### AAF-LOCATE
###
- name: aaf-locate
- image: {{ .Values.image.repository }}onap/aaf/aaf_
locat
e:{{ .Values.image.version }}
+ image: {{ .Values.image.repository }}onap/aaf/aaf_
cor
e:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
imagePullPolicy: IfNotPresent
- command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate aaf-service && exec bin/locate"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate
nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }}
aaf-service && exec bin/locate"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
name: aaf-config-vol
volumeMounts:
- mountPath: "/opt/app/osaaf"
name: aaf-config-vol
@@
-108,9
+114,3
@@
spec:
- name: {{.Values.services.locate.fqdn}}
protocol: TCP
containerPort: {{.Values.services.locate.internal_port}}
- name: {{.Values.services.locate.fqdn}}
protocol: TCP
containerPort: {{.Values.services.locate.internal_port}}
- env:
- - name: aaf_locator_ns
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
-