app: aaf-locate
type: NodePort
ports:
- - name: aaf-locate
+ - name: {{.Values.services.locate.fqdn}}
protocol: TCP
- port: 8095
- nodePort: 30081
+ port: {{.Values.services.locate.internal_port}}
+ nodePort: {{.Values.services.locate.public_port}}
---
apiVersion: apps/v1
kind: Deployment
labels:
app: aaf-locate
spec:
- replicas: {{ .Values.replicas.locate }}
+ replicas: {{ .Values.services.locate.replicas }}
selector:
matchLabels:
app: aaf-locate
spec:
volumes:
# Use this Pod Sharing dir to declare various States of starting
- - name: {{ .Chart.Name }}-config-vol
+ - name: aaf-config-vol
persistentVolumeClaim:
- claimName: {{ .Chart.Name }}-config-pvc
- - name: {{ .Chart.Name }}-status-vol
+ claimName: aaf-config-pvc
+ - name: aaf-status-vol
persistentVolumeClaim:
- claimName: {{ .Chart.Name }}-status-pvc
+ claimName: aaf-status-pvc
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"]
+ command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm"]
volumeMounts:
- - mountPath: "/opt/app/osaaf"
- name: {{ .Chart.Name }}-config-vol
- 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_locator_container
- value: "helm"
- - name: aaf_locator_container_ns
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- - name: aaf_locate_url
- value: "https://aaf-locate.onap:8095"
- - name: aaf_locator_public_fqdn
- value: "aaf.osaaf.org"
- - name: CASSANDRA_CLUSTER
- value: "aaf-cass"
-# - name: CASSANDRA_USER
-# value: ""
-# - name: CASSANDRA_PASSWORD
-# value: ""
-# - name: CASSANDRA_PORT
-# value: ""jjjjn
+ - mountPath: "/opt/app/aaf/status"
+ name: aaf-status-vol
containers:
###
### AAF-LOCATE
###
- - name: {{ .Chart.Name }}-locate
- image: {{ .Values.image.repository }}onap/aaf/aaf_locate:{{ .Values.image.version }}
+ - name: aaf-locate
+ 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-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: {{ .Chart.Name }}-config-vol
+ name: aaf-config-vol
- mountPath: "/opt/app/aaf/status"
- name: {{ .Chart.Name }}-status-vol
+ name: aaf-status-vol
ports:
- - name: aaf-locate
+ - name: {{.Values.services.locate.fqdn}}
protocol: TCP
- containerPort: 8095
- env:
- - name: aaf_locator_ns
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
-
+ containerPort: {{.Values.services.locate.internal_port}}