summaryrefslogtreecommitdiffstats
path: root/auth/helm
diff options
context:
space:
mode:
Diffstat (limited to 'auth/helm')
-rw-r--r--auth/helm/aaf/templates/aaf-cass.yaml4
-rw-r--r--auth/helm/aaf/templates/aaf-cm.yaml4
-rw-r--r--auth/helm/aaf/templates/aaf-fs.yaml2
-rw-r--r--auth/helm/aaf/templates/aaf-gui.yaml2
-rw-r--r--auth/helm/aaf/templates/aaf-locate.yaml8
-rw-r--r--auth/helm/aaf/templates/aaf-oauth.yaml4
-rw-r--r--auth/helm/aaf/templates/aaf-service.yaml4
-rw-r--r--auth/helm/aaf/values.yaml1
8 files changed, 18 insertions, 11 deletions
diff --git a/auth/helm/aaf/templates/aaf-cass.yaml b/auth/helm/aaf/templates/aaf-cass.yaml
index 552303ca..cab7134b 100644
--- a/auth/helm/aaf/templates/aaf-cass.yaml
+++ b/auth/helm/aaf/templates/aaf-cass.yaml
@@ -40,6 +40,10 @@ spec:
protocol: TCP
port: {{.Values.services.cass.native_trans_port}}
containerPort: {{.Values.services.cass.native_trans_port}}
+ - name: rpc
+ protocol: TCP
+ port: {{.Values.services.cass.rpc_port}}
+ containerPort: {{.Values.services.cass.rpc_port}}
---
apiVersion: apps/v1
kind: Deployment
diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml
index 51b0043d..ccc2e559 100644
--- a/auth/helm/aaf/templates/aaf-cm.yaml
+++ b/auth/helm/aaf/templates/aaf-cm.yaml
@@ -80,7 +80,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: aaf_locate_url
- value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}"
+ value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
- name: aaf_locator_public_fqdn
value: "{{.Values.services.public_fqdn}}"
- name: aaf_locator_name
@@ -102,7 +102,7 @@ spec:
- name: aaf-cm
image: {{ .Values.image.repository }}onap/aaf/aaf_cm:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-locate && exec bin/cm"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
name: aaf-config-vol
diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index f0c6e8e5..7677b269 100644
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -80,7 +80,7 @@ spec:
fieldRef:
fieldPath: status.podIP
- name: aaf_locate_url
- value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}"
+ value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
- name: CASSANDRA_CLUSTER
value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
# - name: CASSANDRA_USER
diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml
index a977a9b3..c7fb2a20 100644
--- a/auth/helm/aaf/templates/aaf-gui.yaml
+++ b/auth/helm/aaf/templates/aaf-gui.yaml
@@ -81,7 +81,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: aaf_locate_url
- value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}"
+ value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
- name: aaf_locator_public_fqdn
value: "{{.Values.services.public_fqdn}}"
- name: aaf_locator_name
diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml
index 1f9bdc40..b48c072b 100644
--- a/auth/helm/aaf/templates/aaf-locate.yaml
+++ b/auth/helm/aaf/templates/aaf-locate.yaml
@@ -66,6 +66,8 @@ spec:
volumeMounts:
- mountPath: "/opt/app/osaaf"
name: aaf-config-vol
+ - mountPath: "/opt/app/aaf/status"
+ name: aaf-status-vol
env:
- name: AAF_ENV
value: "{{ .Values.services.aaf_env }}"
@@ -80,7 +82,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: aaf_locate_url
- value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}"
+ value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
- name: aaf_locator_public_fqdn
value: "{{.Values.services.public_fqdn}}"
- name: aaf_locator_name
@@ -88,7 +90,7 @@ spec:
- name: aaf_locator_name_helm
value: "{{.Values.services.aaf_locator_name_helm}}"
- name: CASSANDRA_CLUSTER
- value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
+ value: "{{.Values.services.cass.fqdn}}.{{.Release.Namespace}}"
# - name: CASSANDRA_USER
# value: ""
# - name: CASSANDRA_PASSWORD
@@ -102,7 +104,7 @@ spec:
- name: aaf-locate
image: {{ .Values.image.repository }}onap/aaf/aaf_locate:{{ .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: aaf-config-vol
diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index ff9a18dd..3e36d29c 100644
--- a/auth/helm/aaf/templates/aaf-oauth.yaml
+++ b/auth/helm/aaf/templates/aaf-oauth.yaml
@@ -80,7 +80,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: aaf_locate_url
- value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}"
+ value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
- name: aaf_locator_public_fqdn
value: "{{.Values.services.public_fqdn}}"
- name: aaf_locator_name
@@ -102,7 +102,7 @@ spec:
- name: aaf-oauth
image: {{ .Values.image.repository }}onap/aaf/aaf_oauth:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-service && exec bin/oauth"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
name: aaf-config-vol
diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml
index be6e1c8b..5b9fe186 100644
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -77,7 +77,7 @@ spec:
- name: aaf_locator_container_ns
value: "{{ .Release.Namespace }}"
- name: aaf_locate_url
- value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}"
+ value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
- name: aaf_locator_public_fqdn
value: "{{.Values.services.public_fqdn}}"
- name: aaf_locator_name
@@ -99,7 +99,7 @@ spec:
- name: aaf-service
image: {{ .Values.image.repository }}onap/aaf/aaf_service:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service aaf-cass && exec bin/service"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-cass && exec bin/service"]
volumeMounts:
- mountPath: "/opt/app/osaaf"
name: aaf-config-vol
diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index c38bbdb5..79194601 100644
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -40,6 +40,7 @@ services:
cadi_longitude: "-72.0"
cass:
replicas: 1
+ fqdn: "aaf-cass"
cluster_name: "osaaf"
heap_new_size: "512M"
max_heap_size: "1024M"