[DCAEGEN2] Update pnf registration handler

- prh 1.12.0 image
- bump chart version to 16.0.0
- fix openstack dns resolution issues in SO
- reduce resource requests

Issue-ID: DCAEGEN2-3427
Change-Id: Iad8bc19007c5323309ce43ca8c219f0043df4253
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 83732e8..3b68700 100644 (file)
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -22,7 +22,7 @@ apiVersion: v2
 appVersion: "Oslo"
 description: DCAE Microservices
 name: dcaegen2-services
-version: 15.0.1
+version: 16.0.0
 
 dependencies:
   - name: common
@@ -49,7 +49,7 @@ dependencies:
     repository: '@local'
     condition: dcae-ms-healthcheck.enabled
   - name: dcae-prh
-    version: ~13.x-0
+    version: ~14.x-0
     repository: '@local'
     condition: dcae-prh.enabled
   - name: dcae-ves-collector

diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
index bd5651e..1ed86f0 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
@@ -22,7 +22,7 @@ apiVersion: v2
 appVersion: "Oslo"
 description: DCAE PRH
 name: dcae-prh
-version: 13.2.0
+version: 14.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
index c5f5fc2..c7416d0 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
@@ -44,7 +44,7 @@ filebeatConfig:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.11.0
+image: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.12.0
 pullPolicy: Always
 
 # log directory where logging sidecar should look for log files
@@ -205,17 +205,17 @@ resources:
   small:
     limits:
       cpu: "2"
-      memory: "3Gi"
+      memory: "1Gi"
     requests:
-      cpu: "0.5"
-      memory: "3Gi"
+      cpu: "0.2"
+      memory: "1Gi"
   large:
     limits:
       cpu: "3"
-      memory: "6Gi"
+      memory: "2Gi"
     requests:
-      cpu: "1"
-      memory: "6Gi"
+      cpu: "0.5"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 3471524..8a3e150 100644 (file)
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -49,7 +49,7 @@ dependencies:
     repository: '@local'
     condition: cps.enabled
   - name: dcaegen2-services
-    version: ~15.x-0
+    version: ~16.x-0
     repository: '@local'
     condition: dcaegen2-services.enabled
   - name: mariadb-galera

diff --git a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
index 5837944..e945a5d 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
@@ -28,6 +28,9 @@ spec:
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
+      {{- if .Values.dnsConfig }}
+      dnsConfig: {{- toYaml .Values.dnsConfig | nindent 8 }}
+      {{- end }}
       initContainers:
       {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
       containers:

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 61fb753..899ec2d 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -100,6 +100,14 @@ mso:
   db:
     auth: Basic YnBlbDpwYXNzd29yZDEk
 
+# Custom DNS configuration to work around ndots:5 + openstack.local
+# search domain interaction causing permanent resolution failures
+# for external hostnames like cloudapi.tnaplab.telekom.de.
+dnsConfig:
+  options:
+    - name: ndots
+      value: "3"
+
 replicaCount: 1
 minReadySeconds: 10
 containerPort: &containerPort 8087