From: Fiete Ostkamp Date: Mon, 9 Feb 2026 16:06:52 +0000 (+0100) Subject: [SDNC] Use official elasticsearch helm chart X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=30e35469091375b1f3525865c12870fc071836b4;p=oom.git [SDNC] Use official elasticsearch helm chart - use official elasticsearch helm chart - this replaces the common/elasticsearch which is a copy of the bitnami elasticsearch chart - bump chart version to 16.0.1 Issue-ID: OOM-3381 Change-Id: If177f33a49696935313edf2ad206b711c5698dd2 Signed-off-by: Fiete Ostkamp --- diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml index 87654cbacc..ffdc63e086 100644 --- a/kubernetes/sdnc/Chart.yaml +++ b/kubernetes/sdnc/Chart.yaml @@ -18,7 +18,7 @@ apiVersion: v2 description: SDN Controller name: sdnc -version: 16.0.0 +version: 16.0.1 dependencies: - name: common @@ -47,8 +47,8 @@ dependencies: repository: '@local' condition: global.mariadbGalera.localCluster - name: elasticsearch - version: ~13.x-0 - repository: '@local' + version: 7.17.x + repository: https://helm.elastic.co condition: sdnc.elasticsearch.enabled,elasticsearch.enabled # conditions for sdnc-subcharts - name: ueb-listener diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh index a17b440e58..176e3daada 100755 --- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh +++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh @@ -34,7 +34,7 @@ SDNC_DB_DATABASE=${SDNC_DB_DATABASE} # Create tablespace and user account -/usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} "${SDNC_DB_EXTRA_PARAMETERS}" mysql <<-END +/usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} ${SDNC_DB_EXTRA_PARAMETERS} mysql <<-END CREATE DATABASE IF NOT EXISTS ${SDNC_DB_DATABASE}; CREATE USER IF NOT EXISTS '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; CREATE USER IF NOT EXISTS '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; @@ -47,12 +47,12 @@ END # load schema if [ -f ${ETC_DIR}/sdnctl.dump ] then - /usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} "${SDNC_DB_EXTRA_PARAMETERS}" ${SDNC_DB_DATABASE} < ${ETC_DIR}/sdnctl.dump + /usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} ${SDNC_DB_EXTRA_PARAMETERS} ${SDNC_DB_DATABASE} < ${ETC_DIR}/sdnctl.dump fi for datafile in ${ETC_DIR}/*.data.dump do - /usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} "${SDNC_DB_EXTRA_PARAMETERS}" ${SDNC_DB_DATABASE} < $datafile + /usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} ${SDNC_DB_EXTRA_PARAMETERS} ${SDNC_DB_DATABASE} < $datafile done # Create VNIs 100-199 diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml index 5f159193ed..a5c4896b70 100755 --- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml +++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml @@ -40,9 +40,7 @@ spec: - {{ include "common.mariadbService" . }} {{- else }} - --service-name - - {{.Values.elasticsearch.nameOverride}} - - --service-name - - {{.Values.elasticsearch.nameOverride}}-service + - {{ .Values.elasticsearch.service.name | default "sdnrdb" }} {{- end }} env: - name: NAMESPACE @@ -98,7 +96,7 @@ spec: {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnrdb-secret" "key" "login") | indent 12 }} - name: SDNRDBPASSWORD {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnrdb-secret" "key" "password") | indent 12 }} - {{- if ne (default "" .Values.global.ingress.provider) "istio" }} + {{- if ne ((.Values.global.ingress).provider | default "") "istio" }} - name: SDNC_DB_EXTRA_PARAMETERS value: "--skip-ssl-verify-server-cert" {{- end }} diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 8773abde9a..280d9f21c1 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -332,11 +332,9 @@ config: elasticsearch: ## for legacy eleasticsearch database enabled: &esdbenabled true - # enabled: &esdbenabled false mariadb: - ## for legacy eleasticsearch database + ## for mariadb database enabled: false - # enabled: true databaseName: sdnrdb user: sdnrdb externalSecret: *sdnrdbSecretName @@ -464,6 +462,8 @@ ueb-listener: <<: *mariadbGalera config: <<: *mariadbGaleraConfig + userName: *dbUser + userCredentialsExternalSecret: *dbSecretName mysqlDatabase: *sdncDbName nameOverride: sdnc-ueb-listener config: @@ -526,19 +526,42 @@ dgbuilder: localElasticCluster: true elasticsearch: enabled: *esdbenabled - nameOverride: &elasticSearchName sdnrdb - name: sdnrdb-cluster + clusterName: "sdnrdb-cluster" + nodeGroup: "master" + + # Service name must be "sdnrdb" for SDNC to connect + # The masterService parameter sets the name of the Service resource that the chart creates + masterService: "sdnrdb" + + # Replicas (was master.replicaCount) + replicas: 3 + minimumMasterNodes: 2 + + # Roles - nodes handle both master and data functionality + roles: + master: "true" + data: "true" + ingest: "true" + + # Service configuration + # These values are used by SDNC templates to build the connection URL service: - name: *elasticSearchName - master: - replicaCount: 3 - # dedicatednode: "yes" - # working as master node only, in this case increase replicaCount for elasticsearch-data - # dedicatednode: "no" - # handles master and data node functionality - dedicatednode: "no" - nameOverride: *elasticSearchName - cluster_name: sdnrdb-cluster + type: ClusterIP + name: "sdnrdb" + port: 9200 + + # Persistence + persistence: + enabled: true + + # Resources + resources: + requests: + cpu: "100m" + memory: "2Gi" + limits: + cpu: "1000m" + memory: "2Gi" # enable sdnc-web: diff --git a/requirements.txt b/requirements.txt index 24e6ca587d..46557ea9e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -sphinx>=4.2.0 # BSD +sphinx sphinx-rtd-theme>=1.0.0 # MIT doc8 docutils