[DCAEGEN2] Remove Consul loader init container

[oom.git] / kubernetes / dcaegen2-services / components / dcae-pm-mapper / values.yaml

diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
index 4fba10d..d206270 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
@@ -1,6 +1,8 @@
 # ================================ LICENSE_START ==========================
 # =========================================================================
 #  Copyright (C) 2021 Nordix Foundation.
+#  Copyright (c) 2022 Nokia.  All rights reserved.
+#  Copyright (c) 2022 J. F. Lucas. 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.
@@ -21,6 +23,7 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
+  centralizedLoggingEnabled: true
 
 #################################################################
 # Filebeat Configuration Defaults.
@@ -48,18 +51,20 @@ secrets:
 # InitContainer Images.
 #################################################################
 tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
-consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.1.0
 
 #################################################################
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.pm-mapper:1.6.0
+image: onap/org.onap.dcaegen2.services.pm-mapper:1.8.0
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
-# if absent, no sidecar will be deployed
-logDirectory: /var/log/ONAP/dcaegen2/services/pm-mapper
+# if path is set to null sidecar won't be deployed in spite of
+# global.centralizedLoggingEnabled setting.
+log:
+  path: /var/log/ONAP/dcaegen2/services/pm-mapper
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
 # Directory where TLS certs should be stored
 # if absent, no certs will be retrieved and stored
@@ -74,7 +79,6 @@ tlsServer: true
 readinessCheck:
   wait_for:
     containers:
-      - dcae-config-binding-service
       - aaf-cm
       - dmaap-bc
       - dmaap-provisioning-job
@@ -127,14 +131,14 @@ credentials:
 # Initial Application Configuration
 applicationConfig:
   enable_tls: true
-  enable_http: false
-  aaf_identity: ${AAF_IDENTITY}
-  aaf_password: ${AAF_PASSWORD}
+  enable_http: true
+  aaf_identity: ""
+  aaf_password: ""
   pm-mapper-filter: "{ \"filters\":[] }"
-  key_store_path: /opt/app/pm-mapper/etc/cert/cert.jks
-  key_store_pass_path: /opt/app/pm-mapper/etc/cert/jks.pass
-  trust_store_path: /opt/app/pm-mapper/etc/cert/trust.jks
-  trust_store_pass_path: /opt/app/pm-mapper/etc/cert/trust.pass
+  key_store_path: ""
+  key_store_pass_path: ""
+  trust_store_path: ""
+  trust_store_pass_path: ""
   dmaap_dr_delete_endpoint: https://dmaap-dr-node:8443/delete
   streams_publishes:
     dmaap_publisher:
@@ -143,7 +147,7 @@ applicationConfig:
         client_id: ${MR_FILES_PUBLISHER_CLIENT_ID_0}
         location: san-francisco
         client_role: org.onap.dcae.pmPublisher
-        topic_url: http://message-router:3904/events/org.onap.dmaap.mr.PERFORMANCE_MEASUREMENTS
+        topic_url: http://message-router:3904/events/unauthenticated.PERFORMANCE_MEASUREMENTS
   streams_subscribes:
     dmaap_subscriber:
       type: data_router
@@ -160,7 +164,7 @@ applicationConfig:
 drFeedConfig:
   - feedName: bulk_pm_feed
     owner: dcaecm
-    feedVersion: 0.0
+    feedVersion: "0.0"
     asprClassification: unclassified
     feedDescription: DFC Feed Creation
 
@@ -215,4 +219,10 @@ resources:
     requests:
       cpu: 2
       memory: 2Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: dcae-pm-mapper
+  roles:
+    - read