Merge "[DMAAP-DR] Bump version to 2.1.10"

diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index 6f372f9..a232d53 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -76,7 +76,7 @@ global: # global defaults
       version:
         # Current version of the REST API
         api:
-          default: v26
+          default: v24
         # Specifies which version the depth parameter is configurable
         depth: v11
         # List of all the supported versions of the API

diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index b1f8c08..fdb243d 100644 (file)
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -77,7 +77,7 @@ global: # global defaults
       version:
         # Current version of the REST API
         api:
-          default: v26
+          default: v24
         # Specifies which version the depth parameter is configurable
         depth: v11
         # List of all the supported versions of the API

diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml
index 1dd374c..b030326 100644 (file)
--- a/kubernetes/aai/components/aai-schema-service/values.yaml
+++ b/kubernetes/aai/components/aai-schema-service/values.yaml
@@ -40,7 +40,7 @@ global: # global defaults
       version:
       # Current version of the REST API
         api:
-          default: v26
+          default: v24
         # Specifies which version the depth parameter is configurable
         depth: v11
         # List of all the supported versions of the API

diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index b1c8fdd..921d2dc 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -84,7 +84,7 @@ global: # global defaults
       version:
         # Current version of the REST API
         api:
-          default: v26
+          default: v24
         # Specifies which version the depth parameter is configurable
         depth: v11
         # List of all the supported versions of the API

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 62d1d2e..aa0e376 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -231,7 +231,7 @@ global: # global defaults
       version:
         # Current version of the REST API
         api:
-          default: v26
+          default: v24
         # Specifies which version the depth parameter is configurable
         depth: v11
         # List of all the supported versions of the API

diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl
index 7fee67a..f274107 100644 (file)
--- a/kubernetes/common/common/templates/_ingress.tpl
+++ b/kubernetes/common/common/templates/_ingress.tpl
@@ -13,11 +13,18 @@
     http:
       paths:
       - backend:
-          serviceName: {{ .name }}
-          servicePort: {{ .port }}
+          service:
+            name: {{ .name }}
+            port:
+            {{- if kindIs "string" .port }}
+              name: {{ .port }}
+            {{- else }}
+              number: {{ .port }}
+            {{- end }}
         {{- if .path }}
         path: {{ .path }}
         {{- end }}
+        pathType: ImplementationSpecific
 {{- end }}
 {{- end -}}
 
@@ -69,7 +76,7 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false"
   {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" (default (dict) .Values.global.ingress) "var" "enabled") }}
   {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" .Values.ingress "var" "enabledOverride") }}
   {{- if $ingressEnabled }}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "common.fullname" . }}-ingress

diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
index dee6add..555e637 100644 (file)
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
@@ -1,6 +1,6 @@
 #============LICENSE_START========================================================
 #=================================================================================
-# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2021-2022 AT&T Intellectual Property. 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.
@@ -16,7 +16,7 @@
 # ============LICENSE_END=========================================================
 
 apiVersion: v2
-appVersion: "Istanbul"
+appVersion: "Jakarta"
 description: TBD
 name: TBD
 version: TBD
@@ -41,3 +41,7 @@ dependencies:
   - name: serviceAccount
     version: ~10.x-0
     repository: '@local'
+  - name: mongo
+    version: ~10.x-0
+    repository: '@local'
+    condition: mongo.enabled

diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml
index 139e3d3..7609ba6 100644 (file)
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml
@@ -1,6 +1,6 @@
 #============LICENSE_START========================================================
 #=================================================================================
-# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2021-2022 AT&T Intellectual Property. 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.
@@ -48,10 +48,32 @@ dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-syn
 postgres:
   enabled: false
 
+#mongo enable/disable
+mongo:
+  enabled: false
+  nameOverride: dcae-mongo
+  config:
+    dbName: dcaecommondb
+  service:
+    name: dcae-mongohost
+    internalPort: 27017
+  nfsprovisionerPrefix: dcaemongo
+  sdnctlPrefix: tcagen2
+  persistence:
+    mountSubPath: dcae/mongo/data
+    enabled: true
+  disableNfsProvisioner: true
+
 # log directory where logging sidecar should look for log files
 # if absent, no sidecar will be deployed
 #logDirectory: TBD  #/opt/app/VESCollector/logs #DONE
 
+# Following requires manual override until fix for DCAEGEN2-3087
+# is available to switch logDirectory setting to log.path
+log:
+  path: /opt/app/
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+
 # directory where TLS certs should be stored
 # if absent, no certs will be retrieved and stored
 #certDirectory: TBD #/opt/app/dcae-certificate  #DONE
@@ -64,7 +86,6 @@ postgres:
 # dependencies
 readinessCheck:
   wait_for:
-    - dcae-config-binding-service
     - aaf-cm
 
 # probe configuration  #NEED DISCUSSION

diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
index e7d3fa2..5c50381 100644 (file)
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
@@ -93,7 +93,7 @@ readiness:
 
 
 # application image
-image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.3.1
+image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.3.2
 
 # Resource Limit flavor -By Default using small
 flavor: small

diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index 184adb6..7227ee8 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -63,7 +63,7 @@ server:
 logging:
   # Configuration of logging
   level:
-    ROOT: ERROR
+    ROOT: INFO
     org.springframework: ERROR
     org.springframework.data: ERROR
     org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
@@ -74,4 +74,12 @@ logging:
 
 chart:
   api:
-    enabled: false
\ No newline at end of file
+    enabled: false
+
+# Sample Permitted list of helm repositories. Before deployment update the repositories where the helm charts are located.
+# The Kubernetes participant accept only HTTPS Address
+helm:
+  repos:
+    -
+      repoName: bitnami
+      address: https://charts.bitnami.com/bitnami
\ No newline at end of file