[SO] 15.1.0 release

- bump images that were deployed in version 1.15.0 to 1.15.1
- deploy latest version of catalog-db-adapter (1.12.2 -> 1.15.1)
- deploy latest version of so-cnf-adapter (1.10.0 -> 1.12.1)
- define spring.application.name property for all services
- define tracing related config for services that support it now
- functionally the new 1.15.1 images include
  - an updated java 11 base image (11.0.18_10-jre-alpine -> 11.0.27_6-jre-alpine)
  - tracing is now supported

Issue-ID: SO-4151
Change-Id: I806bb4ed5d0d834aad50d87e7a914d99f5b748f5
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml
index 846b175..9fd867c 100755 (executable)
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -17,7 +17,7 @@
 apiVersion: v2
 description: ONAP Service Orchestrator
 name: so
-version: 15.0.1
+version: 15.1.0
 
 dependencies:
   - name: common
@@ -47,7 +47,7 @@ dependencies:
     version: ~15.x-0
     repository: 'file://components/so-bpmn-infra'
   - name: so-catalog-db-adapter
-    version: ~13.x-0
+    version: ~15.x-0
     repository: 'file://components/so-catalog-db-adapter'
     condition: so-catalog-db-adapter.enabled
   - name: so-cnf-adapter

diff --git a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
index 7657415..8bfb149 100644 (file)
--- a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
@@ -21,6 +21,8 @@ mso:
         url: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/infraActiveRequests/
         auth: Basic YnBlbDpwYXNzd29yZDEk
 spring:
+  application:
+    name: so-admin-cockpit
   main:
     allow-bean-definition-overriding: true
   security:

diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
index b379037..b151624 100755 (executable)
--- 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.0.0
+version: 15.1.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 cab991c..b659306 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -355,6 +355,8 @@ server:
   tomcat:
     max-threads: 50
 spring:
+  application:
+    name: so-bpmn-infra
   datasource:
     hikari:
       jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
