From fd367e3e99637558ad49c1a838a6f77445b44354 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 19 Aug 2025 12:38:15 +0200 Subject: [PATCH] [SDC] 13.0.8 release - sdc-be, sdc-fe, sdc-cs, sdc-onboarding-be (1.14.1 -> 1.14.2) - sdc-helm-validator (1.3.2 -> 1.3.3) - sdc-wfd-fe, sdc-wfd-be (1.14.0 -> 1.14.1) - define service monitor for sdc-wfd-be and helm-validator to scrape prometheus metrics Issue-ID: SDC-4759 Change-Id: I3ba89ada2804939a18388058ce77c30a4abc882c Signed-off-by: Fiete Ostkamp --- kubernetes/sdc/Chart.yaml | 2 +- kubernetes/sdc/components/sdc-be/values.yaml | 4 ++-- kubernetes/sdc/components/sdc-cs/values.yaml | 4 ++-- kubernetes/sdc/components/sdc-fe/values.yaml | 2 +- .../sdc-helm-validator/templates/servicemonitor.yaml | 3 +++ kubernetes/sdc/components/sdc-helm-validator/values.yaml | 10 +++++++++- kubernetes/sdc/components/sdc-onboarding-be/values.yaml | 4 ++-- .../components/sdc-wfd-be/templates/servicemonitor.yaml | 3 +++ kubernetes/sdc/components/sdc-wfd-be/values.yaml | 14 +++++++++++--- kubernetes/sdc/components/sdc-wfd-fe/values.yaml | 2 +- 10 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 kubernetes/sdc/components/sdc-helm-validator/templates/servicemonitor.yaml create mode 100644 kubernetes/sdc/components/sdc-wfd-be/templates/servicemonitor.yaml diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml index 68ee222c8a..4ce1f5877a 100644 --- a/kubernetes/sdc/Chart.yaml +++ b/kubernetes/sdc/Chart.yaml @@ -19,7 +19,7 @@ apiVersion: v2 description: Service Design and Creation Umbrella Helm charts name: sdc -version: 13.0.7 +version: 13.0.8 dependencies: - name: common diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml index 2572b235de..ed2cd2bd14 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.1 -backendInitImage: onap/sdc-backend-init:1.14.1 +image: onap/sdc-backend-all-plugins:1.14.2 +backendInitImage: onap/sdc-backend-init:1.14.2 pullPolicy: Always diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml index e0a7acfb32..a249cba17f 100644 --- a/kubernetes/sdc/components/sdc-cs/values.yaml +++ b/kubernetes/sdc/components/sdc-cs/values.yaml @@ -113,8 +113,8 @@ janusgraph: # application image repository: nexus3.onap.org:10001 -image: onap/sdc-cassandra:1.14.1 -cassandraInitImage: onap/sdc-cassandra-init:1.14.1 +image: onap/sdc-cassandra:1.14.2 +cassandraInitImage: onap/sdc-cassandra-init:1.14.2 pullPolicy: Always config: diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml index 4c93bfd76a..87c7c57c90 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.1 +image: onap/sdc-frontend:1.14.2 pullPolicy: Always config: diff --git a/kubernetes/sdc/components/sdc-helm-validator/templates/servicemonitor.yaml b/kubernetes/sdc/components/sdc-helm-validator/templates/servicemonitor.yaml new file mode 100644 index 0000000000..c0d9f212b4 --- /dev/null +++ b/kubernetes/sdc/components/sdc-helm-validator/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/sdc/components/sdc-helm-validator/values.yaml b/kubernetes/sdc/components/sdc-helm-validator/values.yaml index 9e9aa105a6..048c928a29 100644 --- a/kubernetes/sdc/components/sdc-helm-validator/values.yaml +++ b/kubernetes/sdc/components/sdc-helm-validator/values.yaml @@ -29,7 +29,7 @@ global: sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) -image: onap/sdc-helm-validator:1.3.2 +image: onap/sdc-helm-validator:1.3.3 containerPort: &svc_port 8080 config: @@ -74,6 +74,14 @@ startup: failureThreshold: 12 port: *port +metrics: + serviceMonitor: + enabled: true + targetPort: *port + path: /actuator/prometheus + basicAuth: + enabled: false + flavor: small resources: small: diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml index 6a35c444e2..132af2acce 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.1 -onboardingInitImage: onap/sdc-onboard-cassandra-init:1.14.1 +image: onap/sdc-onboard-backend:1.14.2 +onboardingInitImage: onap/sdc-onboard-cassandra-init:1.14.2 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/servicemonitor.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/servicemonitor.yaml new file mode 100644 index 0000000000..c0d9f212b4 --- /dev/null +++ b/kubernetes/sdc/components/sdc-wfd-be/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/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml index 2fc67cbedb..7f447705bc 100644 --- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml +++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml @@ -46,8 +46,8 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/sdc-workflow-backend:1.14.0 -configInitImage: onap/sdc-workflow-init:1.14.0 +image: onap/sdc-workflow-backend:1.14.1 +configInitImage: onap/sdc-workflow-init:1.14.1 pullPolicy: Always initJob: @@ -119,9 +119,17 @@ service: internalPort: 8080 ports: - name: http - port: 8080 + port: &port 8080 nodePort: "57" +metrics: + serviceMonitor: + enabled: true + targetPort: *port + path: /actuator/prometheus + basicAuth: + enabled: false + ingress: enabled: false service: diff --git a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml index cbfc15c3c3..2f7c36ec32 100644 --- a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml +++ b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml @@ -24,7 +24,7 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/sdc-workflow-frontend:1.14.0 +image: onap/sdc-workflow-frontend:1.14.1 pullPolicy: Always # flag to enable debugging - application support required -- 2.16.6