diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-04-01 18:00:19 -0400 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2019-04-02 10:52:35 -0400 |
| commit | a4983a2f9a74b52c1b54491f2a39d2effb2763e6 (patch) | |
| tree | f0fda1401ab6782b570487c56132b720e4fccd0a | |
| parent | 4823b2acc5c61d5e5442364cd0540dd475949e73 (diff) | |
Change kubeconfig file location
By putting kubeconfig in its own directory, we make
sure updates to the underlying configMap become
visible to the plugin without restarting CM.
Issue-ID: DCAEGEN2-1136
Change-Id: Ifbc5bed31cdcf285b1cf845427679f631eaa4645
Signed-off-by: Jack Lucas <jflucas@research.att.com>
| -rw-r--r-- | k8s/ChangeLog.md | 6 | ||||
| -rw-r--r-- | k8s/k8s-node-type.yaml | 2 | ||||
| -rw-r--r-- | k8s/k8sclient/k8sclient.py | 2 | ||||
| -rw-r--r-- | k8s/pom.xml | 2 | ||||
| -rw-r--r-- | k8s/setup.py | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/k8s/ChangeLog.md b/k8s/ChangeLog.md index 2511802..ee209ee 100644 --- a/k8s/ChangeLog.md +++ b/k8s/ChangeLog.md @@ -5,6 +5,12 @@ 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/). +## [1.4.12] + Change location of kubeconfig file for multi-cluster support. Put the + file in a subdirectory so that the k8s volume mount does not require a + "subPath" parameter, so that updates to the ConfigMap hosting the kubeconfig + will be visible to the plugin without restarting Cloudify Manager. + ## [1.4.11] change v['container']['mode'] to v['container'].get('mode') to allow for the 'mode' value to be absent from v['container'] diff --git a/k8s/k8s-node-type.yaml b/k8s/k8s-node-type.yaml index f47a2bc..b51a23f 100644 --- a/k8s/k8s-node-type.yaml +++ b/k8s/k8s-node-type.yaml @@ -25,7 +25,7 @@ plugins: k8s: executor: 'central_deployment_agent' package_name: k8splugin - package_version: 1.4.11 + package_version: 1.4.12 data_types: diff --git a/k8s/k8sclient/k8sclient.py b/k8s/k8sclient/k8sclient.py index 3a02efd..f8a9ecc 100644 --- a/k8s/k8sclient/k8sclient.py +++ b/k8s/k8sclient/k8sclient.py @@ -28,7 +28,7 @@ PROBE_DEFAULT_PERIOD = 15 PROBE_DEFAULT_TIMEOUT = 1 # Location of k8s cluster config file ("kubeconfig") -K8S_CONFIG_PATH="/opt/onap/kubeconfig" +K8S_CONFIG_PATH="/opt/onap/kube/kubeconfig" # Regular expression for interval/timeout specification INTERVAL_SPEC = re.compile("^([0-9]+)(s|m|h)?$") diff --git a/k8s/pom.xml b/k8s/pom.xml index 22db83c..6a12eac 100644 --- a/k8s/pom.xml +++ b/k8s/pom.xml @@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.onap.dcaegen2.platform.plugins</groupId> <artifactId>k8s</artifactId> <name>k8s-plugin</name> - <version>1.4.10-SNAPSHOT</version> + <version>1.4.12-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 bfe213c..c8fd2ef 100644 --- a/k8s/setup.py +++ b/k8s/setup.py @@ -23,7 +23,7 @@ from setuptools import setup setup( name='k8splugin', description='Cloudify plugin for containerized components deployed using Kubernetes', - version="1.4.11", + version="1.4.12", author='J. F. Lucas, Michael Hwang, Tommy Carpenter', packages=['k8splugin','k8sclient','msb','configure'], zip_safe=False, |