From: Dan Timoney Date: Tue, 9 Dec 2025 18:45:18 +0000 (-0500) Subject: [SDNC] Update SDNC versions for Quebec X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d781f0e00832297e3ac528138265bfb92cc12bce;p=oom.git [SDNC] Update SDNC versions for Quebec Update SDNC image versions for Quebec release Issue-ID: SDNC-1858 Change-Id: I60d1bb8b26809b2227bcaf1e3e76892d62902edc Signed-off-by: Dan Timoney --- diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml index 9db50f6595..af3af2e951 100644 --- a/kubernetes/a1policymanagement/values.yaml +++ b/kubernetes/a1policymanagement/values.yaml @@ -41,7 +41,7 @@ secrets: password: '{{ .Values.a1controller.password }}' passwordPolicy: required -image: onap/ccsdk-oran-a1policymanagementservice:2.1.0 +image: onap/ccsdk-oran-a1policymanagementservice:2.2.0 userID: 1000 #Should match with image-defined user ID groupID: 999 #Should match with image-defined group ID mainUserId: 1000 #Should match with image-defined user ID diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml index ffdc63e086..3f7045a9ab 100644 --- a/kubernetes/sdnc/Chart.yaml +++ b/kubernetes/sdnc/Chart.yaml @@ -46,10 +46,15 @@ dependencies: version: ~16.x-0 repository: '@local' condition: global.mariadbGalera.localCluster - - name: elasticsearch - version: 7.17.x - repository: https://helm.elastic.co - condition: sdnc.elasticsearch.enabled,elasticsearch.enabled + ## + # Elasticsearch does not currently work. Commenting out + # so that it cannot be accidentally enabled. + # To be fixed in a future release. + # - name: elasticsearch + # version: ~13.x-0 + # repository: '@local' + # condition: sdnc.elasticsearch.enabled,elasticsearch.enabled + ## # conditions for sdnc-subcharts - name: ueb-listener version: ~15.x-0 diff --git a/kubernetes/sdnc/components/dgbuilder/values.yaml b/kubernetes/sdnc/components/dgbuilder/values.yaml index 8a30652a25..1caa94d5eb 100644 --- a/kubernetes/sdnc/components/dgbuilder/values.yaml +++ b/kubernetes/sdnc/components/dgbuilder/values.yaml @@ -69,7 +69,7 @@ secrets: # Application configuration defaults. ################################################################# # application image -image: onap/ccsdk-dgbuilder-image:2.1.0 +image: onap/ccsdk-dgbuilder-image:2.2.0 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml index d64310f99a..ac6d925a21 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml @@ -51,7 +51,7 @@ secrets: # Application configuration defaults. ################################################################# # application image -image: onap/sdnc-ansible-server-image:3.1.0 +image: onap/sdnc-ansible-server-image:3.2.3 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml index 5655dcc191..8103b73eb0 100644 --- a/kubernetes/sdnc/components/sdnc-web/values.yaml +++ b/kubernetes/sdnc/components/sdnc-web/values.yaml @@ -22,7 +22,7 @@ global: # Application configuration defaults. ################################################################# # application image -image: "onap/sdnc-web-image:3.1.0" +image: "onap/sdnc-web-image:3.2.3" pullPolicy: Always config: diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml index eb9f6d9cf1..09f73e7c3a 100644 --- a/kubernetes/sdnc/components/ueb-listener/values.yaml +++ b/kubernetes/sdnc/components/ueb-listener/values.yaml @@ -57,7 +57,7 @@ secrets: # Application configuration defaults. ################################################################# # application image -image: onap/sdnc-ueb-listener-image:3.1.0 +image: onap/sdnc-ueb-listener-image:3.2.3 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml index a5c4896b70..149d8ef0d8 100755 --- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml +++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml @@ -35,13 +35,17 @@ spec: initContainers: - name: {{ include "common.name" . }}-readiness args: - {{- if .Values.config.sdnr.mariadb.enabled }} + # At the moment only mariadb is supported here, + # updated config to always act as if mariadb is enabled + # {{- if .Values.config.sdnr.mariadb.enabled }} - --service-name - {{ include "common.mariadbService" . }} - {{- else }} - - --service-name - - {{ .Values.elasticsearch.service.name | default "sdnrdb" }} - {{- end }} + # {{- else }} + # - --service-name + # - {{.Values.elasticsearch.nameOverride}} + # - --service-name + # - {{.Values.elasticsearch.nameOverride}}-service + #{{- end }} env: - name: NAMESPACE valueFrom: @@ -65,9 +69,9 @@ spec: args: - -c - | - {{- if .Values.config.sdnr.mariadb.enabled }} + # {{- if .Values.config.sdnr.mariadb.enabled }} "{{ .Values.config.binDir }}/createSdnrDb.sh"; - {{- end }} + # {{- end }} sleep 90; "{{ .Values.config.binDir }}/startODL.sh" env: - name: SDNC_AAF_ENABLED @@ -81,7 +85,7 @@ spec: ## start sdnrdb parameter - name: SDNRINIT value: "true" - {{- if .Values.config.sdnr.mariadb.enabled }} + # {{- if .Values.config.sdnr.mariadb.enabled }} - name: SDNRDBTYPE value: MARIADB - name: MYSQL_HOST @@ -100,18 +104,18 @@ spec: - name: SDNC_DB_EXTRA_PARAMETERS value: "--skip-ssl-verify-server-cert" {{- end }} - {{- else }} - - name: SDNRDBURL - value: "http://{{ .Values.elasticsearch.service.name | default "sdnrdb"}}.{{.Release.Namespace}}:{{.Values.elasticsearch.service.port | default "9200"}}" - - name: SDNRDBPARAMETER - value: "-k" - {{- end }} - {{- if .Values.config.sdnr.mariadb.enabled }} + # {{- else }} + # - name: SDNRDBURL + # value: "http://{{ .Values.elasticsearch.service.name | default "sdnrdb"}}.{{.Release.Namespace}}:{{.Values.elasticsearch.service.port | default "9200"}}" + # - name: SDNRDBPARAMETER + # value: "-k" + # {{- end }} + # {{- if .Values.config.sdnr.mariadb.enabled }} volumeMounts: - mountPath: {{ .Values.config.binDir }}/createSdnrDb.sh name: bin subPath: createSdnrDb.sh - {{- end }} + # {{- end }} resources: {{ include "common.resources" . | nindent 10 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }} diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 1e60c6ff07..20f53cccec 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -301,7 +301,7 @@ spec: {{- end }} - name: SDNRONLY value: "{{ .Values.config.sdnr.sdnronly | default "false" }}" - {{- if .Values.config.sdnr.mariadb.enabled }} + # {{- if .Values.config.sdnr.mariadb.enabled }} - name: SDNRCONTROLLERID value: {{ uuidv4 }} - name: SDNRDBTYPE @@ -318,14 +318,14 @@ spec: value: {{ .Values.config.sdnr.mariadb.asyncHandling | default "false" | quote }} - name: SDNR_ASYNC_POOLSIZE value: {{ .Values.config.sdnr.mariadb.asyncPoolSize | default 200 | quote }} - {{- else }} - - name: SDNRDBURL - value: "http://{{ .Values.elasticsearch.service.name | default "sdnrdb"}}.{{.Release.Namespace}}:{{.Values.elasticsearch.service.port | default "9200"}}" - {{- if .Values.config.sdnr.sdnrdbTrustAllCerts }} - - name: SDNRDBTRUSTALLCERTS - value: "true" - {{- end }} - {{- end }} + # {{- else }} + # - name: SDNRDBURL + # value: "http://{{ .Values.elasticsearch.service.name | default "sdnrdb"}}.{{.Release.Namespace}}:{{.Values.elasticsearch.service.port | default "9200"}}" + # {{- if .Values.config.sdnr.sdnrdbTrustAllCerts }} + # - name: SDNRDBTRUSTALLCERTS + # value: "true" + # {{- end }} + # {{- end }} {{- if .Values.global.cmpv2Enabled }} - name: ODL_CERT_DIR value: {{ (mustFirst (.Values.certificates)).mountPath }} @@ -368,6 +368,14 @@ spec: - name: SDNR_KAFKA_SASL_JASS_CONFIG value: "{{ .Values.config.sdnr.kafka.saslJassConfig | default "PLAIN" }}" {{ end }} + - name: OTEL_ENABLED + value: {{ .Values.global.tracing.enabled | quote }} + - name: OTEL_SERVICE_NAME + value: "sdnc" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: "{{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }}" + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: "grpc" volumeMounts: diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 280d9f21c1..017a3e7575 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -34,6 +34,12 @@ global: nameOverride: &mariadbName mariadb-galera # (optional) if localCluster=false and an external secret is used set this variable #userRootSecret: + tracing: + enabled: false + collector: + baseUrl: http://jaeger-collector.istio-config + port: + otlpGrpc: 4317 ################################################################# @@ -216,7 +222,7 @@ certificates: # application images pullPolicy: Always -image: onap/sdnc-image:3.1.0 +image: onap/sdnc-image:3.2.3 # flag to enable debugging - application support required debugEnabled: false @@ -331,10 +337,12 @@ config: sdnrdbTrustAllCerts: true elasticsearch: ## for legacy eleasticsearch database - enabled: &esdbenabled true + # enabled: &esdbenabled true + enabled: &esdbenabled false mariadb: - ## for mariadb database - enabled: false + ## for legacy eleasticsearch database + # enabled: false + enabled: true databaseName: sdnrdb user: sdnrdb externalSecret: *sdnrdbSecretName