[SDNC] Move dgbuilder and network-name-gen to SDNC

Move the charts from /common to sdnc/components and simplify
the DB creation.

Issue-ID: OOM-3286

Change-Id: Ib0c53e51b96ad2e1573859b9d938e700c0bea4ac
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>

19 files changed, 22 insertions, 45 deletions

diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index 4a0c9eb607..f98bc4e12d 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -1,6 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2021 Orange
 # Modifications Copyright © 2021 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@
 apiVersion: v2
 description: SDN Controller
 name: sdnc
-version: 13.0.1
+version: 13.0.2
 
 dependencies:
   - name: common
@@ -52,19 +53,19 @@ dependencies:
   # conditions for sdnc-subcharts
   - name: dmaap-listener
     version: ~13.x-0
-    repository: 'file://components/dmaap-listener/'
+    repository: '@local'
     condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
   - name: ueb-listener
     version: ~13.x-0
-    repository: 'file://components/ueb-listener/'
+    repository: '@local'
     condition: sdnc.ueb-listener.enabled,ueb-listener.enabled
   - name: sdnc-ansible-server
     version: ~13.x-0
-    repository: 'file://components/sdnc-ansible-server/'
+    repository: '@local'
     condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled
   - name: sdnc-web
     version: ~13.x-0
-    repository: 'file://components/sdnc-web/'
+    repository: '@local'
     condition: sdnc.sdnc-web.enabled,sdnc-web.enabled
   - name: repositoryGenerator
     version: ~13.x-0
diff --git a/kubernetes/common/dgbuilder/.helmignore b/kubernetes/sdnc/components/dgbuilder/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/common/dgbuilder/.helmignore
+++ b/kubernetes/sdnc/components/dgbuilder/.helmignore
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/sdnc/components/dgbuilder/Chart.yaml
index b5a2c94471..ff32f4e8a2 100644
--- a/kubernetes/common/dgbuilder/Chart.yaml
+++ b/kubernetes/sdnc/components/dgbuilder/Chart.yaml
@@ -22,10 +22,10 @@ version: 13.0.0
 dependencies:
   - name: common
     version: ~13.x-0
-    repository: 'file://../common'
+    repository: '@local'
   - name: repositoryGenerator
     version: ~13.x-0
-    repository: 'file://../repositoryGenerator'
+    repository: '@local'
   - name: serviceAccount
     version: ~13.x-0
-    repository: 'file://../serviceAccount'
+    repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/common/dgbuilder/resources/config/customSettings.js b/kubernetes/sdnc/components/dgbuilder/resources/config/customSettings.js
index abaab57254..abaab57254 100644
--- a/kubernetes/common/dgbuilder/resources/config/customSettings.js
+++ b/kubernetes/sdnc/components/dgbuilder/resources/config/customSettings.js
diff --git a/kubernetes/common/dgbuilder/resources/config/svclogic.properties b/kubernetes/sdnc/components/dgbuilder/resources/config/svclogic.properties
index 01edb4d411..01edb4d411 100644
--- a/kubernetes/common/dgbuilder/resources/config/svclogic.properties
+++ b/kubernetes/sdnc/components/dgbuilder/resources/config/svclogic.properties
diff --git a/kubernetes/common/dgbuilder/templates/NOTES.txt b/kubernetes/sdnc/components/dgbuilder/templates/NOTES.txt
index 27db4f3535..27db4f3535 100644
--- a/kubernetes/common/dgbuilder/templates/NOTES.txt
+++ b/kubernetes/sdnc/components/dgbuilder/templates/NOTES.txt
diff --git a/kubernetes/common/dgbuilder/templates/configmap.yaml b/kubernetes/sdnc/components/dgbuilder/templates/configmap.yaml
index 05699e6107..05699e6107 100644
--- a/kubernetes/common/dgbuilder/templates/configmap.yaml
+++ b/kubernetes/sdnc/components/dgbuilder/templates/configmap.yaml
diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/sdnc/components/dgbuilder/templates/deployment.yaml
index ab0b21c5b6..ab0b21c5b6 100644
--- a/kubernetes/common/dgbuilder/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/dgbuilder/templates/deployment.yaml
diff --git a/kubernetes/common/dgbuilder/templates/ingress.yaml b/kubernetes/sdnc/components/dgbuilder/templates/ingress.yaml
index 4392308e38..4392308e38 100644
--- a/kubernetes/common/dgbuilder/templates/ingress.yaml
+++ b/kubernetes/sdnc/components/dgbuilder/templates/ingress.yaml
diff --git a/kubernetes/common/dgbuilder/templates/secrets.yaml b/kubernetes/sdnc/components/dgbuilder/templates/secrets.yaml
index 4b4849980c..4b4849980c 100644
--- a/kubernetes/common/dgbuilder/templates/secrets.yaml
+++ b/kubernetes/sdnc/components/dgbuilder/templates/secrets.yaml
diff --git a/kubernetes/common/dgbuilder/templates/service.yaml b/kubernetes/sdnc/components/dgbuilder/templates/service.yaml
index 53f04104d9..53f04104d9 100644
--- a/kubernetes/common/dgbuilder/templates/service.yaml
+++ b/kubernetes/sdnc/components/dgbuilder/templates/service.yaml
diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/sdnc/components/dgbuilder/values.yaml
index 68cb86bd7e..68cb86bd7e 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/sdnc/components/dgbuilder/values.yaml
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/sdnc/components/network-name-gen/Chart.yaml
index 88336f49c3..e998a64ecc 100644
--- a/kubernetes/common/network-name-gen/Chart.yaml
+++ b/kubernetes/sdnc/components/network-name-gen/Chart.yaml
@@ -22,18 +22,13 @@ version: 13.0.0
 dependencies:

   - name: common

     version: ~13.x-0

