diff options
Diffstat (limited to 'auth/helm')
| -rw-r--r-- | auth/helm/.gitignore | 1 | ||||
| -rw-r--r-- | auth/helm/aaf/Chart.yaml | 2 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-cm.yaml | 2 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-fs.yaml | 2 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-gui.yaml | 2 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-hello.yaml | 2 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-locate.yaml | 2 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-oauth.yaml | 2 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-service.yaml | 10 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf.yaml | 205 | ||||
| -rw-r--r-- | auth/helm/aaf/values.yaml | 3 |
11 files changed, 16 insertions, 217 deletions
diff --git a/auth/helm/.gitignore b/auth/helm/.gitignore index a12eb33b..1c5fad92 100644 --- a/auth/helm/.gitignore +++ b/auth/helm/.gitignore @@ -1,2 +1,3 @@ aaf.orig/ pause/ +aaf.new/ diff --git a/auth/helm/aaf/Chart.yaml b/auth/helm/aaf/Chart.yaml index b6ba288e..323a6e14 100644 --- a/auth/helm/aaf/Chart.yaml +++ b/auth/helm/aaf/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: AAF Helm Chart name: aaf -version: 2.1.3-SNAPSHOT +version: 2.1.4-SNAPSHOT diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml index 0940de43..0a4c3149 100644 --- a/auth/helm/aaf/templates/aaf-cm.yaml +++ b/auth/helm/aaf/templates/aaf-cm.yaml @@ -48,7 +48,7 @@ spec: - name: AAF_REGISTER_AS value: "aaf-cm" - name: AAF_LOCATOR_AS - value: "aaf-locate" + value: "{{ .Values.cadi.aaf_locate_as }}" - name: LATITUDE value: "{{ .Values.cadi.cadi_latitude }}" - name: LONGITUDE diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml index 7d596845..22935dc3 100644 --- a/auth/helm/aaf/templates/aaf-fs.yaml +++ b/auth/helm/aaf/templates/aaf-fs.yaml @@ -48,7 +48,7 @@ spec: - name: AAF_REGISTER_AS value: "aaf-fs" - name: AAF_LOCATOR_AS - value: "aaf-locate" + value: "{{ .Values.cadi.aaf_locate_as }}" - name: LATITUDE value: "{{ .Values.cadi.cadi_latitude }}" - name: LONGITUDE diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml index bc2a23df..c5d11d0e 100644 --- a/auth/helm/aaf/templates/aaf-gui.yaml +++ b/auth/helm/aaf/templates/aaf-gui.yaml @@ -48,7 +48,7 @@ spec: - name: AAF_REGISTER_AS value: "aaf-gui" - name: AAF_LOCATOR_AS - value: "aaf-locate" + value: "{{ .Values.cadi.aaf_locate_as }}" - name: LATITUDE value: "{{ .Values.cadi.cadi_latitude }}" - name: LONGITUDE diff --git a/auth/helm/aaf/templates/aaf-hello.yaml b/auth/helm/aaf/templates/aaf-hello.yaml index b11365d2..033c9125 100644 --- a/auth/helm/aaf/templates/aaf-hello.yaml +++ b/auth/helm/aaf/templates/aaf-hello.yaml @@ -48,7 +48,7 @@ spec: - name: AAF_REGISTER_AS value: "aaf-hello" - name: AAF_LOCATOR_AS - value: "aaf-locate" + value: "{{ .Values.cadi.aaf_locate_as }}" - name: LATITUDE value: "{{ .Values.cadi.cadi_latitude }}" - name: LONGITUDE diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml index 7f10fbf5..58c249ee 100644 --- a/auth/helm/aaf/templates/aaf-locate.yaml +++ b/auth/helm/aaf/templates/aaf-locate.yaml @@ -48,7 +48,7 @@ spec: - name: AAF_REGISTER_AS value: "aaf-locate" - name: AAF_LOCATOR_AS - value: "aaf-locate" + value: "{{ .Values.cadi.aaf_locate_as }}" - name: LATITUDE value: "{{ .Values.cadi.cadi_latitude }}" - name: LONGITUDE diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml index a08e86fb..08984674 100644 --- a/auth/helm/aaf/templates/aaf-oauth.yaml +++ b/auth/helm/aaf/templates/aaf-oauth.yaml @@ -48,7 +48,7 @@ spec: - name: AAF_REGISTER_AS value: "aaf-oauth" - name: AAF_LOCATOR_AS - value: "aaf-locate" + value: "{{ .Values.cadi.aaf_locate_as }}" - name: LATITUDE value: "{{ .Values.cadi.cadi_latitude }}" - name: LONGITUDE diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml index e76f61b3..306bd776 100644 --- a/auth/helm/aaf/templates/aaf-service.yaml +++ b/auth/helm/aaf/templates/aaf-service.yaml @@ -22,7 +22,7 @@ metadata: labels: app: aaf-service spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: aaf-service @@ -32,9 +32,11 @@ spec: app: aaf-service spec: volumes: - # Use this Pod Sharing dir to declare various States of starting - name: {{ .Chart.Name }}-config-vol - emptyDir: {} + persistentVolumeClaim: + claimName: {{ .Chart.Name }}-config-pvc + #- name: {{ .Chart.Name }}-config-vol + # emptyDir: {} initContainers: - name: {{ .Chart.Name }}-config-container image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }} @@ -48,7 +50,7 @@ spec: - name: AAF_REGISTER_AS value: "aaf-service" - name: AAF_LOCATOR_AS - value: "aaf-locate" + value: "{{ .Values.cadi.aaf_locate_as }}" - name: LATITUDE value: "{{ .Values.cadi.cadi_latitude }}" - name: LONGITUDE diff --git a/auth/helm/aaf/templates/aaf.yaml b/auth/helm/aaf/templates/aaf.yaml deleted file mode 100644 index c8eb2970..00000000 --- a/auth/helm/aaf/templates/aaf.yaml +++ /dev/null @@ -1,205 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: aaf -spec: - selector: - app: aaf - #type: ExternalName - #externalName: aaf.osaaf.org - externalIPs: - - 192.168.99.100 - ports: - - name: aaf-service - protocol: TCP - port: 8100 - targetPort: 8100 - - name: aaf-locate - protocol: TCP - port: 8095 - targetPort: 8095 - - name: aaf-oauth - protocol: TCP - port: 8140 - targetPort: 8140 - - name: aaf-gui - protocol: TCP - port: 8200 - targetPort: 8200 - - name: aaf-cm - protocol: TCP - port: 8150 - targetPort: 8150 - - name: aaf-hello - protocol: TCP - port: 8130 - targetPort: 8130 - - name: aaf-fs - protocol: TCP - port: 8096 - targetPort: 8096 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: aaf-svcs - labels: - app: aaf -spec: - replicas: 1 - selector: - matchLabels: - app: aaf - template: - metadata: - labels: - app: aaf - spec: - volumes: - - name: {{ .Chart.Name }}-config-vol - persistentVolumeClaim: - claimName: {{ .Chart.Name }}-config-pvc - # Use this Pod Sharing dir to declare various States of starting - - 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 - volumeMounts: - - mountPath: "/opt/app/osaaf" - name: {{ .Chart.Name }}-config-vol - - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol - env: - - name: HOSTNAME - value: "{{ .Values.cadi.hostname }}" - - name: AAF_ENV - value: "{{ .Values.cadi.aaf_env }}" - - name: AAF_REGISTER_AS - value: "{{ .Values.cadi.aaf_register_as }}" - - name: LATITUDE - value: "{{ .Values.cadi.cadi_latitude }}" - - name: LONGITUDE - value: "{{ .Values.cadi.cadi_longitude }}" - - name: CASS_HOST - value: "aaf-cass" - 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","30","/opt/app/aaf/bin/service"] - volumeMounts: - - 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 -# hostPort: 8100 -### -### AAF-Locate -### - - name: {{ .Chart.Name }}-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","aaf_service","/opt/app/aaf/bin/locate"] - volumeMounts: - - mountPath: "/opt/app/osaaf" - name: {{ .Chart.Name }}-config-vol - - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol - ports: - - name: locate - protocol: TCP - containerPort: 8095 - -### -### AAF-OAuth -### - - name: {{ .Chart.Name }}-oauth - image: {{ .Values.image.repository }}onap/aaf/aaf_oauth:{{ .Values.image.version }} - imagePullPolicy: IfNotPresent - command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_oauth","aaf_locate","/opt/app/aaf/bin/oauth"] - volumeMounts: - - mountPath: "/opt/app/osaaf" - name: {{ .Chart.Name }}-config-vol - - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol - ports: - - name: oauth - protocol: TCP - containerPort: 8096 -### -### AAF-GUI -### - - name: {{ .Chart.Name }}-gui - image: {{ .Values.image.repository }}onap/aaf/aaf_gui:{{ .Values.image.version }} - imagePullPolicy: IfNotPresent - command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_gui","aaf_cm","/opt/app/aaf/bin/gui"] - volumeMounts: - - mountPath: "/opt/app/osaaf" - name: {{ .Chart.Name }}-config-vol - - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol - ports: - - name: gui - protocol: TCP - containerPort: 8200 -### -### AAF-Certman -### - - name: {{ .Chart.Name }}-cm - image: {{ .Values.image.repository }}onap/aaf/aaf_cm:{{ .Values.image.version }} - imagePullPolicy: IfNotPresent - command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_cm","aaf_locate","/opt/app/aaf/bin/cm"] - volumeMounts: - - mountPath: "/opt/app/osaaf" - name: {{ .Chart.Name }}-config-vol - - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol - ports: - - name: cm - protocol: TCP - containerPort: 8150 - -### -### AAF-FS -### - - name: {{ .Chart.Name }}-fs - image: {{ .Values.image.repository }}onap/aaf/aaf_fs:{{ .Values.image.version }} - imagePullPolicy: IfNotPresent - command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_fs","aaf_locate","/opt/app/aaf/bin/fs"] - volumeMounts: - - mountPath: "/opt/app/osaaf" - name: {{ .Chart.Name }}-config-vol - - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol - ports: - - name: fs - protocol: TCP - containerPort: 8096 - -### -### AAF-Hello -### - - name: {{ .Chart.Name }}-hello - image: {{ .Values.image.repository }}onap/aaf/aaf_hello:{{ .Values.image.version }} - imagePullPolicy: IfNotPresent - command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_hello","aaf_locate","/opt/app/aaf/bin/hello"] - volumeMounts: - - mountPath: "/opt/app/osaaf" - name: {{ .Chart.Name }}-config-vol - - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol - ports: - - name: hello - protocol: TCP - containerPort: 8130 - diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml index bee28d5d..044ff426 100644 --- a/auth/helm/aaf/values.yaml +++ b/auth/helm/aaf/values.yaml @@ -19,6 +19,7 @@ cadi: cadi_longitude: "-72.0" aaf_env: "DEV" aaf_register_as: "aaf.onap" + aaf_locate_as: "aaf-locate" persistence: mountPath: "/mnt/data/aaf" @@ -47,7 +48,7 @@ image: # When using Docker Repo, add, and include trailing "/" # repository: nexus3.onap.org:10003/ # repository: localhost:5000/ - version: 2.1.3-SNAPSHOT + version: 2.1.4-SNAPSHOT resources: {} # We usually recommend not to specify default resources and to leave this as a conscious |