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-service.yaml
diff --git
a/auth/helm/aaf/templates/aaf-service.yaml
b/auth/helm/aaf/templates/aaf-service.yaml
index
4a8f0b3
..
fc0ce66
100644
(file)
--- a/
auth/helm/aaf/templates/aaf-service.yaml
+++ b/
auth/helm/aaf/templates/aaf-service.yaml
@@
-29,11
+29,10
@@
spec:
selector:
app: aaf-service
ports:
selector:
app: aaf-service
ports:
- - name:
aaf-service
+ - name:
{{.Values.services.service.fqdn}}
protocol: TCP
protocol: TCP
- nodePort: 30080
- port: 8100
- targetPort: 8100
+ nodePort: {{.Values.services.service.public_port}}
+ port: {{.Values.services.service.internal_port}}
---
apiVersion: apps/v1
kind: Deployment
---
apiVersion: apps/v1
kind: Deployment
@@
-42,7
+41,7
@@
metadata:
labels:
app: aaf-service
spec:
labels:
app: aaf-service
spec:
- replicas: {{ .Values.
replicas.service
}}
+ replicas: {{ .Values.
services.service.replicas
}}
selector:
matchLabels:
app: aaf-service
selector:
matchLabels:
app: aaf-service
@@
-52,39
+51,43
@@
spec:
app: aaf-service
spec:
volumes:
app: aaf-service
spec:
volumes:
- - 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
command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: {{ .Chart.Name }}-config-vol
+ name: aaf-config-vol
+ - mountPath: "/opt/app/aaf/status"
+ name: aaf-status-vol
env:
env:
- - name:
AAF_ENV
- value: "{{ .Values.
cadi
.aaf_env }}"
- - name:
LATITUDE
- value: "{{ .Values.
cadi
.cadi_latitude }}"
- - name:
LONGITUDE
- value: "{{ .Values.
cadi
.cadi_longitude }}"
+ - name:
aaf_env
+ value: "{{ .Values.
services
.aaf_env }}"
+ - name:
cadi_latitude
+ value: "{{ .Values.
services
.cadi_latitude }}"
+ - name:
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
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
+ value: "{{ .Release.Namespace }}"
- name: aaf_locate_url
- 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,17
+98,17
@@
spec:
###
### AAF-SERVICE
###
###
### AAF-SERVICE
###
- - name:
{{ .Chart.Name }}
-service
- image: {{ .Values.image.repository }}onap/aaf/aaf_
servic
e:{{ .Values.image.version }}
+ - name:
aaf
-service
+ 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-service aaf-cass && exec bin/service"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service
nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }}
aaf-cass && exec bin/service"]
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: service
protocol: TCP
ports:
- name: service
protocol: TCP
- containerPort:
8100
+ containerPort:
{{.Values.services.service.internal_port}}