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-cm.yaml
diff --git
a/auth/helm/aaf/templates/aaf-cm.yaml
b/auth/helm/aaf/templates/aaf-cm.yaml
index
cd43f7a
..
f254bfd
100644
(file)
--- a/
auth/helm/aaf/templates/aaf-cm.yaml
+++ b/
auth/helm/aaf/templates/aaf-cm.yaml
@@
-41,7
+41,7
@@
metadata:
labels:
app: aaf-cm
spec:
labels:
app: aaf-cm
spec:
- replicas: {{ .Values.
replicas.cm
}}
+ replicas: {{ .Values.
services.cm.replicas
}}
selector:
matchLabels:
app: aaf-cm
selector:
matchLabels:
app: aaf-cm
@@
-52,27
+52,29
@@
spec:
spec:
volumes:
# Use this Pod Sharing dir to declare various States of starting
spec:
volumes:
# Use this Pod Sharing dir to declare various States of starting
- - name:
{{ .Chart.Name }}
-config-vol
+ - name:
aaf
-config-vol
persistentVolumeClaim:
persistentVolumeClaim:
- claimName:
{{ .Chart.Name }}
-config-pvc
- - name:
{{ .Chart.Name }}
-status-vol
+ claimName:
aaf
-config-pvc
+ - name:
aaf
-status-vol
persistentVolumeClaim:
persistentVolumeClaim:
- claimName:
{{ .Chart.Name }}
-status-pvc
+ claimName:
aaf
-status-pvc
initContainers:
initContainers:
- - name:
{{ .Chart.Name }}
-config-container
+ - name:
aaf
-config-container
image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
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"
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: {{ .Chart.Name }}-config-vol
+ name: aaf-config-vol
+ - mountPath: "/opt/app/aaf/status"
+ name: aaf-status-vol
env:
- name: AAF_ENV
env:
- name: AAF_ENV
- value: "{{ .Values.
cadi
.aaf_env }}"
+ value: "{{ .Values.
services
.aaf_env }}"
- name: LATITUDE
- name: LATITUDE
- value: "{{ .Values.
cadi
.cadi_latitude }}"
+ value: "{{ .Values.
services
.cadi_latitude }}"
- name: LONGITUDE
- name: LONGITUDE
- value: "{{ .Values.
cadi
.cadi_longitude }}"
+ value: "{{ .Values.
services
.cadi_longitude }}"
- name: aaf_locator_container
value: "helm"
- name: aaf_locator_container_ns
- name: aaf_locator_container
value: "helm"
- name: aaf_locator_container_ns
@@
-80,11
+82,15
@@
spec:
fieldRef:
fieldPath: metadata.namespace
- name: aaf_locate_url
fieldRef:
fieldPath: metadata.namespace
- name: aaf_locate_url
- value: "https://aaf-locate.
onap:8095
"
+ value: "https://aaf-locate.
{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}
"
- name: aaf_locator_public_fqdn
- name: aaf_locator_public_fqdn
- value: "aaf.osaaf.org"
+ 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: "
aaf-cass
"
+ value: "
{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}
"
# - name: CASSANDRA_USER
# value: ""
# - name: CASSANDRA_PASSWORD
# - name: CASSANDRA_USER
# value: ""
# - name: CASSANDRA_PASSWORD
@@
-95,15
+101,15
@@
spec:
###
### AAF-CERTMAN
###
###
### AAF-CERTMAN
###
- - name:
{{ .Chart.Name }}
-cm
- image: {{ .Values.image.repository }}onap/aaf/aaf_c
m
:{{ .Values.image.version }}
+ - name:
aaf
-cm
+ image: {{ .Values.image.repository }}onap/aaf/aaf_c
ore
:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
imagePullPolicy: IfNotPresent
- command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm
nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }}
aaf-locate && exec bin/cm"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name:
{{ .Chart.Name }}
-config-vol
+ name:
aaf
-config-vol
- mountPath: "/opt/app/aaf/status"
- mountPath: "/opt/app/aaf/status"
- name:
{{ .Chart.Name }}
-status-vol
+ name:
aaf
-status-vol
ports:
- name: aaf-cm
protocol: TCP
ports:
- name: aaf-cm
protocol: TCP