summaryrefslogtreecommitdiffstats
path: root/kubernetes/so
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/so')
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml18
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/service.yaml4
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml18
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml4
-rwxr-xr-xkubernetes/so/charts/so-db-secrets/templates/secrets.yaml4
-rw-r--r--kubernetes/so/charts/so-mariadb/templates/configmap.yaml4
-rw-r--r--kubernetes/so/charts/so-mariadb/templates/job.yaml12
-rw-r--r--kubernetes/so/charts/so-mariadb/templates/pv.yaml4
-rw-r--r--kubernetes/so/charts/so-mariadb/templates/pvc.yaml2
-rw-r--r--kubernetes/so/charts/so-mariadb/templates/secrets.yaml4
-rw-r--r--kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml8
-rw-r--r--kubernetes/so/charts/so-monitoring/templates/configmap.yaml4
-rw-r--r--kubernetes/so/charts/so-monitoring/templates/deployment.yaml16
-rw-r--r--kubernetes/so/charts/so-monitoring/templates/service.yaml4
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml18
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/service.yaml4
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml18
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/service.yaml4
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/deployment.yaml18
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/service.yaml4
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml16
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/service.yaml4
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml18
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/templates/service.yaml4
-rwxr-xr-xkubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml8
-rwxr-xr-xkubernetes/so/charts/so-vnfm-adapter/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml4
-rwxr-xr-xkubernetes/so/charts/so-vnfm-adapter/templates/service.yaml4
-rwxr-xr-xkubernetes/so/templates/configmap.yaml4
-rwxr-xr-xkubernetes/so/templates/deployment.yaml18
-rwxr-xr-xkubernetes/so/templates/service.yaml4
-rwxr-xr-xkubernetes/so/values.yaml3
39 files changed, 146 insertions, 145 deletions
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
index b94f35f553..d873beb62c 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
index 9211571c8a..931a89516b 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,14 +32,14 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-so-mariadb-config-job
+ - {{ include "common.release" . }}-so-mariadb-config-job
env:
- name: NAMESPACE
valueFrom:
@@ -58,32 +58,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
index 741614886c..6711c3b2e7 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -35,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml
index b94f35f553..d873beb62c 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
index 9211571c8a..931a89516b 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,14 +32,14 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-so-mariadb-config-job
+ - {{ include "common.release" . }}-so-mariadb-config-job
env:
- name: NAMESPACE
valueFrom:
@@ -58,32 +58,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
index 741614886c..6711c3b2e7 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -35,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml b/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
index d19803c32e..d636fad4a7 100755
--- a/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
+++ b/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
@@ -14,12 +14,12 @@
apiVersion: v1
kind: Secret
metadata:
- name: {{ .Release.Name }}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
mariadb.readwrite.host : {{ .Values.global.mariadbGalera.serviceName | b64enc | quote }}
diff --git a/kubernetes/so/charts/so-mariadb/templates/configmap.yaml b/kubernetes/so/charts/so-mariadb/templates/configmap.yaml
index 8f10b2eb27..842e562fd7 100644
--- a/kubernetes/so/charts/so-mariadb/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/docker-entrypoint-initdb.d/*").AsConfig . | indent 2 }}
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/docker-entrypoint-initdb.d/db-sql-scripts/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-mariadb/templates/job.yaml b/kubernetes/so/charts/so-mariadb/templates/job.yaml
index 7e10e48945..68c6017b91 100644
--- a/kubernetes/so/charts/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/job.yaml
@@ -20,7 +20,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
annotations:
"helm.sh/hook": pre-upgrade,pre-install
@@ -32,7 +32,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
spec:
containers:
@@ -81,7 +81,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
annotations:
"helm.sh/hook": post-upgrade,post-rollback,post-install
@@ -93,7 +93,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}-job
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
spec:
initContainers:
@@ -130,12 +130,12 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: MYSQL_ROOT_PASSWORD
valueFrom:
diff --git a/kubernetes/so/charts/so-mariadb/templates/pv.yaml b/kubernetes/so/charts/so-mariadb/templates/pv.yaml
index f8315ef5f9..7d81805cda 100644
--- a/kubernetes/so/charts/so-mariadb/templates/pv.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/pv.yaml
@@ -23,7 +23,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
- release: "{{ .Release.Name }}"
+ release: {{ include "common.release" . }}
heritage: "{{ .Release.Service }}"
name: {{ include "common.fullname" . }}-migration
annotations:
@@ -38,5 +38,5 @@ spec:
persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
storageClassName: "{{ include "common.fullname" . }}-data"
hostPath:
- path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}
+ path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ include "common.release" . }}/{{ .Values.persistence.mountSubPath }}
{{- end }}
diff --git a/kubernetes/so/charts/so-mariadb/templates/pvc.yaml b/kubernetes/so/charts/so-mariadb/templates/pvc.yaml
index 17ff7730c7..ad10f18f16 100644
--- a/kubernetes/so/charts/so-mariadb/templates/pvc.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/pvc.yaml
@@ -23,7 +23,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
+ release: "{{ include "common.release" . }}"
heritage: "{{ .Release.Service }}"
annotations:
"helm.sh/hook": pre-upgrade,pre-install
diff --git a/kubernetes/so/charts/so-mariadb/templates/secrets.yaml b/kubernetes/so/charts/so-mariadb/templates/secrets.yaml
index 99ccb55445..1c309faffb 100644
--- a/kubernetes/so/charts/so-mariadb/templates/secrets.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/secrets.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
type: Opaque
data:
@@ -34,7 +34,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
annotations:
"helm.sh/hook": pre-upgrade,pre-install
diff --git a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
index dd649c14b8..c2e6ad06f3 100644
--- a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
@@ -15,11 +15,3 @@ mso:
api:
url: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/infraActiveRequests/
auth: Basic YnBlbDpwYXNzd29yZDEk
-
-spring:
- security:
- usercredentials:
- -
- username: gui
- password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
- role: GUI-Client
diff --git a/kubernetes/so/charts/so-monitoring/templates/configmap.yaml b/kubernetes/so/charts/so-monitoring/templates/configmap.yaml
index 489d5f48fc..a6d8b469f8 100644
--- a/kubernetes/so/charts/so-monitoring/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-monitoring/templates/configmap.yaml
@@ -27,7 +27,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -38,7 +38,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
index bfedc05a19..9afcddde36 100644
--- a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
@@ -24,7 +24,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -37,7 +37,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- name: so-chown
@@ -57,32 +57,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/charts/so-monitoring/templates/service.yaml b/kubernetes/so/charts/so-monitoring/templates/service.yaml
index 053af9b5c2..c4c2ae9d13 100644
--- a/kubernetes/so/charts/so-monitoring/templates/service.yaml
+++ b/kubernetes/so/charts/so-monitoring/templates/service.yaml
@@ -24,7 +24,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -40,6 +40,6 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml
index b94f35f553..d873beb62c 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
index 9211571c8a..931a89516b 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,14 +32,14 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-so-mariadb-config-job
+ - {{ include "common.release" . }}-so-mariadb-config-job
env:
- name: NAMESPACE
valueFrom:
@@ -58,32 +58,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
index 741614886c..6711c3b2e7 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -35,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml
index b94f35f553..d873beb62c 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
index 9211571c8a..931a89516b 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,14 +32,14 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-so-mariadb-config-job
+ - {{ include "common.release" . }}-so-mariadb-config-job
env:
- name: NAMESPACE
valueFrom:
@@ -58,32 +58,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
index 741614886c..6711c3b2e7 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -35,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/configmap.yaml b/kubernetes/so/charts/so-sdc-controller/templates/configmap.yaml
index b94f35f553..d873beb62c 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
index 9211571c8a..931a89516b 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,14 +32,14 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-so-mariadb-config-job
+ - {{ include "common.release" . }}-so-mariadb-config-job
env:
- name: NAMESPACE
valueFrom:
@@ -58,32 +58,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/service.yaml b/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
index 741614886c..6711c3b2e7 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -35,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml
index b94f35f553..d873beb62c 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
index 56b628c539..ab489160fc 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,7 +32,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
containers:
- name: {{ include "common.name" . }}
@@ -43,32 +43,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
index 741614886c..6711c3b2e7 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -35,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml
index b94f35f553..d873beb62c 100755
--- a/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
index 9211571c8a..931a89516b 100755
--- a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,14 +32,14 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-so-mariadb-config-job
+ - {{ include "common.release" . }}-so-mariadb-config-job
env:
- name: NAMESPACE
valueFrom:
@@ -58,32 +58,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/service.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/service.yaml
index bbe5f277eb..5e29af8ab5 100755
--- a/kubernetes/so/charts/so-vfc-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
@@ -35,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ include "common.release" . }} \ No newline at end of file
diff --git a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
index 760fa16e75..5213700df0 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
@@ -49,3 +49,11 @@ sdc:
endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
vnfmadapter:
endpoint: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092
+etsi-catalog-manager:
+ vnfpkgm:
+ {{- if .Values.global.msbEnabled }}
+ endpoint: http://msb-iag.{{ include "common.namespace" . }}:80/api/vnfpkgm/v1
+ {{- else }}
+ endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
+ {{- end }}
+
diff --git a/kubernetes/so/charts/so-vnfm-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-vnfm-adapter/templates/configmap.yaml
index fb26dcef09..c79e58a711 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml
index b337cad687..a253a21ecc 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,7 +32,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
containers:
- name: {{ include "common.name" . }}
diff --git a/kubernetes/so/charts/so-vnfm-adapter/templates/service.yaml b/kubernetes/so/charts/so-vnfm-adapter/templates/service.yaml
index 7a8241223f..b445f7553b 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
annotations:
msb.onap.org/service-info: '[
@@ -46,4 +46,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/templates/configmap.yaml b/kubernetes/so/templates/configmap.yaml
index b94f35f553..d873beb62c 100755
--- a/kubernetes/so/templates/configmap.yaml
+++ b/kubernetes/so/templates/configmap.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
---
apiVersion: v1
@@ -33,7 +33,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 9211571c8a..931a89516b 100755
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.fullname" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
replicas: {{ index .Values.replicaCount }}
minReadySeconds: {{ index .Values.minReadySeconds }}
@@ -32,14 +32,14 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- command:
- /root/job_complete.py
args:
- --job-name
- - {{ .Release.Name }}-so-mariadb-config-job
+ - {{ include "common.release" . }}-so-mariadb-config-job
env:
- name: NAMESPACE
valueFrom:
@@ -58,32 +58,32 @@ spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.port
- name: DB_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.rolename
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.readwrite.password
- name: DB_ADMIN_USERNAME
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.rolename
- name: DB_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ .Release.Name}}-so-db-secrets
+ name: {{ include "common.release" . }}-so-db-secrets
key: mariadb.admin.password
envFrom:
- configMapRef:
diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml
index ab58ea6ede..336b9f7028 100755
--- a/kubernetes/so/templates/service.yaml
+++ b/kubernetes/so/templates/service.yaml
@@ -19,7 +19,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
annotations:
msb.onap.org/service-info: '[
@@ -398,4 +398,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 9d5ff4283e..9af34af88e 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -38,6 +38,7 @@ global:
dbPort: 3306
dbUser: root
dbPassword: secretpassword
+ msbEnabled: true
#################################################################
# Application configuration defaults.
@@ -113,4 +114,4 @@ ingress:
name: "so"
port: 8080
config:
- ssl: "none" \ No newline at end of file
+ ssl: "none"