@@ -389,6 +391,19 @@ 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: /actuator/health/*
+  zipkin:
+    base-url: {{ .Values.global.tracing.collector.baseUrl }}
 so:
   vnfm:
     adapter:

diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 044426a..a62895d 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -62,7 +62,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/bpmn-infra:1.15.0
+image: onap/so/bpmn-infra:1.15.1
 pullPolicy: Always
 
 kafkaUser:
@@ -211,3 +211,9 @@ serviceAccount:
 log:
   path: /var/log/onap
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+
+podAnnotations:
+  # disable istio-based tracing
+  proxy.istio.io/config: |
+    tracing:
+      sampling: 0

diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
index 04021f9..6f3baf4 100755 (executable)
--- 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: 13.0.0
+version: 15.1.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 d5a3aef..b797d1f 100755 (executable)
--- 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
@@ -31,6 +31,8 @@ mso:
   db:
     auth:  {{ .Values.mso.adapters.db.auth }}
 spring:
+  application:
+    name: so-catalog-db-adapter
   datasource:
     hikari:
       jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
@@ -49,6 +51,19 @@ 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: /actuator/health/*
+  zipkin:
+    base-url: {{ .Values.global.tracing.collector.baseUrl }}
 #Actuator
 management:
   context-path: /manage

diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index 85f7467..97768e6 100755 (executable)
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -56,7 +56,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/catalog-db-adapter:1.12.2
+image: onap/so/catalog-db-adapter:1.15.1
 pullPolicy: Always
 
 # Local mariadb galera instance default name
@@ -160,3 +160,9 @@ serviceAccount:
   nameOverride: so-catalog-db-adapter
   roles:
     - read
+
+podAnnotations:
+  # disable istio-based tracing
+  proxy.istio.io/config: |
+    tracing:
+      sampling: 0

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 a1a25be..ada2f78 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
@@ -21,6 +21,8 @@ aai:
 logging:
   path: logs
 spring:
+  application:
+    name: so-cnf-adapter
   security:
     usercredentials:
       - username: ${ACTUATOR_USERNAME}

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 25068f9..cfb8af3 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -63,7 +63,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/so-cnf-adapter:1.10.0
+image: onap/so/so-cnf-adapter:1.12.1
 pullPolicy: Always
 
 readinessCheck:

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 411b75f..3d2f6c8 100644 (file)
--- a/kubernetes/so/components/so-cnfm-lcm/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-cnfm-lcm/resources/config/overrides/override.yaml
@@ -17,6 +17,8 @@ aai:
   version: v24
   endpoint: http://aai.{{ include "common.namespace" . }}:80
 spring:
+  application:
+    name: so-cnfm-lcm
   datasource:
     hikari:
       camunda:

diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
index 40f97ad..b555d16 100644 (file)
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
@@ -19,6 +19,8 @@ aai:
   version: v19
   endpoint: http://aai.{{ include "common.namespace" . }}:80
 spring:
+  application:
+    name: so-etsi-nfvo-ns-lcm
   datasource:
     hikari:
       camunda:

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 04d973a..27af6f3 100755 (executable)
--- 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
@@ -18,6 +18,8 @@ aai:
   version: v15
   endpoint: http://aai.{{ include "common.namespace" . }}:80
 spring:
+  application:
+    name: so-etsi-sol003-adapter
   security:
     usercredentials:
     - username: vnfm

diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
index c4d28c4..d1e4773 100755 (executable)
--- a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
@@ -16,6 +16,8 @@
 logging:
   path: logs
 spring:
+  application:
+    name: so-etsi-sol005-adapter
   datasource:
     hikari:
        driver-class-name: org.mariadb.jdbc.Driver

diff --git a/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
index 633ac7d..7c63fd3 100755 (executable)
--- a/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
@@ -19,6 +19,8 @@ aai:
 logging:
   path: logs
 spring:
+  application:
+    name: so-nssmf-adapter
   datasource:
     jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
     username: ${DB_USERNAME}

diff --git a/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
index c58ba91..5f52f00 100755 (executable)
--- a/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
@@ -16,6 +16,8 @@
 logging:
   path: logs
 spring:
+  application:
+    name: so-oof-adapter
   security:
     usercredentials:
       - username: ${BPEL_USERNAME}

diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
index 4051b0b..55f7c15 100755 (executable)
--- 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.0.0
+version: 15.1.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
index 287c953..ad58d90 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -23,6 +23,8 @@ server:
   port: {{ index .Values.containerPort }}
 SW  port: {{ index .Values.containerPort }}
 spring:
+  application:
+    name: so-openstack-adapter
   datasource:
     hikari:
       jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
@@ -57,6 +59,19 @@ 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: /actuator/health/*
+  zipkin:
+    base-url: {{ .Values.global.tracing.collector.baseUrl }}
 org:
   onap:
     so:

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index ee2ceda..1d7e84f 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -54,7 +54,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/openstack-adapter:1.15.0
+image: onap/so/openstack-adapter:1.15.1
 pullPolicy: Always
 
 # Local mariadb galera instance default name
@@ -168,3 +168,9 @@ serviceAccount:
 log:
   path: /var/log/onap
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+
+podAnnotations:
+  # disable istio-based tracing
+  proxy.istio.io/config: |
+    tracing:
+      sampling: 0

diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
index 7ce7889..ea27c0c 100755 (executable)
--- 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.0.0
+version: 15.1.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 7ea7749..e6b2456 100755 (executable)
--- 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
@@ -30,6 +30,8 @@ mso:
       auth: {{ .Values.mso.adapters.requestDb.auth }}
       endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
 spring:
+  application:
+    name: so-request-db-adapter
   datasource:
     hikari:
       jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
@@ -48,6 +50,19 @@ 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: /actuator/health/*
+  zipkin:
+    base-url: {{ .Values.global.tracing.collector.baseUrl }}
 #Actuator
 management:
   context-path: /manage

diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index d6cad07..13a5bf0 100755 (executable)
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -54,7 +54,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/request-db-adapter:1.15.0
+image: onap/so/request-db-adapter:1.15.1
 pullPolicy: Always
 
 # Local mariadb galera instance default name
@@ -150,3 +150,9 @@ serviceAccount:
   nameOverride: so-request-db-adapter
   roles:
     - read
+
+podAnnotations:
+  # disable istio-based tracing
+  proxy.istio.io/config: |
+    tracing:
+      sampling: 0

diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml
index b710b37..fd0c157 100755 (executable)
--- 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.0.0
+version: 15.1.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
index 473b1c3..3d948d7 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
@@ -21,6 +21,8 @@ server:
   {{- end }}
   port: {{ index .Values.containerPort }}
 spring:
+  application:
+    name: so-sdc-controller
   datasource:
     hikari:
       jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
@@ -39,6 +41,19 @@ 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: /actuator/health/*
+  zipkin:
+    base-url: {{ .Values.global.tracing.collector.baseUrl }}
 request:
   datasource:
     hikari:

diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index e1c67ec..11aefec 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -55,7 +55,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/sdc-controller:1.15.0
+image: onap/so/sdc-controller:1.15.1
 pullPolicy: Always
 
 # Local mariadb galera instance default name
@@ -175,3 +175,9 @@ serviceAccount:
 log:
   path: /var/log/onap
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+
+podAnnotations:
+  # disable istio-based tracing
+  proxy.istio.io/config: |
+    tracing:
+      sampling: 0

diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
index a1c886c..6a391f1 100755 (executable)
--- 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.0.0
+version: 15.1.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
index 8c44ad7..4bbd7e7 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
@@ -188,6 +188,8 @@ org:
                 network:
                     encryptionKey: {{ index .Values.org.onap.so.adapters.sdnc.network.encryptionKey }}
 spring:
+  application:
+    name: so-sdnc-adapter
   security:
     usercredentials:
     -
@@ -214,3 +216,16 @@ 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: /actuator/health/*
+  zipkin:
+    base-url: {{ .Values.global.tracing.collector.baseUrl }}

diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index c228366..8427108 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -61,7 +61,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/sdnc-adapter:1.15.0
+image: onap/so/sdnc-adapter:1.15.1
 pullPolicy: Always
 
 org:
@@ -170,3 +170,9 @@ serviceAccount:
 log:
   path: /var/log/onap
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+
+podAnnotations:
+  # disable istio-based tracing
+  proxy.istio.io/config: |
+    tracing:
+      sampling: 0

diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml
index 47fc6d3..7e144f9 100755 (executable)
--- a/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -72,6 +72,8 @@ mso:
       - subsystem: catalogdb
         uri: http://so-catalog-db-adapter:8082
 spring:
+  application:
+    name: so-api-handler-infra
   datasource:
     hikari:
       jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 3aeec82..b35cae3 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -51,6 +51,12 @@ global:
     siteName: onapheat
     auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
     defaultCloudOwner: onap
+  tracing:
+    enabled: false
+    collector:
+      baseUrl: http://jaeger-collector.istio-config:9411
+    sampling:
+      probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
 
 readinessCheck:
   wait_for:
@@ -153,7 +159,7 @@ dbCreds:
   userName: so_user
   adminName: so_admin
 
-image: onap/so/api-handler-infra:1.15.0
+image: onap/so/api-handler-infra:1.15.1
 
 server:
   aai:
@@ -429,3 +435,9 @@ serviceAccount:
 #Log configuration
 log:
   path: /var/log/onap
+
+podAnnotations:
+  # disable istio-based tracing
+  proxy.istio.io/config: |
+    tracing:
+      sampling: 0