Merge "Fix error tag condition" into casablanca
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml
index 58017bd..de78968 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml
@@ -85,6 +85,7 @@
name: aaf-sms-db
portName: aaf-sms-db
internalPort: 8200
+ externalPort: 8200
nodePort: 44
ingress:
diff --git a/kubernetes/aaf/charts/aaf-sms/values.yaml b/kubernetes/aaf/charts/aaf-sms/values.yaml
index 8e7ea29..a767a80 100644
--- a/kubernetes/aaf/charts/aaf-sms/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/values.yaml
@@ -71,6 +71,7 @@
name: aaf-sms
portName: aaf-sms
internalPort: 10443
+ externalPort: 10443
nodePort: 43
persistence:
diff --git a/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml b/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml
index b949064..5b8f881 100644
--- a/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml
@@ -33,7 +33,7 @@
accessModes:
- {{ $root.Values.persistence.accessMode }}
hostPath:
- path: {{ $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }}
+ path: {{ $root.Values.global.persistence.mountPath | default $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }}
persistentVolumeReclaimPolicy: {{ $root.Values.persistence.volumeReclaimPolicy }}
{{ end }}
#{{ end }}
diff --git a/kubernetes/aai/charts/aai-cassandra/values.yaml b/kubernetes/aai/charts/aai-cassandra/values.yaml
index 1e1d2c1..24f9c78 100644
--- a/kubernetes/aai/charts/aai-cassandra/values.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/values.yaml
@@ -17,7 +17,7 @@
# Declare variables to be passed into your templates.
global: # global defaults
nodePortPrefix: 302
-
+ persistence: {}
# application image
dockerhubRepository: registry.hub.docker.com
diff --git a/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml b/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml
index cf06405..dffb5a0 100644
--- a/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml
@@ -55,9 +55,11 @@
portName: dcae-dt
nodePort: "65"
internalPort: 8186
+ externalPort: 8186
portName2: dcae-dt2
nodePort2: "66"
internalPort2: 9446
+ externalPort2: 9446
ingress:
enabled: false
diff --git a/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml b/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml
index ab6eaf3..dd6e3ff 100644
--- a/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml
@@ -60,9 +60,11 @@
portName: dcae-fe
nodePort: "63"
internalPort: 8183
+ externalPort: 8183
portName2: dcae-fe2
nodePort2: "64"
internalPort2: 9444
+ externalPort2: 9444
ingress:
enabled: false