Merge "[SO] Bump SO nssmf adapter version"

diff --git a/kubernetes/common/common/templates/_log.tpl b/kubernetes/common/common/templates/_log.tpl
index dc714ae..8142046 100644 (file)
--- a/kubernetes/common/common/templates/_log.tpl
+++ b/kubernetes/common/common/templates/_log.tpl
@@ -31,10 +31,12 @@
 {{- end -}}
 
 {{- define "common.log.volumes" -}}
-{{- if .Values.global.centralizedLoggingEnabled }}
+{{- $dot := default . .dot }}
+{{- if $dot.Values.global.centralizedLoggingEnabled }}
+{{- $configMapName := printf "%s-filebeat" (default (include "common.fullname" $dot) .configMapNamePrefix) }}
 - name: filebeat-conf
   configMap:
-    name: {{ include "common.fullname" . }}-filebeat
+    name: {{ $configMapName }}
 - name: filebeat-data
   emptyDir: {}
 {{- end -}}

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
index 2e50188..8e71114 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
@@ -20,7 +20,7 @@
 
 dmi:
   service:
-    name: {{ .Values.config.dmiServiceName }}
+    url: {{ .Values.config.dmiServiceUrl }}
 
 cps-core:
   baseUrl: {{ .Values.config.cpsCore.url }}

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 234f9eb..a4a56de 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -47,7 +47,7 @@ global:
     virtualhost:
       baseurl: "simpledemo.onap.org"
 
-image: onap/ncmp-dmi-plugin:1.0.0
+image: onap/ncmp-dmi-plugin:1.0.1
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
@@ -147,7 +147,7 @@ config:
   spring:
     profile: helm
 
-  dmiServiceName: http://*svc_name:*svc_port
+  dmiServiceUrl: http://*svc_name:*svc_port
   sdnc:
     url: http://sdnc:8181
     username: admin

diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index 3983d93..3318a19 100755 (executable)
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -49,7 +49,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-apex-pdp:2.6.0
+image: onap/policy-apex-pdp:2.6.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 87ddd73..11efaa1 100755 (executable)
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -78,7 +78,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-api:2.5.0
+image: onap/policy-api:2.5.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-be/values.yaml b/kubernetes/policy/components/policy-clamp-be/values.yaml
index 518e7b1..35011de 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-be/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/values.yaml
@@ -70,7 +70,7 @@ secrets:
 flavor: small
 
 # application image
-image: onap/policy-clamp-backend:6.1.2
+image: onap/policy-clamp-backend:6.1.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
index 74cf74f..f98fce1 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
@@ -72,7 +72,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-k8s-ppnt:6.1.2
+image: onap/policy-clamp-cl-k8s-ppnt:6.1.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml
index 4cf9e67..c0044e2 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml
@@ -78,7 +78,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-runtime:6.1.2
+image: onap/policy-clamp-cl-runtime:6.1.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-fe/values.yaml b/kubernetes/policy/components/policy-clamp-fe/values.yaml
index 9e021c8..e558741 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-fe/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/values.yaml
@@ -60,7 +60,7 @@ subChartsOnly:
 flavor: small
 
 # application image
-image: onap/policy-clamp-frontend:6.1.2
+image: onap/policy-clamp-frontend:6.1.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index 1614bd8..2d80fbb 100755 (executable)
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -67,7 +67,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-distribution:2.6.0
+image: onap/policy-distribution:2.6.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 678cce7..fa0fda8 100755 (executable)
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -35,7 +35,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pdpd-cl:1.9.0
+image: onap/policy-pdpd-cl:1.9.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml
index 460a83d..a1810d3 100644 (file)
--- a/kubernetes/policy/components/policy-gui/values.yaml
+++ b/kubernetes/policy/components/policy-gui/values.yaml
@@ -63,7 +63,7 @@ subChartsOnly:
 flavor: small
 
 # application image
-image: onap/policy-gui:2.1.0
+image: onap/policy-gui:2.1.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index c373e04..5381892 100755 (executable)
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -92,7 +92,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pap:2.5.0
+image: onap/policy-pap:2.5.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 91984cc..7c2d1b1 100755 (executable)
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -83,7 +83,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:2.5.0
+image: onap/policy-xacml-pdp:2.5.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 2960369..95164da 100755 (executable)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -104,7 +104,7 @@ mariadb:
   image: mariadb:10.5.8
 
 dbmigrator:
-  image: onap/policy-db-migrator:2.3.0
+  image: onap/policy-db-migrator:2.3.1
   schema: policyadmin
   policy_home: "/opt/app/policy"
 

diff --git a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
index 15f08bc..e332f98 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -57,7 +57,11 @@ org:
   onap:
     so:
       adapters:
+        {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }}
+        default_keystone_url_version: /v3
+        {{- else }}
         default_keystone_url_version: /v2.0
+        {{- end }}
         default_keystone_reg_ex: "/[vV][0-9]"
         vnf:
           bpelauth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.org.onap.so.adapters.bpelauth )}}
@@ -79,7 +83,11 @@ org:
           retrylist: 408,429,500,502,503,504,900
           encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
         tenant:
+          {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }}
+          default_keystone_url_version: /v3
+          {{- else }}
           default_keystone_url_version: /v2.0
+          {{- end }}
           default_keystone_reg_ex: "/[vV][0-9]"
           default_tenant_description: Tenant
           default_region_type: single

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 2ac8295..ab97d40 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -150,6 +150,8 @@ config:
   openStackServiceTenantName: "service"
   openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
   openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
+  # "KEYSTONE" for keystone v2, "KEYSTONE_V3" for keystone v3
+  openStackKeystoneVersion: "KEYSTONE"
 nodeSelector: {}
 tolerations: []
 affinity: {}

diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json
index 167a8ed..119a313 100755 (executable)
--- a/kubernetes/so/resources/config/mso/mso-docker.json
+++ b/kubernetes/so/resources/config/mso/mso-docker.json
@@ -84,13 +84,17 @@
       [
         {
           "dcp_clli": "DEFAULT_KEYSTONE",
+          {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }}
+          "identity_url": "{{ .Values.config.openStackKeyStoneUrl }}/v3",
+          {{- else }}
           "identity_url": "{{ .Values.config.openStackKeyStoneUrl }}/v2.0",
+          {{- end }}
           "mso_id": "{{ .Values.config.openStackUserName }}",
           "mso_pass": "{{ .Values.config.openStackEncryptedPasswordHere }}",
           "admin_tenant":"{{ .Values.config.openStackServiceTenantName }}",
           "member_role": "admin",
           "tenant_metadata": "true",
-          "identity_server_type": "KEYSTONE",
+          "identity_server_type": "{{ .Values.config.openStackKeystoneVersion }}",
           "identity_authentication_type": "USERNAME_PASSWORD"
         }
       ],

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 988b8ef..b14c014 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -257,6 +257,8 @@ affinity: {}
 config:
   logstashServiceName: log-ls
   logstashPort: 5044
+  # "KEYSTONE" for keystone v2, "KEYSTONE_V3" for keystone v3
+  openStackKeystoneVersion: "KEYSTONE"
 
 #Used only if localCluster is enabled. Instantiates SO's own cassandra cluster
 #helm deploy demo local/onap --namespace onap --verbose --set so.enabled=true \