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-fs.yaml
diff --git
a/auth/helm/aaf/templates/aaf-fs.yaml
b/auth/helm/aaf/templates/aaf-fs.yaml
index
746bd5b
..
5bca696
100644
(file)
--- a/
auth/helm/aaf/templates/aaf-fs.yaml
+++ b/
auth/helm/aaf/templates/aaf-fs.yaml
@@
-29,10
+29,10
@@
spec:
app: aaf-fs
type: NodePort
ports:
app: aaf-fs
type: NodePort
ports:
- - name:
aaf-fs
+ - name:
{{.Values.services.fs.fqdn}}
protocol: TCP
protocol: TCP
- port:
8096
- nodePort:
30085
+ port:
{{.Values.services.fs.internal_port}}
+ nodePort:
{{.Values.services.fs.public_port}}
---
apiVersion: apps/v1
kind: Deployment
---
apiVersion: apps/v1
kind: Deployment
@@
-41,7
+41,7
@@
metadata:
labels:
app: aaf-fs
spec:
labels:
app: aaf-fs
spec:
- replicas:
1
+ replicas:
{{ .Values.services.fs.replicas }}
selector:
matchLabels:
app: aaf-fs
selector:
matchLabels:
app: aaf-fs
@@
-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_fqdn
- name: aaf_locator_container
value: "helm"
- name: aaf_locator_fqdn
@@
-80,9
+82,9
@@
spec:
fieldRef:
fieldPath: status.podIP
- name: aaf_locate_url
fieldRef:
fieldPath: status.podIP
- name: aaf_locate_url
- value: "https://aaf-locate
:8095
"
+ value: "https://aaf-locate
.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}
"
- 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
@@
-93,19
+95,19
@@
spec:
###
### AAF-FS
###
###
### AAF-FS
###
- - name:
{{ .Chart.Name }}
-fs
- image: {{ .Values.image.repository }}onap/aaf/aaf_
fs
:{{ .Values.image.version }}
+ - name:
aaf
-fs
+ 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-fs aaf-locate && exec bin/fs"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
imagePullPolicy: IfNotPresent
command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"]
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:
ports:
- - name:
aaf-fs
+ - name:
{{.Values.services.fs.fqdn}}
protocol: TCP
protocol: TCP
- containerPort:
8096
+ containerPort:
{{.Values.services.fs.internal_port}}
env:
- name: aaf_locator_container
value: "helm"
env:
- name: aaf_locator_container
value: "helm"
@@
-115,6
+117,10
@@
spec:
fieldPath: metadata.namespace
- name: aaf_locate_url
value: "https://aaf-locate.onap:8095"
fieldPath: metadata.namespace
- name: aaf_locate_url
value: "https://aaf-locate.onap:8095"
- - name: aaf_locator_public_hostname
- value: "aaf.osaaf.org"
+ - 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}}"