From 89f3db6b3901d005a4f46304d78f3e230d448b02 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Sun, 17 Aug 2025 21:43:43 +0200 Subject: [PATCH] [SO] 16.1.0 release - so-cnf-adapter (1.13.0 -> 1.13.1) - cnfm-as-lcm (1.13.0 -> 1.13.1) - etsi-sol-003-adapter (1.9.1 -> 1.10.0) - etsi-sol-005-adapter (1.9.1 -> 1.10.0) - oof-adapter (1.10.1 -> 1.10.2) - nssmf-adapter (1.10.0 -> 1.11.0) - make metrics.serviceMonitor.basicAuth.enabled optional - remove all declarations of metrics.serviceMonitor.basicAuth.enabled: false Issue-ID: SO-4229 Change-Id: Ice75ab4dfcd37b51e645e0cae4dbffb43a163fd4 Signed-off-by: Fiete Ostkamp --- kubernetes/aai/components/aai-resources/values.yaml | 5 ----- kubernetes/aai/values.yaml | 2 -- .../cds/components/cds-command-executor/values.yaml | 5 ----- kubernetes/common/cassandra/values.yaml | 3 +-- kubernetes/common/common/templates/_serviceMonitor.tpl | 2 +- kubernetes/cps/components/cps-temporal/values.yaml | 2 +- .../sdc/components/sdc-helm-validator/values.yaml | 2 -- kubernetes/sdc/components/sdc-wfd-be/values.yaml | 2 -- kubernetes/so/Chart.yaml | 2 +- .../resources/config/overrides/override.yaml | 4 +++- .../so-cnf-adapter/templates/servicemonitor.yaml | 3 +++ kubernetes/so/components/so-cnf-adapter/values.yaml | 7 ++++++- .../resources/config/overrides/override.yaml | 14 ++++++++++++++ kubernetes/so/components/so-cnfm-lcm/values.yaml | 17 ++++++++++++++++- .../resources/config/overrides/override.yaml | 14 ++++++++++++++ .../so/components/so-etsi-sol003-adapter/values.yaml | 16 +++++++++++++++- .../so/components/so-etsi-sol005-adapter/values.yaml | 2 +- kubernetes/so/components/so-nssmf-adapter/values.yaml | 2 +- kubernetes/so/components/so-oof-adapter/values.yaml | 2 +- 19 files changed, 78 insertions(+), 28 deletions(-) create mode 100644 kubernetes/so/components/so-cnf-adapter/templates/servicemonitor.yaml diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml index cd4e61e0fe..838426ed35 100644 --- a/kubernetes/aai/components/aai-resources/values.yaml +++ b/kubernetes/aai/components/aai-resources/values.yaml @@ -348,11 +348,6 @@ metrics: serviceMonitor: targetPort: 8448 path: /actuator/prometheus - basicAuth: - enabled: false - externalSecretName: mysecretname - externalSecretUserKey: login - externalSecretPasswordKey: password ## Namespace in which Prometheus is running ## diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index b5796790ce..1490c8d986 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -418,8 +418,6 @@ metrics: enabled: true targetPort: 8448 path: /metrics - basicAuth: - enabled: false selector: app: '{{ include "common.name" . }}-metrics' diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml index 3c5255763f..1065f589ea 100755 --- a/kubernetes/cds/components/cds-command-executor/values.yaml +++ b/kubernetes/cds/components/cds-command-executor/values.yaml @@ -106,11 +106,6 @@ metrics: port: *metricsPortname internalPort: *metricsPort path: /actuator/prometheus - basicAuth: - enabled: false - externalSecretName: mysecretname - externalSecretUserKey: login - externalSecretPasswordKey: password selector: app: '{{ include "common.name" . }}' chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}' diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml index e88ee1ebc4..0aac1840f3 100644 --- a/kubernetes/common/cassandra/values.yaml +++ b/kubernetes/common/cassandra/values.yaml @@ -280,8 +280,7 @@ metrics: serviceMonitor: targetPort: 8080 path: /metrics - basicAuth: - enabled: false + ## Namespace in which Prometheus is running ## # namespace: monitoring diff --git a/kubernetes/common/common/templates/_serviceMonitor.tpl b/kubernetes/common/common/templates/_serviceMonitor.tpl index 752e9fbd2f..78b8d8c059 100644 --- a/kubernetes/common/common/templates/_serviceMonitor.tpl +++ b/kubernetes/common/common/templates/_serviceMonitor.tpl @@ -145,7 +145,7 @@ spec: insecureSkipVerify: true {{- end }} {{- end }} - {{- if $dot.Values.metrics.serviceMonitor.basicAuth.enabled }} + {{- if and $dot.Values.metrics.serviceMonitor.basicAuth $dot.Values.metrics.serviceMonitor.basicAuth.enabled }} basicAuth: username: key: {{ $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretUserKey }} diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml index d08b0b6447..2b005ce8ef 100644 --- a/kubernetes/cps/components/cps-temporal/values.yaml +++ b/kubernetes/cps/components/cps-temporal/values.yaml @@ -185,4 +185,4 @@ minReadySeconds: 10 updateStrategy: type: RollingUpdate maxUnavailable: 0 - maxSurge: 1 \ No newline at end of file + maxSurge: 1 diff --git a/kubernetes/sdc/components/sdc-helm-validator/values.yaml b/kubernetes/sdc/components/sdc-helm-validator/values.yaml index 048c928a29..f30835d2dd 100644 --- a/kubernetes/sdc/components/sdc-helm-validator/values.yaml +++ b/kubernetes/sdc/components/sdc-helm-validator/values.yaml @@ -79,8 +79,6 @@ metrics: enabled: true targetPort: *port path: /actuator/prometheus - basicAuth: - enabled: false flavor: small resources: diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml index fb00e16925..95916bab8f 100644 --- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml +++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml @@ -127,8 +127,6 @@ metrics: enabled: true targetPort: *port path: /actuator/prometheus - basicAuth: - enabled: false ingress: enabled: false diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml index 288a31b550..bc7844a10e 100755 --- a/kubernetes/so/Chart.yaml +++ b/kubernetes/so/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v2 description: ONAP Service Orchestrator name: so -version: 16.0.4 +version: 16.1.0 dependencies: - name: common diff --git a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml index 8054f86b41..bba368ce3e 100755 --- a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml @@ -35,7 +35,9 @@ spring: probability: {{ .Values.global.tracing.sampling.probability }} supports-join: false propagation: - type: w3c,bc + type: + - w3c + - b3 web: skip-pattern: {{ join "," .Values.tracing.ignorePatterns }} zipkin: diff --git a/kubernetes/so/components/so-cnf-adapter/templates/servicemonitor.yaml b/kubernetes/so/components/so-cnf-adapter/templates/servicemonitor.yaml new file mode 100644 index 0000000000..c0d9f212b4 --- /dev/null +++ b/kubernetes/so/components/so-cnf-adapter/templates/servicemonitor.yaml @@ -0,0 +1,3 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +{{ include "common.serviceMonitor" . }} +{{- end }} \ No newline at end of file diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml index 2ecde68c75..b73e33f403 100755 --- a/kubernetes/so/components/so-cnf-adapter/values.yaml +++ b/kubernetes/so/components/so-cnf-adapter/values.yaml @@ -74,7 +74,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/so-cnf-adapter:1.13.0 +image: onap/so/so-cnf-adapter:1.13.1 pullPolicy: Always readinessCheck: @@ -188,3 +188,8 @@ podAnnotations: proxy.istio.io/config: | tracing: sampling: 0 + +metrics: + serviceMonitor: + targetPort: *containerPort + path: /actuator/prometheus diff --git a/kubernetes/so/components/so-cnfm-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-cnfm-lcm/resources/config/overrides/override.yaml index 3d2f6c8449..b8720c61c3 100644 --- a/kubernetes/so/components/so-cnfm-lcm/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-cnfm-lcm/resources/config/overrides/override.yaml @@ -35,6 +35,20 @@ spring: driver-class-name: org.mariadb.jdbc.Driver pool-name: cnfm-pool registerMbeans: true + sleuth: + enabled: {{ .Values.global.tracing.enabled }} + trace-id128: true + sampler: + probability: {{ .Values.global.tracing.sampling.probability }} + supports-join: false + propagation: + type: + - w3c + - b3 + web: + skip-pattern: {{ join "," .Values.tracing.ignorePatterns }} + zipkin: + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} server: port: {{ .Values.containerPort }} tomcat: diff --git a/kubernetes/so/components/so-cnfm-lcm/values.yaml b/kubernetes/so/components/so-cnfm-lcm/values.yaml index fbb4274b0f..271717093b 100644 --- a/kubernetes/so/components/so-cnfm-lcm/values.yaml +++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml @@ -21,6 +21,17 @@ global: mariadbGalera: service: mariadb-galera servicePort: '3306' + tracing: + enabled: false + collector: + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 + sampling: + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) + ################################################################# # Secrets metaconfig @@ -42,7 +53,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/so-cnfm-as-lcm:1.13.0 +image: onap/so/so-cnfm-as-lcm:1.13.1 pullPolicy: Always aai: @@ -153,3 +164,7 @@ serviceAccount: nameOverride: so-cnfm-lcm roles: - read + +tracing: {} + # ignorePatterns: + # - "" diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml index 27af6f340d..900c051c05 100755 --- a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml @@ -28,6 +28,20 @@ spring: - username: mso_admin password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' role: ACTUATOR + sleuth: + enabled: {{ .Values.global.tracing.enabled }} + trace-id128: true + sampler: + probability: {{ .Values.global.tracing.sampling.probability }} + supports-join: false + propagation: + type: + - w3c + - b3 + web: + skip-pattern: {{ join "," .Values.tracing.ignorePatterns }} + zipkin: + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} server: {{- if include "common.onServiceMesh" . }} forward-headers-strategy: none diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml index 6d08ea1ba8..1f6d17706c 100755 --- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml +++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml @@ -24,11 +24,21 @@ global: aaf: auth: header: Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1Ngo= + tracing: + enabled: false + collector: + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 + sampling: + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/so-etsi-sol003-adapter:1.9.1 +image: onap/so/so-etsi-sol003-adapter:1.10.0 pullPolicy: Always aaf: @@ -132,3 +142,7 @@ serviceAccount: nameOverride: so-etsi-sol003-adapter roles: - read + +tracing: {} + # ignorePatterns: + # - "" diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml index cc81dacccc..f3d55c297b 100755 --- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml +++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml @@ -52,7 +52,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/so-etsi-sol005-adapter:1.9.1 +image: onap/so/so-etsi-sol005-adapter:1.10.0 pullPolicy: Always # Local mariadb galera instance default name diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml index fc26535d30..25390e1918 100755 --- a/kubernetes/so/components/so-nssmf-adapter/values.yaml +++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml @@ -71,7 +71,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/so-nssmf-adapter:1.10.0 +image: onap/so/so-nssmf-adapter:1.11.0 pullPolicy: Always # Local mariadb galera instance default name diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml index b205756263..7eff6c4f7d 100755 --- a/kubernetes/so/components/so-oof-adapter/values.yaml +++ b/kubernetes/so/components/so-oof-adapter/values.yaml @@ -67,7 +67,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/so-oof-adapter:1.10.1 +image: onap/so/so-oof-adapter:1.10.2 pullPolicy: Always # Local mariadb galera instance default name -- 2.16.6