X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2-services%2Fcomponents%2Fdcae-pm-mapper%2Fvalues.yaml;h=da4c6386239987819578b4d4956d3b64a7d63db0;hb=5a7fbeed35622045afb31de494cb42e83f85821b;hp=0dff427f49c6a0313413d52b0e73711053f7fbe6;hpb=971fac5ee071235248d6bc02dca1df55ac652dae;p=oom.git

diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
index 0dff427f49..da4c638623 100644
--- 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.1
 
 #################################################################
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.pm-mapper:1.7.2
+image: onap/org.onap.dcaegen2.services.pm-mapper:1.9.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
@@ -68,17 +73,16 @@ certDirectory: /opt/app/pm-mapper/etc/cert
 # TLS role -- set to true if microservice acts as server
 # If true, an init container will retrieve a server cert
 # and key from AAF and mount them in certDirectory.
-tlsServer: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
     containers:
-      - dcae-config-binding-service
-      - aaf-cm
       - dmaap-bc
       - dmaap-provisioning-job
       - dcae-datafile-collector
+      - message-router
 
 # Probe Configuration
 readiness:
@@ -86,8 +90,8 @@ readiness:
   periodSeconds: 15
   timeoutSeconds: 1
   path: /healthcheck
-  scheme: HTTPS
-  port: 8443
+  scheme: HTTP
+  port: 8081
 
 # Service Configuration
 service:
@@ -95,7 +99,7 @@ service:
   name: dcae-pm-mapper
   both_tls_and_plain: true
   ports:
-    - name: https
+    - name: http
       port: 8443
       plain_port: 8081
       port_protocol: http
@@ -126,16 +130,16 @@ credentials:
 
 # Initial Application Configuration
 applicationConfig:
-  enable_tls: true
-  enable_http: false
-  aaf_identity: ${AAF_IDENTITY}
-  aaf_password: ${AAF_PASSWORD}
+  enable_tls: false
+  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
-  dmaap_dr_delete_endpoint: https://dmaap-dr-node:8443/delete
+  dmaap_dr_delete_endpoint: http://dmaap-dr-node:8080/delete
   streams_publishes:
     dmaap_publisher:
       type: message_router
@@ -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
@@ -154,13 +158,13 @@ applicationConfig:
         username: ${DR_USERNAME}
         password: ${DR_PASSWORD}
         location: san-francisco
-        delivery_url: https://dcae-pm-mapper:8443/delivery
+        delivery_url: http://dcae-pm-mapper:8081/delivery
 
 # DataRouter Feed Configuration
 drFeedConfig:
   - feedName: bulk_pm_feed
     owner: dcaecm
-    feedVersion: 0.0
+    feedVersion: "0.0"
     asprClassification: unclassified
     feedDescription: DFC Feed Creation
 
@@ -172,20 +176,7 @@ drSubConfig:
     userpwd: ${DR_PASSWORD}
     dcaeLocationName: loc00
     privilegedSubscriber: true
-    deliveryURL: https://dcae-pm-mapper:8443/delivery
-
-# MessageRouter Topic, Publisher Configuration
-mrTopicsConfig:
-  - topicName: PERFORMANCE_MEASUREMENTS
-    topicDescription: PM Mapper publishes perf3gpp VES PM Events to authenticated MR topic
-    owner: dcaecm
-    tnxEnabled: false
-    clients:
-      - dcaeLocationName: san-francisco
-        clientRole: org.onap.dcae.pmPublisher
-        action:
-          - pub
-          - view
+    deliveryURL: http://dcae-pm-mapper:8081/delivery
 
 # ConfigMap Configuration for Dr Feed, Subscriber, MR Topics
 volumes:
@@ -193,8 +184,6 @@ volumes:
     path: /opt/app/config/feeds
   - name: drsub-config
     path: /opt/app/config/dr_subs
-  - name: topics-config
-    path: /opt/app/config/topics
 
 # Resource Limit Flavor -By Default Using Small
 flavor: small
@@ -216,3 +205,9 @@ resources:
       cpu: 2
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: dcae-pm-mapper
+  roles:
+    - read