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: 1
+ 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
- emptyDir: {}
+ - name: aaf-config-vol
+ persistentVolumeClaim:
+ claimName: aaf-config-pvc
+ - name: aaf-status-vol
+ persistentVolumeClaim:
+ 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"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: {{ .Chart.Name }}-config-vol
+ name: aaf-config-vol
env:
- name: AAF_ENV
- value: "{{ .Values.cadi.aaf_env }}"
- - name: AAF_REGISTER_AS
- value: "aaf-locate"
- - name: AAF_LOCATOR_AS
- value: "{{ .Values.cadi.aaf_locate_as }}"
+ value: "{{ .Values.services.aaf_env }}"
- name: LATITUDE
- value: "{{ .Values.cadi.cadi_latitude }}"
+ value: "{{ .Values.services.cadi_latitude }}"
- name: LONGITUDE
- value: "{{ .Values.cadi.cadi_longitude }}"
- - name: CASS_HOST
- value: "aaf-cass"
+ value: "{{ .Values.services.cadi_longitude }}"
+ - name: aaf_locator_container
+ value: "helm"
+ - name: aaf_locator_container_ns
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+ - name: aaf_locate_url
+ value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}"
+ - 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
+ value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
+# - name: CASSANDRA_USER
+# value: ""
+# - name: CASSANDRA_PASSWORD
+# value: ""
+# - name: CASSANDRA_PORT
+# value: ""
containers:
###
### AAF-LOCATE
###
- - name: {{ .Chart.Name }}-locate
+ - name: aaf-locate
image: {{ .Values.image.repository }}onap/aaf/aaf_locate:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_locate","sleep","50", "cd /opt/app/aaf;bin/locate"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate aaf-service && exec bin/locate"]
volumeMounts:
- - mountPath: "/opt/app/osaaf"
- name: {{ .Chart.Name }}-config-vol
+ - mountPath: "/opt/app/osaaf"
+ name: aaf-config-vol
+ - mountPath: "/opt/app/aaf/status"
+ name: aaf-status-vol
ports:
- - name: aaf-locate
+ - name: {{.Values.services.locate.fqdn}}
protocol: TCP
- containerPort: 8095
+ containerPort: {{.Values.services.locate.internal_port}}
+ env:
+ - name: aaf_locator_ns
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+