+#########
+## ============LICENSE_START====================================================
+## org.onap.aaf
+## ===========================================================================
+## Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+## ===========================================================================
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ============LICENSE_END====================================================
+##
###
### AAF-SERVICE
###
metadata:
name: aaf-service
spec:
+ type: NodePort
selector:
app: aaf-service
- type: NodePort
ports:
- name: aaf-service
protocol: TCP
+ nodePort: 30080
port: 8100
- NodePort: 30080
+ targetPort: 8100
---
apiVersion: apps/v1
kind: Deployment
labels:
app: aaf-service
spec:
- replicas: 1
+ replicas: {{ .Values.replicas.service }}
selector:
matchLabels:
app: aaf-service
volumes:
- name: {{ .Chart.Name }}-config-vol
persistentVolumeClaim:
- claimName: {{ .Chart.Name }}-config-pvc
- #- name: {{ .Chart.Name }}-config-vol
- # emptyDir: {}
+ claimName: {{ .Chart.Name }}-config-pvc
+ - name: {{ .Chart.Name }}-status-vol
+ persistentVolumeClaim:
+ claimName: {{ .Chart.Name }}-status-pvc
initContainers:
- name: {{ .Chart.Name }}-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
env:
- name: AAF_ENV
value: "{{ .Values.cadi.aaf_env }}"
- - name: AAF_REGISTER_AS
- value: "aaf-service"
- - name: AAF_LOCATOR_AS
- value: "{{ .Values.cadi.aaf_locate_as }}"
- name: LATITUDE
value: "{{ .Values.cadi.cadi_latitude }}"
- name: LONGITUDE
value: "{{ .Values.cadi.cadi_longitude }}"
- - name: CASS_HOST
+ - 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_hostname
+ value: "aaf.osaaf.org"
+ - name: CASSANDRA_CLUSTER
value: "aaf-cass"
+# - name: CASSANDRA_USER
+# value: ""
+# - name: CASSANDRA_PASSWORD
+# value: ""
+# - name: CASSANDRA_PORT
+# value: ""
containers:
###
### AAF-SERVICE
- name: {{ .Chart.Name }}-service
image: {{ .Values.image.repository }}onap/aaf/aaf_service:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_service","sleep","50", "cd /opt/app/aaf;bin/service"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service aaf-cass && exec bin/service"]
volumeMounts:
- - mountPath: "/opt/app/osaaf"
- name: {{ .Chart.Name }}-config-vol
+ - mountPath: "/opt/app/osaaf"
+ name: {{ .Chart.Name }}-config-vol
+ - mountPath: "/opt/app/aaf/status"
+ name: {{ .Chart.Name }}-status-vol
ports:
- name: service
protocol: TCP
containerPort: 8100
+