From c51ef4f119899680906f73efa344a45eaabcb83a Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Thu, 19 Feb 2026 17:27:48 +0100 Subject: [PATCH] [SDC] 1.15.0 release - add tracing - fix healthcheck exception in sdc-fe logs - add configuration for publishing delete events for distribution Issue-ID: SDC-4785 Change-Id: Ie9cc4a812ef1b81dc3802f2ca4184c5a1dfb4082 Signed-off-by: Fiete Ostkamp --- .../distribution-engine-configuration.yaml | 7 +++++++ .../sdc/components/sdc-be/templates/deployment.yaml | 16 ++++++++++++++++ kubernetes/sdc/components/sdc-be/values.yaml | 4 ++-- .../components/sdc-cs/resources/config/execution.sh | 2 +- .../sdc-cs/resources/config/importconformance.sh | 20 -------------------- kubernetes/sdc/components/sdc-cs/values.yaml | 4 ++-- .../sdc/components/sdc-fe/templates/deployment.yaml | 16 ++++++++++++++++ kubernetes/sdc/components/sdc-fe/values.yaml | 2 +- .../sdc-onboarding-be/templates/deployment.yaml | 17 ++++++++++++++++- .../sdc/components/sdc-onboarding-be/values.yaml | 4 ++-- 10 files changed, 63 insertions(+), 29 deletions(-) delete mode 100644 kubernetes/sdc/components/sdc-cs/resources/config/importconformance.sh diff --git a/kubernetes/sdc/components/sdc-be/resources/config/catalog-be/distribution-engine-configuration.yaml b/kubernetes/sdc/components/sdc-be/resources/config/catalog-be/distribution-engine-configuration.yaml index f096b13fcc..f18bb7fb5d 100644 --- a/kubernetes/sdc/components/sdc-be/resources/config/catalog-be/distribution-engine-configuration.yaml +++ b/kubernetes/sdc/components/sdc-be/resources/config/catalog-be/distribution-engine-configuration.yaml @@ -38,6 +38,13 @@ distributionNotificationTopic: maxThreadPoolSize: 10 maxWaitingAfterSendingSeconds: 5 +distributionDeleteTopicName: {{ if .Values.distributionDeleteTopicName }}{{ .Values.distributionDeleteTopicName }}{{- else }}SDC-DISTR-DELETE-TOPIC{{- end }} + +distributionDeleteTopic: + minThreadPoolSize: 0 + maxThreadPoolSize: 10 + maxWaitingAfterSendingSeconds: 5 + createTopic: partitionCount: 1 replicationCount: 1 diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml index ad635a119d..196669aa2f 100644 --- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml +++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml @@ -123,6 +123,22 @@ spec: - name: USE_KAFKA value: {{ .Values.global.kafka.useKafka | quote }} {{- end }} + - name: OTEL_ENABLED + value: {{ .Values.global.tracing.enabled | quote }} + - name: OTEL_SERVICE_NAME + value: "sdc-be" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: "{{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }}" + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: "grpc" + - name: OTEL_TRACES_SAMPLER + value: "parentbased_traceidratio" + - name: OTEL_TRACES_SAMPLER_ARG + value: {{ .Values.global.tracing.sampling.probability | quote }} + - name: OTEL_LOGS_EXPORTER + value: "none" + - name: OTEL_METRICS_EXPORTER + value: "none" volumeMounts: - name: {{ include "common.fullname" . }}-jetty mountPath: /app/jetty diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml index 09a73fe830..611d4472a9 100644 --- a/kubernetes/sdc/components/sdc-be/values.yaml +++ b/kubernetes/sdc/components/sdc-be/values.yaml @@ -41,8 +41,8 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/sdc-backend-all-plugins:1.14.2 -backendInitImage: onap/sdc-backend-init:1.14.2 +image: onap/sdc-backend-all-plugins:1.15.0 +backendInitImage: onap/sdc-backend-init:1.15.0 pullPolicy: Always diff --git a/kubernetes/sdc/components/sdc-cs/resources/config/execution.sh b/kubernetes/sdc/components/sdc-cs/resources/config/execution.sh index 897a54c1ca..4cbc6ecd00 100644 --- a/kubernetes/sdc/components/sdc-cs/resources/config/execution.sh +++ b/kubernetes/sdc/components/sdc-cs/resources/config/execution.sh @@ -24,4 +24,4 @@ sed -i 's/java \(.*\) -cp/java \1 -Djava.io.tmpdir=\/tmp\/writable-config\/tmp - sh -x /tmp/writable-config/create-alter-dox-db.sh sh -x /tmp/writable-config/sdctool/scripts/schemaCreation.sh /tmp/writable-config/sdctool/config || exit sh -x /tmp/writable-config/sdctool/scripts/janusGraphSchemaCreation.sh /tmp/writable-config/sdctool/config || exit -sh -x /tmp/writable-config/importconformance.sh || exit \ No newline at end of file +sh -x /home/sdc/scripts/importconformance.sh /tmp/writable-config/sdctool || exit \ No newline at end of file diff --git a/kubernetes/sdc/components/sdc-cs/resources/config/importconformance.sh b/kubernetes/sdc/components/sdc-cs/resources/config/importconformance.sh deleted file mode 100644 index eecf033a9d..0000000000 --- a/kubernetes/sdc/components/sdc-cs/resources/config/importconformance.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# Set the working directory -working_directory="/tmp" - -# Extract the cl_release version -version="1.14.0" # Example version string; replace with actual value -cl_release=$(echo $version | cut -d. -f1-3 | cut -d- -f1) -printf "\033[33mcl_release=[$cl_release]\033[0m\n" - -# Execute the import-Conformance command -conf_dir="/tmp/writable-config/sdctool/config" -tosca_dir="/tmp/writable-config/sdctool/tosca" -cl_version=$(grep 'toscaConformanceLevel:' $conf_dir/configuration.yaml | awk '{print $2}') - -cd /tmp/writable-config/sdctool/scripts -chmod +x sdcSchemaFileImport.sh - -echo "execute /tmp/writable-config/sdctool/scripts/sdcSchemaFileImport.sh ${tosca_dir} ${cl_release} ${cl_version} ${conf_dir} onap" -./sdcSchemaFileImport.sh ${tosca_dir} ${cl_release} ${cl_version} ${conf_dir} onap diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml index 350ed6e3a7..5cf046e1da 100644 --- a/kubernetes/sdc/components/sdc-cs/values.yaml +++ b/kubernetes/sdc/components/sdc-cs/values.yaml @@ -112,8 +112,8 @@ janusgraph: # application image repository: nexus3.onap.org:10001 -image: onap/sdc-cassandra:1.14.2 -cassandraInitImage: onap/sdc-cassandra-init:1.14.2 +image: onap/sdc-cassandra:1.15.0 +cassandraInitImage: onap/sdc-cassandra-init:1.15.0 pullPolicy: Always config: diff --git a/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml index 7a15fffa17..8a74c67aa0 100644 --- a/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml +++ b/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml @@ -108,6 +108,22 @@ spec: fieldPath: status.podIP - name: JAVA_OPTIONS value: {{ .Values.config.javaOptions }} + - name: OTEL_ENABLED + value: {{ .Values.global.tracing.enabled | quote }} + - name: OTEL_SERVICE_NAME + value: "sdc-fe" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: "{{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }}" + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: "grpc" + - name: OTEL_TRACES_SAMPLER + value: "parentbased_traceidratio" + - name: OTEL_TRACES_SAMPLER_ARG + value: {{ .Values.global.tracing.sampling.probability | quote }} + - name: OTEL_LOGS_EXPORTER + value: "none" + - name: OTEL_METRICS_EXPORTER + value: "none" volumeMounts: - name: {{ include "common.fullname" . }}-jetty mountPath: /app/jetty diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml index 87c7c57c90..fdfe0e8fff 100644 --- a/kubernetes/sdc/components/sdc-fe/values.yaml +++ b/kubernetes/sdc/components/sdc-fe/values.yaml @@ -24,7 +24,7 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/sdc-frontend:1.14.2 +image: onap/sdc-frontend:1.15.0 pullPolicy: Always config: diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml index 90664a82b6..d1d2081cfb 100644 --- a/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml +++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml @@ -111,6 +111,22 @@ spec: secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: sdc_password} - name: SDC_CERT_DIR value: "" + - name: OTEL_ENABLED + value: {{ .Values.global.tracing.enabled | quote }} + - name: OTEL_SERVICE_NAME + value: "sdc-onboarding-be" + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: "{{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }}" + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: "grpc" + - name: OTEL_TRACES_SAMPLER + value: "parentbased_traceidratio" + - name: OTEL_TRACES_SAMPLER_ARG + value: {{ .Values.global.tracing.sampling.probability | quote }} + - name: OTEL_LOGS_EXPORTER + value: "none" + - name: OTEL_METRICS_EXPORTER + value: "none" volumeMounts: - name: {{ include "common.fullname" . }}-jetty mountPath: /app/jetty @@ -192,4 +208,3 @@ spec: emptyDir: sizeLimit: {{ .Values.volumes.jettySizeLimit }} {{- include "common.imagePullSecrets" . | nindent 6 }} - diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml index bec446f4ce..074de382a8 100644 --- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml +++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml @@ -36,8 +36,8 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/sdc-onboard-backend:1.14.2 -onboardingInitImage: onap/sdc-onboard-cassandra-init:1.14.2 +image: onap/sdc-onboard-backend:1.15.0 +onboardingInitImage: onap/sdc-onboard-cassandra-init:1.15.0 pullPolicy: Always # flag to enable debugging - application support required -- 2.16.6