summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2-services/components
diff options
context:
space:
mode:
authorajay_dp001 <ajay.deep.singh@est.tech>2021-11-02 20:42:12 +0530
committerajay_dp001 <ajay.deep.singh@est.tech>2022-01-31 16:28:17 +0000
commite9b1e32bbdcb5338d7f98825bafefd23a4afebdd (patch)
treed99aec05d79e6f112c3c6851689be3f756f49dbe /kubernetes/dcaegen2-services/components
parent0eec968ce240c0f029de5c3d3f8b3e8037ee74ce (diff)
[OOM] Avoid duplicate DrPublisher creation via DCAE
- Username/Password passed as k8s Secret while dr_pub creation. Issue-ID: DCAEGEN2-2861 Signed-off-by: ajay_dp001 <ajay.deep.singh@est.tech> Change-Id: Ib767c8a17e2d7edabf4a9952ac7277d8062c7988
Diffstat (limited to 'kubernetes/dcaegen2-services/components')
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml19
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml31
2 files changed, 47 insertions, 3 deletions
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml
new file mode 100644
index 0000000000..13a14a5e12
--- /dev/null
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml
@@ -0,0 +1,19 @@
+{{/*
+################################################################################
+# Copyright (c) 2022 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.secretFast" . }} \ No newline at end of file
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index 7408f44416..2ce6c89775 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -1,6 +1,6 @@
# ================================ LICENSE_START ==========================
# =========================================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (c) 2021 Nordix Foundation.
# =========================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,6 +31,16 @@ filebeatConfig:
logstashPort: 5044
#################################################################
+# Secrets Configuration.
+#################################################################
+secrets:
+ - uid: &drPubCredsUID drpubcreds
+ type: basicAuth
+ login: '{{ .Values.drPubscriberCreds.username }}'
+ password: '{{ .Values.drPubscriberCreds.password }}'
+ passwordPolicy: required
+
+#################################################################
# InitContainer Images.
#################################################################
tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
@@ -116,6 +126,19 @@ applicationEnv:
# It's a workaround because DMAAP specific env variables are not available in main container.
CBS_CLIENT_CONFIG_PATH: ''
+# Data Router Publisher Credentials
+drPubscriberCreds:
+ username: username
+ password: password
+
+credentials:
+- name: DR_USERNAME
+ uid: *drPubCredsUID
+ key: login
+- name: DR_PASSWORD
+ uid: *drPubCredsUID
+ key: password
+
# Initial Application Configuration
applicationConfig:
dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.p12
@@ -139,8 +162,8 @@ applicationConfig:
location: loc00
log_url: ${DR_LOG_URL_0}
publish_url: ${DR_FILES_PUBLISHER_URL_0}
- username: ${DR_USERNAME_0}
- password: ${DR_PASSWORD_0}
+ username: ${DR_USERNAME}
+ password: ${DR_PASSWORD}
type: data_router
streams_subscribes:
dmaap_subscriber:
@@ -159,6 +182,8 @@ drFeedConfig:
# DataRouter Publisher Configuration
drPubConfig:
- feedName: bulk_pm_feed
+ username: ${DR_USERNAME}
+ userpwd: ${DR_PASSWORD}
dcaeLocationName: loc00
# ConfigMap Configuration for Feed, Dr_Publisher