aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/vfc/components
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-08-16 17:18:49 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2023-09-29 13:42:29 +0200
commitcfd8434fe9484b9219560159094b174421d6d6a2 (patch)
tree0825b2650bb861444f18444f0279479e4dcbf7c4 /kubernetes/vfc/components
parent533403925a6b60f4113c4d9e54cd99be36dc9cc5 (diff)
[MARIADB][COMMON] Add support for mariadb-operator
Add template functions for the mariadb-operator resources and update the mariadb-galera chart to support them Change the flag to "useOperator" in cassandra to the global setup and additional labels for cassandra resources Changed Policy DB users to support the new mariadb User and fixed db.sh script to wait for the DB user creation Use the new readiness image 5.0.1 with the "app-name" option Change the MariaDB-Galera Service to the "primary" to avoid Deadlocks Fix previous SDNC patch (https://gerrit.onap.org/r/c/oom/+/135308) and temporary disable MariaDB for SDNR, as it is not compatible to MariaDB 11 Issue-ID: OOM-3236 Change-Id: Ie63fcc9c6d5fa802d38c592b449e7ff8553c2ab9 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Diffstat (limited to 'kubernetes/vfc/components')
-rw-r--r--kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml4
-rw-r--r--kubernetes/vfc/components/vfc-nslcm/values.yaml2
-rw-r--r--kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml4
-rw-r--r--kubernetes/vfc/components/vfc-vnflcm/values.yaml2
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml4
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/values.yaml2
-rw-r--r--kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml4
-rw-r--r--kubernetes/vfc/components/vfc-vnfres/values.yaml2
8 files changed, 12 insertions, 12 deletions
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index ebfacf52c0..b04238825c 100644
--- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
- command:
- /app/ready.py
args:
- - --container-name
- - '{{ ternary (index .Values "mariadb-galera" "nameOverride") .Values.global.mariadbGalera.service .Values.global.mariadbGalera.localCluster }}'
+ - --app-name
+ - {{ include "common.mariadbAppName" . }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml
index 0cd3ce178a..1b0fd7c735 100644
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -21,7 +21,7 @@ global:
ssl_enabled: false
mariadbGalera:
localCluster: false
- service: mariadb-galera
+ service: mariadb-galera-primary
internalPort: 3306
nameOverride: mariadb-galera
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
index 870541d2f2..ffa834e466 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
- command:
- /app/ready.py
args:
- - --container-name
- - '{{ ternary (index .Values "mariadb-galera" "nameOverride") .Values.global.mariadbGalera.service .Values.global.mariadbGalera.localCluster }}'
+ - --app-name
+ - {{ include "common.mariadbAppName" . }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
index fcad261817..191a6ee9b4 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -21,7 +21,7 @@ global:
ssl_enabled: false
mariadbGalera:
localCluster: false
- service: mariadb-galera
+ service: mariadb-galera-primary
internalPort: 3306
nameOverride: mariadb-galera
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index a690a9d08d..23ea79f5f8 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
- command:
- /app/ready.py
args:
- - --container-name
- - '{{ ternary (index .Values "mariadb-galera" "nameOverride") .Values.global.mariadbGalera.service .Values.global.mariadbGalera.localCluster }}'
+ - --app-name
+ - {{ include "common.mariadbAppName" . }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
index 528bbe0c01..e6f5654184 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -21,7 +21,7 @@ global:
ssl_enabled: false
mariadbGalera:
localCluster: false
- service: mariadb-galera
+ service: mariadb-galera-primary
internalPort: 3306
nameOverride: mariadb-galera
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
index 7994294cd1..9433e13cfe 100644
--- a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
- command:
- /app/ready.py
args:
- - --container-name
- - '{{ ternary (index .Values "mariadb-galera" "nameOverride") .Values.global.mariadbGalera.service .Values.global.mariadbGalera.localCluster }}'
+ - --app-name
+ - {{ include "common.mariadbAppName" . }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml
index c2954d5517..4850c96f11 100644
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -21,7 +21,7 @@ global:
ssl_enabled: false
mariadbGalera:
localCluster: false
- service: mariadb-galera
+ service: mariadb-galera-primary
internalPort: 3306
nameOverride: mariadb-galera