[SO] update cnf-adapter

- update cnf-adapter + cnfm-lcm (1.12.3 -> 1.13.0)
- this release brings tracing for the cnf-adapter service
- do not export traces for scheduled dns lookups and client checks
  in openstack-adapter and sdc-controller

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

diff --git a/kubernetes/so/components/so-cnf-adapter/Chart.yaml b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
index d386cb3..6c4e646 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
@@ -18,7 +18,7 @@ apiVersion: v2
 appVersion: "1.7.1"
 description: A Helm chart for Kubernetes
 name: so-cnf-adapter
-version: 15.0.0
+version: 15.0.1
 
 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 ada2f78..7065b45 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
@@ -28,6 +28,18 @@ spring:
       - username: ${ACTUATOR_USERNAME}
         password: ${ACTUATOR_PASSWORD}
         role: ACTUATOR
+  sleuth:
+    enabled: {{ .Values.global.tracing.enabled }}
+    trace-id128: true
+    sampler:
+      probability: {{ .Values.global.tracing.sampling.probability }}
+    supports-join: false
+    propagation:
+      type: w3c,bc
+    web:
+      skip-pattern: {{ join "," .Values.tracing.ignorePatterns }}
+  zipkin:
+    base-url: {{ .Values.global.tracing.collector.baseUrl }}
 server:
   {{- if include "common.onServiceMesh" . }}
   forward-headers-strategy: none

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 126f4d3..1f58de0 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -22,6 +22,13 @@ global:
     mountPath: /dockerdata-nfs
   aai:
     enabled: true
+  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%)
+
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -63,7 +70,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/so-cnf-adapter:1.12.3
+image: onap/so/so-cnf-adapter:1.13.0
 pullPolicy: Always
 
 readinessCheck:
@@ -167,3 +174,13 @@ serviceAccount:
   nameOverride: so-cnf-adapter
   roles:
     - read
+
+tracing: {}
+  # ignorePatterns:
+  #   - ""
+
+podAnnotations:
+  # disable istio-based tracing
+  proxy.istio.io/config: |
+    tracing:
+      sampling: 0

diff --git a/kubernetes/so/components/so-cnfm-lcm/values.yaml b/kubernetes/so/components/so-cnfm-lcm/values.yaml
index fa93ac6..fbb4274 100644 (file)
--- a/kubernetes/so/components/so-cnfm-lcm/values.yaml
+++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml
@@ -42,7 +42,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/so-cnfm-as-lcm:1.12.2
+image: onap/so/so-cnfm-as-lcm:1.13.0
 pullPolicy: Always
 
 aai:

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 caaff52..30b429d 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
@@ -69,7 +69,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 }}
 org:

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index bc5df35..648ac1f 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -182,3 +182,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/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
index c36b7cc..b349c89 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
@@ -51,7 +51,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 }}
 request:

diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index 7078ef4..77bd6ab 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -190,3 +190,12 @@ podAnnotations:
   proxy.istio.io/config: |
     tracing:
       sampling: 0
+
+tracing:
+  skipPatterns:
+    - /actuator/health/*
+  scheduled:
+    skipClasses:
+      - ScheduledDnsLookup
+      - ExternalTaskServiceUtils
+      - ASDCControllerSingleton