summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc/components
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-04-27 10:17:20 -0400
committerAndreas Geissler <andreas-geissler@telekom.de>2023-06-22 14:00:52 +0000
commitaad8e8a11961f5f225fa8a26881b3c1f3bd936ae (patch)
tree5f522ee8d528a3fbd6412d0672b96c660d8e9c84 /kubernetes/sdnc/components
parent1f5a0ae9d0fc40ab0906871d68c646cead2415ad (diff)
[SDNC] Bump SDNC and CCSDK versions for London release
Bump versions of SDNC and CCSDK docker images for London release, bump sdnc version to 2.5.2 to resolve gating issues bump sdnc version to 2.5.3 to add missing Bierman API karaf feature bump sdnc version to 2.5.5 to resolve HTTP PATCH issue ueb-listener to use sdc-distr-client 2.0.0 (kafka native) Use Strimzi KafkaUser template Issue-ID: CCSDK-3876 Issue-ID: CCSDK-1789 Issue-ID: CCSDK-3908 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I053058f09bad1f5d1578979134eed43eee1d76eb (cherry picked from commit c6144829d2c4ee22cbdb4591ed34557b83999bc2)
Diffstat (limited to 'kubernetes/sdnc/components')
-rw-r--r--kubernetes/sdnc/components/dmaap-listener/values.yaml2
-rw-r--r--kubernetes/sdnc/components/sdnc-ansible-server/values.yaml2
-rw-r--r--kubernetes/sdnc/components/sdnc-web/values.yaml2
-rw-r--r--kubernetes/sdnc/components/ueb-listener/resources/config/log4j2.xml25
-rw-r--r--kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties9
-rw-r--r--kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml8
-rw-r--r--kubernetes/sdnc/components/ueb-listener/templates/kafkauser.yaml16
-rw-r--r--kubernetes/sdnc/components/ueb-listener/values.yaml13
8 files changed, 69 insertions, 8 deletions
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index 7b7b327896..33d219b0fb 100644
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -49,7 +49,7 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-dmaap-listener-image:2.4.2
+image: onap/sdnc-dmaap-listener-image:2.5.5
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index 5cf7b9c528..5a9630537a 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -49,7 +49,7 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-ansible-server-image:2.4.2
+image: onap/sdnc-ansible-server-image:2.5.5
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index 391ef04d75..3c4874f6e8 100644
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -22,7 +22,7 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: "onap/sdnc-web-image:2.4.2"
+image: "onap/sdnc-web-image:2.5.5"
pullPolicy: Always
config:
diff --git a/kubernetes/sdnc/components/ueb-listener/resources/config/log4j2.xml b/kubernetes/sdnc/components/ueb-listener/resources/config/log4j2.xml
new file mode 100644
index 0000000000..d0c1f718b5
--- /dev/null
+++ b/kubernetes/sdnc/components/ueb-listener/resources/config/log4j2.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+ <Properties>
+ <Property name="logDir">$${env:LOGDIR:-logs}</Property>
+ </Properties>
+ <Appenders>
+ <RollingFile name="LOGFILE" fileName="${logDir}/ueb-listener.log"
+ filePattern="${logDir}/ueb-listener-%i.log">
+ <PatternLayout pattern="%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n" />
+ <Policies>
+ <SizeBasedTriggeringPolicy size="10 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="10"/>
+ </RollingFile>
+ <Console name="CONSOLE" target="SYSTEM_OUT">
+ <PatternLayout pattern="%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="INFO">
+ <AppenderRef ref="LOGFILE"/>
+ <AppenderRef ref="CONSOLE"/>
+ </Root>
+ </Loggers>
+</Configuration> \ No newline at end of file
diff --git a/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties b/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties
index d3e9798da1..e27ef36bee 100644
--- a/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties
+++ b/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties
@@ -1,7 +1,9 @@
-org.onap.ccsdk.sli.northbound.uebclient.asdc-address=sdc-be.{{.Release.Namespace}}:8080
+org.onap.ccsdk.sli.northbound.uebclient.sdc-address=sdc-be.{{.Release.Namespace}}:8080
org.onap.ccsdk.sli.northbound.uebclient.use-https=false
-org.onap.ccsdk.sli.northbound.uebclient.consumer-group=sdc-OpenSource-Env1-sdnc-dockero
-org.onap.ccsdk.sli.northbound.uebclient.consumer-id=sdc-COpenSource-Env11-sdnc-dockero
+{{- with (first .Values.kafkaUser.acls) }}
+org.onap.ccsdk.sli.northbound.uebclient.consumer-group={{ .name }}
+org.onap.ccsdk.sli.northbound.uebclient.consumer-id={{ .name }}-sdc-listener
+{{- end }}
org.onap.ccsdk.sli.northbound.uebclient.environment-name=AUTO
org.onap.ccsdk.sli.northbound.uebclient.password=${UEB_PASSWORD}
org.onap.ccsdk.sli.northbound.uebclient.user=${UEB_USER}
@@ -20,4 +22,3 @@ org.onap.ccsdk.sli.northbound.uebclient.keystore-path=
org.onap.ccsdk.sli.northbound.uebclient.keystore-password=
org.onap.ccsdk.sli.northbound.uebclient.xslt-path-list=/opt/onap/sdnc/ueb-listener/lib/normalizeTagNames.xslt,/opt/onap/sdnc/ueb-listener/lib/removeNs.xslt
org.onap.ccsdk.sli.northbound.uebclient.artifact-map=/opt/onap/sdnc/data/properties/artifact.map
-org.onap.ccsdk.sli.northbound.uebclient.msg-bus-address=message-router.{{.Release.Namespace}},message-router.{{.Release.Namespace}}
diff --git a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
index d5a4e7b2d7..9956e06cda 100644
--- a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
@@ -83,6 +83,11 @@ spec:
value: "{{ .Values.config.configDir }}"
- name: LOG4J_FORMAT_MSG_NO_LOOKUPS
value: "true"
+ - name: SASL_JAAS_CONFIG
+ valueFrom:
+ secretKeyRef:
+ name: {{ include "common.name" . }}-ku
+ key: sasl.jaas.config
volumeMounts:
- mountPath: /etc/localtime
name: localtime
@@ -93,6 +98,9 @@ spec:
- mountPath: {{ .Values.config.configDir }}/ueb-listener.properties
name: properties
subPath: ueb-listener.properties
+ - mountPath: {{ .Values.config.configDir }}/log4j2.xml
+ name: properties
+ subPath: log4j2.xml
resources: {{ include "common.resources" . | nindent 10 }}
ports: {{ include "common.containerPorts" . | nindent 10 }}
{{- if .Values.nodeSelector }}
diff --git a/kubernetes/sdnc/components/ueb-listener/templates/kafkauser.yaml b/kubernetes/sdnc/components/ueb-listener/templates/kafkauser.yaml
new file mode 100644
index 0000000000..6fc37c3d01
--- /dev/null
+++ b/kubernetes/sdnc/components/ueb-listener/templates/kafkauser.yaml
@@ -0,0 +1,16 @@
+{{/*
+# Copyright © 2023 Nordix Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+{{ include "common.kafkauser" . }}
diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml
index 493c684497..26654dc63d 100644
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -55,7 +55,7 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-ueb-listener-image:2.4.2
+image: onap/sdnc-ueb-listener-image:2.5.5
pullPolicy: Always
# flag to enable debugging - application support required
@@ -120,6 +120,17 @@ service:
- name: http
port: 80
+# Strimzi KafkaUser definition
+kafkaUser:
+ acls:
+ - name: sdnc
+ type: group
+ operations: [Read]
+ - name: SDC-DISTR
+ type: topic
+ patternType: prefix
+ operations: [Read, Write]
+
ingress:
enabled: false