Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[DMAAP] Introduce drprov-client
[oom.git]
/
kubernetes
/
dcaegen2-services
/
components
/
dcae-datafile-collector
/
values.yaml
diff --git
a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index
1cc450d
..
26bbd37
100644
(file)
--- a/
kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/
kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@
-3,6
+3,7
@@
# Copyright (c) 2021 Nordix Foundation.
# Copyright (c) 2022 Nokia. All rights reserved.
# Copyright (c) 2022-2023 J. F. Lucas. All rights reserved.
# Copyright (c) 2021 Nordix Foundation.
# Copyright (c) 2022 Nokia. All rights reserved.
# Copyright (c) 2022-2023 J. F. Lucas. All rights reserved.
+# Copyright (c) 2023 Deutsche Telekom AG. All rights reserved.
# =========================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# =========================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-51,7
+52,7
@@
certPostProcessorImage: onap/org.onap.oom.platform.cert-service.oom-certservice-
# Application Configuration Defaults.
#################################################################
# Application Image
# Application Configuration Defaults.
#################################################################
# Application Image
-image: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.
9
.0
+image: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.
10
.0
pullPolicy: Always
# Log directory where logging sidecar should look for log files
pullPolicy: Always
# Log directory where logging sidecar should look for log files
@@
-88,11
+89,12
@@
certificates:
create: true
# Dependencies
create: true
# Dependencies
+# Waiting for dmaap-dr-node (which depends on dmaap-dr-prov)
+# to be sure that we can provision the DR feed that's needed
readinessCheck:
wait_for:
containers:
readinessCheck:
wait_for:
containers:
- - dmaap-bc
- - dmaap-provisioning-job
+ - dmaap-dr-node
- message-router
# Probe Configuration
- message-router
# Probe Configuration
@@
-124,6
+126,14
@@
ingress:
config:
ssl: "redirect"
config:
ssl: "redirect"
+serviceMesh:
+ authorizationPolicy:
+ authorizedPrincipals:
+ - serviceAccount: dcae-pm-mapper-read
+ - serviceAccount: message-router-read
+ - serviceAccount: istio-ingress
+ namespace: istio-ingress
+
# Data Router Publisher Credentials
drPubscriberCreds:
username: username
# Data Router Publisher Credentials
drPubscriberCreds:
username: username
@@
-157,10
+167,10
@@
applicationConfig:
streams_publishes:
PM_MEAS_FILES:
dmaap_info:
streams_publishes:
PM_MEAS_FILES:
dmaap_info:
- publisher_id:
${DR_FILES_PUBLISHER_ID_0}
+ publisher_id:
"dummy_id"
location: loc00
location: loc00
- log_url: ${DR_
LOG_
URL_0}
- publish_url: ${DR_F
ILES_PUBLISHER_
URL_0}
+ log_url: ${DR_
FEED_LOG
URL_0}
+ publish_url: ${DR_F
EED_PUB
URL_0}
username: ${DR_USERNAME}
password: ${DR_PASSWORD}
type: data_router
username: ${DR_USERNAME}
password: ${DR_PASSWORD}
type: data_router
@@
-178,24
+188,17
@@
applicationEnv:
# DataRouter Feed Configuration
drFeedConfig:
- feedName: bulk_pm_feed
# DataRouter Feed Configuration
drFeedConfig:
- feedName: bulk_pm_feed
- owner: dcaecm
feedVersion: "0.0"
feedVersion: "0.0"
-
asprC
lassification: unclassified
+
c
lassification: unclassified
feedDescription: DFC Feed Creation
feedDescription: DFC Feed Creation
-
-# DataRouter Publisher Configuration
-drPubConfig:
- - feedName: bulk_pm_feed
- username: ${DR_USERNAME}
- userpwd: ${DR_PASSWORD}
- dcaeLocationName: loc00
+ publisher:
+ username: ${DR_USERNAME}
+ password: ${DR_PASSWORD}
# ConfigMap Configuration for Feed, Dr_Publisher
volumes:
- name: feeds-config
path: /opt/app/config/feeds
# ConfigMap Configuration for Feed, Dr_Publisher
volumes:
- name: feeds-config
path: /opt/app/config/feeds
- - name: drpub-config
- path: /opt/app/config/dr_pubs
# Resource Limit Flavor -By Default Using Small
flavor: small
# Resource Limit Flavor -By Default Using Small
flavor: small
@@
-204,18
+207,18
@@
flavor: small
resources:
small:
limits:
resources:
small:
limits:
- cpu:
1
+ cpu:
999
memory: 1Gi
requests:
memory: 1Gi
requests:
- cpu:
500m
- memory:
768M
i
+ cpu:
1
+ memory:
1G
i
large:
limits:
large:
limits:
- cpu:
2
+ cpu:
999
memory: 2Gi
requests:
memory: 2Gi
requests:
- cpu:
1
- memory:
1
Gi
+ cpu:
2
+ memory:
2
Gi
unlimited: {}
#Pods Service Account
unlimited: {}
#Pods Service Account