-    repository: 'file://../common'

+    repository: '@local'

   - name: repositoryGenerator

     version: ~13.x-0

-    repository: 'file://../repositoryGenerator'

-  - name: mariadb-galera

-    version: ~13.x-0

-    repository: 'file://../mariadb-galera'

-    condition: global.mariadbGalera.localCluster

+    repository: '@local'

   - name: mariadb-init

     version: ~13.x-0

-    repository: 'file://../mariadb-init'

-    condition: global.mariadbGalera.globalCluster

+    repository: '@local'

   - name: serviceAccount

     version: ~13.x-0

     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/common/network-name-gen/resources/config/aai_keystore b/kubernetes/sdnc/components/network-name-gen/resources/config/aai_keystore
index 83cae95273..83cae95273 100644
--- a/kubernetes/common/network-name-gen/resources/config/aai_keystore
+++ b/kubernetes/sdnc/components/network-name-gen/resources/config/aai_keystore
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/sdnc/components/network-name-gen/templates/deployment.yaml
index 6bba995b11..fbb8044630 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/network-name-gen/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
         - name: NENG_DB_PASS
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "neng-db-secret" "key" "password") | indent 10}}
         - name: NENG_DB_URL
-          value: jdbc:mysql://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-galera" "db" "name" }}
+          value: jdbc:mysql://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-init" "config" "mysqlDatabase" }}
         - name: POL_CLIENT_AUTH
           value: "{{ .Values.config.polClientAuth }}"
         - name: POL_BASIC_AUTH_USER
diff --git a/kubernetes/common/network-name-gen/templates/secrets.yaml b/kubernetes/sdnc/components/network-name-gen/templates/secrets.yaml
index 61b83d7a9b..61b83d7a9b 100644
--- a/kubernetes/common/network-name-gen/templates/secrets.yaml
+++ b/kubernetes/sdnc/components/network-name-gen/templates/secrets.yaml
diff --git a/kubernetes/common/network-name-gen/templates/service.yaml b/kubernetes/sdnc/components/network-name-gen/templates/service.yaml
index aac71f7eb3..aac71f7eb3 100644
--- a/kubernetes/common/network-name-gen/templates/service.yaml
+++ b/kubernetes/sdnc/components/network-name-gen/templates/service.yaml
diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/sdnc/components/network-name-gen/values.yaml
index 0b62705474..9d6a0aef5c 100644
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/sdnc/components/network-name-gen/values.yaml
@@ -27,13 +27,9 @@ global:
   mariadbGalera: &mariadbGalera
     # flag to enable the DB creation via mariadb-operator
     useOperator: true
-    #This flag allows SO to instantiate its own mariadb-galera cluster
-    #When changing it to "true", also set "globalCluster: false"
-    #as the dependency check will not work otherwise (Chart.yaml)
     localCluster: false
-    globalCluster: true
-    service: mariadb-galera
-    internalPort: 3306
+    service: &dbService mariadb-galera
+    internalPort: &dbPort 3306
     nameOverride: mariadb-galera
 
 #################################################################
@@ -53,31 +49,15 @@ secrets:
     login: '{{ .Values.config.polBasicAuthUser }}'
     password: '{{ .Values.config.polBasicAuthPassword }}'
 
-# sub-chart config
-mariadb-galera:
-  db:
-    user: sdnctl
-    # password:
-    externalSecret: *dbUserSecretName
-    name: &mysqlDbName nengdb
-  nameOverride: nengdb
-  service:
-    name: nengdb
-    portName: nengdbport
-  replicaCount: 1
-  mariadbOperator:
-    galera:
-      enabled: false
-
-  persistence:
-    enabled: true
-    mountSubPath: network-name-gen/data
-
 mariadb-init:
   config:
     userCredentialsExternalSecret: *dbUserSecretName
-    mysqlDatabase: *mysqlDbName
+    mysqlDatabase: nengdb
   nameOverride: nengdb-init
+  mariadb-galera:
+    nameOverride: *dbService
+    service:
+      internalPort: *dbPort
   serviceAccount:
     nameOverride: nengdb-init
 
@@ -153,4 +133,4 @@ podAnnotations:
 serviceAccount:
   nameOverride: network-name-gen
   roles:
-    - read
\ No newline at end of file
+    - read
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 1c7fa9eb0a..e6a12ab744 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -416,6 +416,7 @@ kafkaUser: *kafkaUser
 # dependency / sub-chart configuration
 network-name-gen:
   enabled: true
+
 mariadb-galera: &mariadbGalera
   nameOverride: &sdnc-db sdnc-db
   config: &mariadbGaleraConfig