[DCAE] DCAEGEN2-Services Service Mesh Patch

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

diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
index 4bdd2b8..7f30654 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 #  Copyright (C) 2021 Nordix Foundation.
+#  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.
@@ -51,13 +52,12 @@ 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.pmsh:1.3.2
+image: onap/org.onap.dcaegen2.services.pmsh:2.2.2
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -74,14 +74,13 @@ certDirectory: /opt/app/pmsh/etc/certs
 # 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:
-    - dcae-config-binding-service
-    - aaf-cm
     - &postgresName dcae-pmsh-postgres
+    - message-router
 
 # Probe Configuration
 readiness:
@@ -89,16 +88,17 @@ readiness:
   periodSeconds: 15
   timeoutSeconds: 1
   path: /healthcheck
-  scheme: HTTPS
-  port: 8443
+  scheme: HTTP
+  port: 8080
 
 # Service Configuration
 service:
   type: ClusterIP
   name: dcae-pmsh
   ports:
-    - name: https
-      port: 8443
+    - name: http
+      port: 8080
+      plain_port: 8080
       port_protocol: http
 
 # AAF Credentials
@@ -116,7 +116,7 @@ credentials:
 
 # Initial Application Configuration
 applicationConfig:
-  enable_tls: true
+  enable_tls: false
   aaf_identity: ${AAF_IDENTITY}
   aaf_password: ${AAF_PASSWORD}
   key_path: /opt/app/pmsh/etc/certs/key.pem
@@ -136,16 +136,16 @@ applicationConfig:
     policy_pm_publisher:
       type: message_router
       dmaap_info:
-        topic_url: "https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT"
+        topic_url: "http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT"
   streams_subscribes:
     policy_pm_subscriber:
       type: message_router
       dmaap_info:
-        topic_url: "https://message-router:3905/events/unauthenticated.PMSH_CL_INPUT"
+        topic_url: "http://message-router:3904/events/unauthenticated.PMSH_CL_INPUT"
     aai_subscriber:
       type: message_router
       dmaap_info:
-        topic_url: "https://message-router:3905/events/AAI-EVENT"
+        topic_url: "http://message-router:3904/events/AAI-EVENT"
 
 applicationEnv:
   PMSH_PG_URL: &dcaePmshPgPrimary dcae-pmsh-pg-primary
@@ -155,6 +155,7 @@ applicationEnv:
   PMSH_PG_PASSWORD:
      secretUid: *pgUserCredsSecretUid
      key: password
+  PMSH_API_PORT: '8080'
 
 # Resource Limit Flavor -By Default Using Small
 flavor: small