aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@t-mobile.pl>2024-04-11 05:25:22 +0000
committerGerrit Code Review <gerrit@onap.org>2024-04-11 05:25:22 +0000
commit16d200e4f99dbad508156d936b9481bed051055b (patch)
treed735b2d1282d392eff914b5d11c622caec13e07e
parentbd892a7d0709d0807a009f648eb8fcf283f79ba9 (diff)
parent4b149053969ca20ac0d1cf14fe69bf0eeb042859 (diff)
Merge "[SDNC] Move dgbuilder and network-name-gen to SDNC"
-rw-r--r--kubernetes/sdnc/Chart.yaml11
-rw-r--r--kubernetes/sdnc/components/dgbuilder/.helmignore (renamed from kubernetes/common/dgbuilder/.helmignore)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/Chart.yaml (renamed from kubernetes/common/dgbuilder/Chart.yaml)6
-rw-r--r--kubernetes/sdnc/components/dgbuilder/resources/config/customSettings.js (renamed from kubernetes/common/dgbuilder/resources/config/customSettings.js)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/resources/config/svclogic.properties (renamed from kubernetes/common/dgbuilder/resources/config/svclogic.properties)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/templates/NOTES.txt (renamed from kubernetes/common/dgbuilder/templates/NOTES.txt)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/templates/configmap.yaml (renamed from kubernetes/common/dgbuilder/templates/configmap.yaml)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/templates/deployment.yaml (renamed from kubernetes/common/dgbuilder/templates/deployment.yaml)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/templates/ingress.yaml (renamed from kubernetes/common/dgbuilder/templates/ingress.yaml)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/templates/secrets.yaml (renamed from kubernetes/common/dgbuilder/templates/secrets.yaml)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/templates/service.yaml (renamed from kubernetes/common/dgbuilder/templates/service.yaml)0
-rw-r--r--kubernetes/sdnc/components/dgbuilder/values.yaml (renamed from kubernetes/common/dgbuilder/values.yaml)0
-rw-r--r--kubernetes/sdnc/components/network-name-gen/Chart.yaml (renamed from kubernetes/common/network-name-gen/Chart.yaml)11
-rw-r--r--kubernetes/sdnc/components/network-name-gen/resources/config/aai_keystore (renamed from kubernetes/common/network-name-gen/resources/config/aai_keystore)bin4929 -> 4929 bytes
-rw-r--r--kubernetes/sdnc/components/network-name-gen/templates/deployment.yaml (renamed from kubernetes/common/network-name-gen/templates/deployment.yaml)2
-rw-r--r--kubernetes/sdnc/components/network-name-gen/templates/secrets.yaml (renamed from kubernetes/common/network-name-gen/templates/secrets.yaml)0
-rw-r--r--kubernetes/sdnc/components/network-name-gen/templates/service.yaml (renamed from kubernetes/common/network-name-gen/templates/service.yaml)0
-rw-r--r--kubernetes/sdnc/components/network-name-gen/values.yaml (renamed from kubernetes/common/network-name-gen/values.yaml)36
-rw-r--r--kubernetes/sdnc/values.yaml1
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
Binary files differ
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