From 2f38164c1dfecae72b2632e2f1dee82454bd522c Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Wed, 25 Jun 2025 15:23:10 +0200 Subject: [PATCH] [SO] 16.0.3 release - update images of SO main repo (1.15.4 -> 1.15.5) - support tracing for so-api-handler-infra - make root log level configurable for so-api-handler-infra - skip tracing for scheduled dns lookups and active client checks - skip request status logging for /manage liveness endpoint (thus greatly reducing the log volume produced in debug log level) - disable rbac for this release (not working in this release, will be fixed in the next one) [0] [0] Since there is no role specific resource in the SO, there is currently effectively no difference between enabled or disabled anyways Issue-ID: SO-4184 Change-Id: I22c43356614f983090eec112ecc017ad843f2d54 Signed-off-by: Fiete Ostkamp --- kubernetes/so/Chart.yaml | 2 +- kubernetes/so/components/so-bpmn-infra/Chart.yaml | 2 +- .../resources/config/overrides/override.yaml | 1 + .../components/so-bpmn-infra/templates/configmap.yaml | 3 ++- kubernetes/so/components/so-bpmn-infra/values.yaml | 7 +++++-- .../so/components/so-catalog-db-adapter/Chart.yaml | 2 +- .../resources/config/overrides/override.yaml | 9 ++++++++- .../so-catalog-db-adapter/templates/configmap.yaml | 10 ++++++---- .../so/components/so-catalog-db-adapter/values.yaml | 19 ++++++++++++++++++- .../so/components/so-openstack-adapter/Chart.yaml | 2 +- .../so/components/so-openstack-adapter/values.yaml | 2 +- .../so/components/so-request-db-adapter/Chart.yaml | 2 +- .../resources/config/overrides/override.yaml | 9 ++++++++- .../so-request-db-adapter/templates/configmap.yaml | 2 ++ .../so/components/so-request-db-adapter/values.yaml | 19 ++++++++++++++++++- kubernetes/so/components/so-sdc-controller/Chart.yaml | 2 +- .../so/components/so-sdc-controller/values.yaml | 2 +- kubernetes/so/components/so-sdnc-adapter/Chart.yaml | 2 +- kubernetes/so/components/so-sdnc-adapter/values.yaml | 2 +- .../resources/config/log/logback.apihandler-infra.xml | 2 +- .../so/resources/config/overrides/override.yaml | 16 ++++++++++++++++ kubernetes/so/templates/configmap.yaml | 2 ++ kubernetes/so/values.yaml | 16 +++++++++++++++- 23 files changed, 112 insertions(+), 23 deletions(-) diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml index dac67ddd11..3745facd53 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.2 +version: 16.0.3 dependencies: - name: common diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml index 2ed1abc90e..9ffe352d61 100755 --- a/kubernetes/so/components/so-bpmn-infra/Chart.yaml +++ b/kubernetes/so/components/so-bpmn-infra/Chart.yaml @@ -18,7 +18,7 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for SO Bpmn Infra name: so-bpmn-infra -version: 15.1.1 +version: 15.2.0 dependencies: - name: common diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml index b659306ea6..01b3259479 100755 --- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml @@ -366,6 +366,7 @@ spring: pool-name: bpmn-pool registerMbeans: true security: + rbacEnabled: {{ .Values.global.so.auth.rbacEnabled }} usercredentials: - username: apihBpmn diff --git a/kubernetes/so/components/so-bpmn-infra/templates/configmap.yaml b/kubernetes/so/components/so-bpmn-infra/templates/configmap.yaml index 954f8e8b0f..6cb6b8c512 100755 --- a/kubernetes/so/components/so-bpmn-infra/templates/configmap.yaml +++ b/kubernetes/so/components/so-bpmn-infra/templates/configmap.yaml @@ -26,7 +26,9 @@ metadata: data: LOG_PATH: {{ index .Values.logPath }} APP: {{ index .Values.app }} + {{- if .Values.global.so.auth.enabled }} ACTIVE_PROFILE: "basic" + {{- end }} --- apiVersion: v1 kind: ConfigMap @@ -48,4 +50,3 @@ metadata: namespace: {{ include "common.namespace" . }} data: {{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }} - diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index 1cab8f9c29..f1b19842ae 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -34,7 +34,10 @@ global: baseUrl: http://jaeger-collector.istio-config:9411 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) - + so: + auth: + enabled: true + rbacEnabled: false readinessCheck: wait_for: @@ -69,7 +72,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/bpmn-infra:1.15.4 +image: onap/so/bpmn-infra:1.15.5 pullPolicy: Always kafkaUser: diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml index 784193818c..9f7883f54b 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 description: A Helm chart for so-catalog-db-adapter name: so-catalog-db-adapter -version: 15.1.1 +version: 15.2.0 dependencies: - name: common diff --git a/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml index b797d1f15e..b13fbeb3c7 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml @@ -42,6 +42,7 @@ spring: pool-name: catdb-pool registerMbeans: true security: + rbacEnabled: {{ .Values.global.so.auth.rbacEnabled }} usercredentials: - username: bpel @@ -61,7 +62,9 @@ spring: probability: {{ .Values.global.tracing.sampling.probability }} supports-join: false web: - skip-pattern: /actuator/health/* + skip-pattern: {{ join "," .Values.tracing.skipPatterns }} + scheduled: + skip-pattern: .*({{ join "|" .Values.tracing.scheduled.skipClasses }}) zipkin: base-url: {{ .Values.global.tracing.collector.baseUrl }} #Actuator @@ -117,3 +120,7 @@ cloud_config: clli: "{{ .Values.config.openStackRegion }}" aic_version: "2.5" identity_service_id: "DEFAULT_KEYSTONE" + +logging: + request-status: + exclusions: {{ join "," .Values.logging.requestStatus.excludedPatterns }} diff --git a/kubernetes/so/components/so-catalog-db-adapter/templates/configmap.yaml b/kubernetes/so/components/so-catalog-db-adapter/templates/configmap.yaml index c334fd7699..4f526c0e5b 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/templates/configmap.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/templates/configmap.yaml @@ -14,10 +14,6 @@ # limitations under the License. */}} apiVersion: v1 -data: - LOG_PATH: {{ index .Values.logPath }} - APP: {{ index .Values.app }} - ACTIVE_PROFILE: "basic" kind: ConfigMap metadata: name: {{ include "common.fullname" . }}-configmap @@ -27,6 +23,12 @@ metadata: chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} heritage: {{ .Release.Service }} +data: + LOG_PATH: {{ index .Values.logPath }} + APP: {{ index .Values.app }} + {{- if .Values.global.so.auth.enabled }} + ACTIVE_PROFILE: "basic" + {{- end }} --- apiVersion: v1 kind: ConfigMap diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml index c13b7b035f..3a5b3d631b 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml @@ -30,6 +30,10 @@ global: baseUrl: http://jaeger-collector.istio-config:9411 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) + so: + auth: + enabled: true + rbacEnabled: false readinessCheck: wait_for: @@ -62,7 +66,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/catalog-db-adapter:1.15.4 +image: onap/so/catalog-db-adapter:1.15.5 pullPolicy: Always # Local mariadb galera instance default name @@ -103,6 +107,11 @@ updateStrategy: maxUnavailable: 1 maxSurge: 1 +logging: + requestStatus: + excludedPatterns: + - /manage/** + ################################################################# # soHelpers part ################################################################# @@ -172,3 +181,11 @@ podAnnotations: proxy.istio.io/config: | tracing: sampling: 0 + +tracing: + skipPatterns: + - /actuator/health/* + scheduled: + skipClasses: + - ScheduledDnsLookup + - ExternalTaskServiceUtils diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml index 4324d1be32..43fe471abe 100755 --- a/kubernetes/so/components/so-openstack-adapter/Chart.yaml +++ b/kubernetes/so/components/so-openstack-adapter/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-openstack-adapter -version: 15.1.1 +version: 15.2.0 dependencies: - name: common diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml index e21142433e..9234fec2f3 100755 --- a/kubernetes/so/components/so-openstack-adapter/values.yaml +++ b/kubernetes/so/components/so-openstack-adapter/values.yaml @@ -61,7 +61,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/openstack-adapter:1.15.4 +image: onap/so/openstack-adapter:1.15.5 pullPolicy: Always # Local mariadb galera instance default name diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml index c7178fdd74..9e03210b67 100755 --- a/kubernetes/so/components/so-request-db-adapter/Chart.yaml +++ b/kubernetes/so/components/so-request-db-adapter/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 description: A Helm chart for request-db-adapter name: so-request-db-adapter -version: 15.1.1 +version: 15.2.0 dependencies: - name: common diff --git a/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml index e6b2456f19..844db44004 100755 --- a/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml @@ -41,6 +41,7 @@ spring: pool-name: reqdb-pool registerMbeans: true security: + rbacEnabled: {{ .Values.global.so.auth.rbacEnabled }} usercredentials: - username: bpel @@ -60,9 +61,15 @@ spring: probability: {{ .Values.global.tracing.sampling.probability }} supports-join: false web: - skip-pattern: /actuator/health/* + skip-pattern: {{ join "," .Values.tracing.skipPatterns }} + scheduled: + skip-pattern: .*({{ join "|" .Values.tracing.scheduled.skipClasses }}) zipkin: base-url: {{ .Values.global.tracing.collector.baseUrl }} #Actuator management: context-path: /manage + +logging: + request-status: + exclusions: {{ join "," .Values.logging.requestStatus.excludedPatterns }} diff --git a/kubernetes/so/components/so-request-db-adapter/templates/configmap.yaml b/kubernetes/so/components/so-request-db-adapter/templates/configmap.yaml index 3be605edf2..4f526c0e5b 100755 --- a/kubernetes/so/components/so-request-db-adapter/templates/configmap.yaml +++ b/kubernetes/so/components/so-request-db-adapter/templates/configmap.yaml @@ -26,7 +26,9 @@ metadata: data: LOG_PATH: {{ index .Values.logPath }} APP: {{ index .Values.app }} + {{- if .Values.global.so.auth.enabled }} ACTIVE_PROFILE: "basic" + {{- end }} --- apiVersion: v1 kind: ConfigMap diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml index 9143bc7190..7dfeb407e9 100755 --- a/kubernetes/so/components/so-request-db-adapter/values.yaml +++ b/kubernetes/so/components/so-request-db-adapter/values.yaml @@ -30,6 +30,10 @@ global: baseUrl: http://jaeger-collector.istio-config:9411 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) + so: + auth: + enabled: true + rbacEnabled: false readinessCheck: wait_for: @@ -60,7 +64,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/request-db-adapter:1.15.4 +image: onap/so/request-db-adapter:1.15.5 pullPolicy: Always # Local mariadb galera instance default name @@ -101,6 +105,11 @@ updateStrategy: maxUnavailable: 1 maxSurge: 1 +logging: + requestStatus: + excludedPatterns: + - /manage/** + ################################################################# # soHelpers part ################################################################# @@ -162,3 +171,11 @@ podAnnotations: proxy.istio.io/config: | tracing: sampling: 0 + +tracing: + skipPatterns: + - /actuator/health/* + scheduled: + skipClasses: + - ScheduledDnsLookup + - ExternalTaskServiceUtils diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml index bec23d0fc9..df3031291f 100755 --- a/kubernetes/so/components/so-sdc-controller/Chart.yaml +++ b/kubernetes/so/components/so-sdc-controller/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-sdc-controller -version: 15.1.1 +version: 15.2.0 dependencies: - name: common diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml index 33af0a72b8..cf17ee48bb 100755 --- a/kubernetes/so/components/so-sdc-controller/values.yaml +++ b/kubernetes/so/components/so-sdc-controller/values.yaml @@ -64,7 +64,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/sdc-controller:1.15.4 +image: onap/so/sdc-controller:1.15.5 pullPolicy: Always # Local mariadb galera instance default name diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml index ce72fe4523..bffb50c64a 100755 --- a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-sdnc-adapter -version: 15.1.1 +version: 15.2.0 dependencies: - name: common diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml index ea8dbf6c91..c19be96c4b 100755 --- a/kubernetes/so/components/so-sdnc-adapter/values.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml @@ -67,7 +67,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/sdnc-adapter:1.15.4 +image: onap/so/sdnc-adapter:1.15.5 pullPolicy: Always org: diff --git a/kubernetes/so/resources/config/log/logback.apihandler-infra.xml b/kubernetes/so/resources/config/log/logback.apihandler-infra.xml index 6221c11477..494813fd84 100755 --- a/kubernetes/so/resources/config/log/logback.apihandler-infra.xml +++ b/kubernetes/so/resources/config/log/logback.apihandler-infra.xml @@ -130,7 +130,7 @@ - + diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml index 7e144f9827..819557fbcc 100755 --- a/kubernetes/so/resources/config/overrides/override.yaml +++ b/kubernetes/so/resources/config/overrides/override.yaml @@ -85,6 +85,7 @@ spring: jersey: type: filter security: + rbacEnabled: {{ .Values.global.so.auth.rbacEnabled }} usercredentials: - username: sitecontrol @@ -110,6 +111,21 @@ spring: username: mso_admin password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' role: ACTUATOR + sleuth: + enabled: {{ .Values.global.tracing.enabled }} + messaging: + jms: + enabled: false + trace-id128: true + sampler: + probability: {{ .Values.global.tracing.sampling.probability }} + supports-join: false + web: + skip-pattern: {{ join "," .Values.tracing.skipPatterns }} + scheduled: + skip-pattern: .*({{ join "|" .Values.tracing.scheduled.skipClasses }}) + zipkin: + base-url: {{ .Values.global.tracing.collector.baseUrl }} request: datasource: hikari: diff --git a/kubernetes/so/templates/configmap.yaml b/kubernetes/so/templates/configmap.yaml index 052a985387..0c66ed4abf 100755 --- a/kubernetes/so/templates/configmap.yaml +++ b/kubernetes/so/templates/configmap.yaml @@ -26,7 +26,9 @@ metadata: data: LOG_PATH: {{ index .Values.logPath }} APP: {{ index .Values.app }} + {{- if .Values.global.so.auth.enabled }} ACTIVE_PROFILE: "basic" + {{- end }} --- apiVersion: v1 kind: ConfigMap diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index ea702f9707..ef6ecebd41 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -57,6 +57,10 @@ global: baseUrl: http://jaeger-collector.istio-config:9411 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) + so: + auth: + enabled: true + rbacEnabled: false readinessCheck: wait_for: @@ -159,7 +163,7 @@ dbCreds: userName: so_user adminName: so_admin -image: onap/so/api-handler-infra:1.15.4 +image: onap/so/api-handler-infra:1.15.5 server: aai: @@ -435,9 +439,19 @@ serviceAccount: #Log configuration log: path: /var/log/onap + level: + root: DEBUG podAnnotations: # disable istio-based tracing proxy.istio.io/config: | tracing: sampling: 0 + +tracing: + skipPatterns: + - /actuator/health/* + scheduled: + skipClasses: + - ScheduledDnsLookup + - ExternalTaskServiceUtils -- 2.16.6