Add parameters for cmpv2 issuer integration.

Issue-ID: DCAEGEN2-2440
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: I6cfedfc60ecc00a2d7cafcb11e72d291fbfb3301

diff --git a/k8s/ChangeLog.md b/k8s/ChangeLog.md
index 9c73f64..dd87c42 100644 (file)
--- a/k8s/ChangeLog.md
+++ b/k8s/ChangeLog.md
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.6.0]
+* Add cmpv2 issuer integration
+
 ## [3.5.3]
 * Fix bug with default mode format in ConfigMapVolumeSource
 ## [3.5.2]

diff --git a/k8s/configure/configure.py b/k8s/configure/configure.py
index 481e02e..142e2ec 100644 (file)
--- a/k8s/configure/configure.py
+++ b/k8s/configure/configure.py
@@ -3,7 +3,7 @@
 # ================================================================================
 # Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # Copyright (c) 2019 Pantheon.tech. All rights reserved.
-# Copyright (c) 2020 Nokia. All rights reserved.
+# Copyright (c) 2020-2021 Nokia. 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.
@@ -54,6 +54,9 @@ EXT_TLS_TRUSTSTORE_PASSWORD = "secret"
 CERT_POST_PROCESSOR_IMAGE = "nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:2.1.0"
 CBS_BASE_URL = "https://config-binding-service:10443/service_component_all"
 
+CMPV2_ISSUER_ENABLED = "false"
+CMPV2_ISSUER_NAME = "cmpv2-issuer-onap"
+
 def _set_defaults():
     """ Set default configuration parameters """
     return {
@@ -93,8 +96,11 @@ def _set_defaults():
         },
         "cbs": {
             "base_url" : CBS_BASE_URL                   # URL prefix for accessing config binding service
+        },
+        "cmpv2_issuer": {
+            "enabled": CMPV2_ISSUER_ENABLED,
+            "name":    CMPV2_ISSUER_NAME
         }
-
     }
 
 def configure(config_path=_CONFIG_PATH, key = _CONSUL_KEY):

diff --git a/k8s/k8splugin_types.yaml b/k8s/k8splugin_types.yaml
index 73f6457..b089184 100644 (file)
--- a/k8s/k8splugin_types.yaml
+++ b/k8s/k8splugin_types.yaml
@@ -24,7 +24,7 @@ plugins:
   k8s:
     executor: 'central_deployment_agent'
     package_name: k8splugin
-    package_version: 3.5.3
+    package_version: 3.6.0
 
 data_types:
 

diff --git a/k8s/pom.xml b/k8s/pom.xml
index c392798..c895adb 100644 (file)
--- a/k8s/pom.xml
+++ b/k8s/pom.xml
@@ -29,7 +29,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.platform.plugins</groupId>
   <artifactId>k8s</artifactId>
   <name>k8s-plugin</name>
-  <version>3.5.3-SNAPSHOT</version>
+  <version>3.6.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/k8s/setup.py b/k8s/setup.py
index 9e8ebae..24037d5 100644 (file)
--- a/k8s/setup.py
+++ b/k8s/setup.py
@@ -24,7 +24,7 @@ from setuptools import setup
 setup(
     name='k8splugin',
     description='Cloudify plugin for containerized components deployed using Kubernetes',
-    version="3.5.3",
+    version="3.6.0",
     author='J. F. Lucas, Michael Hwang, Tommy Carpenter, Joanna Jeremicz, Sylwia Jakubek, Jan Malkiewicz, Remigiusz Janeczek, Piotr Marcinkiewicz',
     packages=['k8splugin','k8sclient','configure'],
     zip_safe=False,

diff --git a/version.properties b/version.properties
index 73415a7..07578e5 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
 major=1\r
-minor=1\r
+minor=2\r
 patch=0\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r