X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2-services%2Fcomponents%2Fdcae-son-handler%2Fvalues.yaml;h=5e16967203a0854abd3bc0d29aee4e934dbcdf92;hb=refs%2Fheads%2Fmaster;hp=66731578e3013170a2dc85467ab4a34e9d8aeb6c;hpb=d577b9b05a10227f07247517ba30b9b8aaff1cd8;p=oom.git

diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index 66731578e3..5e16967203 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -1,7 +1,8 @@
 # ============= LICENSE_START ================================================
 # ============================================================================
 # Copyright (C) 2021-2022 Wipro Limited.
-# Copyright (c) 2022 J. F. Lucas. 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.
@@ -35,11 +36,6 @@ filebeatConfig:
 # Secrets Configuration.
 #################################################################
 secrets:
-  - uid: &aafCredsUID aafcreds
-    type: basicAuth
-    login: '{{ .Values.aafCreds.identity }}'
-    password: '{{ .Values.aafCreds.password }}'
-    passwordPolicy: required
   - uid: &cpsCredsUID cpscreds
     type: basicAuth
     login: '{{ .Values.cpsCreds.identity }}'
@@ -53,16 +49,11 @@ secrets:
     password: '{{ .Values.postgres.config.pgUserPassword }}'
     passwordPolicy: generate
 
-#################################################################
-# InitContainer Images.
-#################################################################
-tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
-
 #################################################################
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.son-handler:2.1.7
+image: onap/org.onap.dcaegen2.services.son-handler:2.2.1
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -72,27 +63,12 @@ log:
   path: /var/log/ONAP/dcaegen2/services/sonhms
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
-# Directory where TLS certs should be stored
-# if absent, no certs will be retrieved and stored
-certDirectory: /opt/app/sonhms/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: false
-
-# Policy configuraiton properties
+# Optional Policy configuration properties
 # if present, policy-sync side car will be deployed
-dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
-policies:
-  policyID: |
-    '["com.Config_PCIMS_CONFIG_POLICY"]'
-
-# Dependencies
-readinessCheck:
-  wait_for:
-    - aaf-cm
-    - &postgresName dcae-sonhms-postgres
+#dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
+#policies:
+#  policyID: |
+#    '["com.Config_PCIMS_CONFIG_POLICY"]'
 
 # Probe Configuration
 readiness:
@@ -108,25 +84,23 @@ service:
   type: ClusterIP
   name: dcae-son-handler
   ports:
-    - name: https
+    - name: http
       port: 8080
       port_protocol: http
 
-# AAF Credentials
-aafCreds:
-  identity: dcae@dcae.onap.org
-  password: demo123456!
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: message-router-read
+    authorizedPrincipalsPostgres:
+      - serviceAccount: dcae-son-handler-read
+
+# Credentials
 cpsCreds:
   identity: cps
   password: cpsr0cks!
 
 credentials:
-- name: AAF_IDENTITY
-  uid: *aafCredsUID
-  key: login
-- name: AAF_PASSWORD
-  uid: *aafCredsUID
-  key: password
 - name: CPS_IDENTITY
   uid: *cpsCredsUID
   key: login
@@ -165,6 +139,7 @@ applicationConfig:
   sonhandler.cg: sonhms-cg
   sonhandler.cid: sonhms-cid
   sonhandler.clientType: cps
+  sonhandler.nearRtricUrl: "https://a1-policy-management:30294/a1-policy/v2/policies"
   cps.service.url: http://cps-tbdmt:8080
   cps.get.celldata: execute/cps-ran-schemaset/get-cell-data
   cps.get.nbr.list.url: execute/cps-ran-schemaset/get-nbr-list
@@ -214,6 +189,9 @@ applicationConfig:
       policy-req: []
 
 applicationEnv:
+  CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  #Temporary Dummy CBS Port Value until internal SDK library is updated
+  CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000'
   STANDALONE: 'false'
 
 # Resource Limit Flavor -By Default Using Small
@@ -223,25 +201,25 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #################################################################
 # Application configuration Overriding Defaults in the Postgres.
 #################################################################
 postgres:
-  nameOverride: *postgresName
+  nameOverride: &postgresName dcae-sonhms-postgres
   service:
     name: *postgresName
     name2: *dcaeSonhmsPgPrimary
@@ -258,6 +236,13 @@ postgres:
     pgDatabase: sonhms
     pgUserExternalSecret: *pgUserCredsSecretName
 
+# Dependencies
+readinessCheck:
+  wait_for:
+    services:
+      - '{{ .Values.postgres.service.name2 }}'
+      - message-router
+
 #Pods Service Account
 serviceAccount:
   nameOverride: dcae-son-handler