From 9a51e07a2164c9be42d9d329559f4d2081b8f3fc Mon Sep 17 00:00:00 2001 From: mpriyank Date: Thu, 22 Sep 2022 10:25:37 +0100 Subject: [PATCH] [CPS] OOM updates for CPS Repos - CPS-Core : Added NCMP tag in properties and updated container image from 3.0.1 to 3.1.4 - Fixed env variable missing in cps-core - Added missing kafka topics(ncmp-events and ncmp-async-m2m) - NCMP-DMI-PLUGIN: update container image from 1.1.0 to 1.2.1 - CPS-TEMPORAL: update container image from 1.1.0 to 1.2.0 Issue-ID: CPS-1290 Issue-ID: CPS-1343 Change-Id: Id5b4b6cfac9ddabe2421300e37f10185cee71ed3 Signed-off-by: mpriyank --- .../cps-core/resources/config/application-helm.yml | 9 +++++---- .../components/cps-core/templates/deployment.yaml | 18 ++++++++++++++++++ kubernetes/cps/components/cps-core/values.yaml | 4 ++-- kubernetes/cps/components/cps-temporal/values.yaml | 2 +- .../cps/components/ncmp-dmi-plugin/values.yaml | 2 +- kubernetes/cps/templates/cps-kafka-topic.yaml | 20 ++++++++++++++++++++ kubernetes/cps/templates/cps-kafka-user.yaml | 16 ++++++++++++++++ kubernetes/cps/values.yaml | 10 ++++++++++ 8 files changed, 73 insertions(+), 8 deletions(-) diff --git a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml index e295a37b45..f9bb230161 100644 --- a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml +++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml @@ -48,10 +48,11 @@ logging: org: springframework: {{ .Values.logging.level }} -dmi: - auth: - username: ${DMI_USERNAME} - password: ${DMI_PASSWORD} +ncmp: + dmi: + auth: + username: ${DMI_USERNAME} + password: ${DMI_PASSWORD} {{- if .Values.config.useStrimziKafka }} spring.kafka.bootstrap-servers: {{ include "common.release" . }}-{{ .Values.config.kafkaBootstrap }}:9092 diff --git a/kubernetes/cps/components/cps-core/templates/deployment.yaml b/kubernetes/cps/components/cps-core/templates/deployment.yaml index a247f148a7..1b482f405c 100644 --- a/kubernetes/cps/components/cps-core/templates/deployment.yaml +++ b/kubernetes/cps/components/cps-core/templates/deployment.yaml @@ -97,6 +97,24 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: {{ .Values.config.spring.profile }} + - name: DB_USERNAME + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 12 }} + - name: DB_PASSWORD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 12 }} + - name: LIQUIBASE_LABELS + value: {{ .Values.config.liquibaseLabels }} + - name: CPS_USERNAME + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "app-user-creds" "key" "login") | indent 12 }} + - name: CPS_PASSWORD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "app-user-creds" "key" "password") | indent 12 }} + - name: DMI_USERNAME + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "dmi-plugin-user-creds" "key" "login") | indent 12 }} + - name: DMI_PASSWORD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "dmi-plugin-user-creds" "key" "password") | indent 12 }} + {{- if .Values.config.useStrimziKafka }} + - name: JAASLOGIN + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-kafka-user" "key" "sasl.jaas.config") | indent 12 }} + {{- end }} resources: {{ include "common.resources" . | nindent 10 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | nindent 12 }} diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml index 5a10b2f4ae..d2bee113ba 100644 --- a/kubernetes/cps/components/cps-core/values.yaml +++ b/kubernetes/cps/components/cps-core/values.yaml @@ -75,7 +75,7 @@ global: container: name: postgres -image: onap/cps-and-ncmp:3.0.1 +image: onap/cps-and-ncmp:3.1.4 containerPort: &svc_port 8080 managementPort: &mgt_port 8081 @@ -208,7 +208,7 @@ config: notification.data-updated.filters.enabled-dataspaces: "" notification.async.enabled: false notification.async.executor.core-pool-size: 2 - notification.async.executor.max-pool-size: 1 + notification.async.executor.max-pool-size: 10 notification.async.executor.queue-capacity: 500 notification.async.executor.wait-for-tasks-to-complete-on-shutdown: true notification.async.executor.thread-name-prefix: Async- diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml index a92791e019..af9306aa25 100644 --- a/kubernetes/cps/components/cps-temporal/values.yaml +++ b/kubernetes/cps/components/cps-temporal/values.yaml @@ -48,7 +48,7 @@ secrets: value: '{{ .Values.config.someConfig }}' policy: generate -image: onap/cps-temporal:1.1.0 +image: onap/cps-temporal:1.2.0 containerPort: &svc_port 8080 managementPort: &mgt_port 8081 diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml index 0edb648327..1971273ddf 100644 --- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml +++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml @@ -47,7 +47,7 @@ global: virtualhost: baseurl: "simpledemo.onap.org" -image: onap/ncmp-dmi-plugin:1.1.0 +image: onap/ncmp-dmi-plugin:1.2.1 containerPort: &svc_port 8080 managementPort: &mgt_port 8081 diff --git a/kubernetes/cps/templates/cps-kafka-topic.yaml b/kubernetes/cps/templates/cps-kafka-topic.yaml index 1a23ddfc9b..b4ecfcd9c4 100644 --- a/kubernetes/cps/templates/cps-kafka-topic.yaml +++ b/kubernetes/cps/templates/cps-kafka-topic.yaml @@ -25,4 +25,24 @@ spec: config: retention.ms: {{ .Values.config.dataUpdatedTopic.retentionMs }} segment.bytes: {{ .Values.config.dataUpdatedTopic.segmentBytes }} +--- +apiVersion: kafka.strimzi.io/v1beta2 +kind: KafkaTopic +metadata: + name: {{ .Values.config.ncmpEventsTopic.name }} + labels: + strimzi.io/cluster: {{ include "common.release" . }}-strimzi +spec: + config: + retention.ms: {{ .Values.config.ncmpEventsTopic.retentionMs }} +--- +apiVersion: kafka.strimzi.io/v1beta2 +kind: KafkaTopic +metadata: + name: {{ .Values.config.ncmpAsyncM2MTopic.name }} + labels: + strimzi.io/cluster: {{ include "common.release" . }}-strimzi +spec: + config: + retention.ms: {{ .Values.config.ncmpAsyncM2MTopic.retentionMs }} {{- end }} \ No newline at end of file diff --git a/kubernetes/cps/templates/cps-kafka-user.yaml b/kubernetes/cps/templates/cps-kafka-user.yaml index b3136d7f04..fafc8c3369 100644 --- a/kubernetes/cps/templates/cps-kafka-user.yaml +++ b/kubernetes/cps/templates/cps-kafka-user.yaml @@ -38,4 +38,20 @@ spec: type: topic name: {{ .Values.config.dataUpdatedTopic.name }} operation: Write + - resource: + type: group + name: {{ .Values.config.ncmpEventsTopic.consumer.groupId }} + operation: All + - resource: + type: topic + name: {{ .Values.config.ncmpEventsTopic.name }} + operation: All + - resource: + type: group + name: {{ .Values.config.ncmpAsyncM2MTopic.consumer.groupId }} + operation: All + - resource: + type: topic + name: {{ .Values.config.ncmpAsyncM2MTopic.name }} + operation: All {{- end }} \ No newline at end of file diff --git a/kubernetes/cps/values.yaml b/kubernetes/cps/values.yaml index 700ad38844..f3e6198ac1 100755 --- a/kubernetes/cps/values.yaml +++ b/kubernetes/cps/values.yaml @@ -55,6 +55,16 @@ config: segmentBytes: 1073741824 consumer: groupId: cps-temporal-group + ncmpEventsTopic: + name: ncmp-events + retentionMs: 7200000 + consumer: + groupId: ncmp-group + ncmpAsyncM2MTopic: + name: ncmp-async-m2m + retentionMs: 600000 + consumer: + groupId: ncmp-group # Enable all CPS components by default cps-core: -- 2.16.6