From db843c7721a59d75aa687b23a379784e8b20c741 Mon Sep 17 00:00:00 2001 From: Edyta Krukowska Date: Thu, 18 Feb 2021 11:25:07 +0100 Subject: Fix bug with default mode format in ConfigMapVolumeSource and upgrade k8splugn to 3.5.3 Issue-ID: DCAEGEN2-2546 Signed-off-by: Edyta Krukowska Change-Id: If1eef2d7b6a8c7b3403d927895e20534f0137492 --- k8s/ChangeLog.md | 3 ++- k8s/k8sclient/k8sclient.py | 2 +- k8s/k8splugin_types.yaml | 4 ++-- k8s/pom.xml | 4 ++-- k8s/setup.py | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/k8s/ChangeLog.md b/k8s/ChangeLog.md index bab0ad0..9c73f64 100644 --- a/k8s/ChangeLog.md +++ b/k8s/ChangeLog.md @@ -5,7 +5,8 @@ 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.5.3] +* Fix bug with default mode format in ConfigMapVolumeSource ## [3.5.2] * DCAEGEN2-2546 - Add support for config_volume in k8s_client diff --git a/k8s/k8sclient/k8sclient.py b/k8s/k8sclient/k8sclient.py index c1f378f..d35a67c 100644 --- a/k8s/k8sclient/k8sclient.py +++ b/k8s/k8sclient/k8sclient.py @@ -303,7 +303,7 @@ def _parse_volumes(volume_list): volumes.append(client.V1Volume(name=vname, host_path=client.V1HostPathVolumeSource(path=vhost))) if ('config_volume' in v) and ('name' in v['config_volume']): vconfig_volume = v['config_volume']['name'] - volumes.append(client.V1Volume(name=vname, config_map=client.V1ConfigMapVolumeSource(default_mode="0644", + volumes.append(client.V1Volume(name=vname, config_map=client.V1ConfigMapVolumeSource(default_mode=0o0644, name=vconfig_volume, optional=True))) volume_mounts.append(client.V1VolumeMount(name=vname, mount_path=vcontainer, read_only=vro)) diff --git a/k8s/k8splugin_types.yaml b/k8s/k8splugin_types.yaml index 9c002fa..73f6457 100644 --- a/k8s/k8splugin_types.yaml +++ b/k8s/k8splugin_types.yaml @@ -1,7 +1,7 @@ # ================================================================================ # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2020 Pantheon.tech. All rights reserved. -# Copyright (c) 2020 Nokia. All rights reserved. +# Copyright (c) 2020-2021 Nokia. All rights reserved. # Copyright (c) 2020 J. F. Lucas. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,7 @@ plugins: k8s: executor: 'central_deployment_agent' package_name: k8splugin - package_version: 3.5.2 + package_version: 3.5.3 data_types: diff --git a/k8s/pom.xml b/k8s/pom.xml index 22a9b64..c392798 100644 --- a/k8s/pom.xml +++ b/k8s/pom.xml @@ -3,7 +3,7 @@ ================================================================================ Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. Copyright (c) 2020 Pantheon.tech. All rights reserved. -Copyright (c) 2020 Nokia. All rights reserved. +Copyright (c) 2020-2021 Nokia. All rights reserved. Copyright (c) 2020 J. F. Lucas. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,7 +29,7 @@ limitations under the License. org.onap.dcaegen2.platform.plugins k8s k8s-plugin - 3.5.2-SNAPSHOT + 3.5.3-SNAPSHOT http://maven.apache.org UTF-8 diff --git a/k8s/setup.py b/k8s/setup.py index d8d4845..9e8ebae 100644 --- a/k8s/setup.py +++ b/k8s/setup.py @@ -3,7 +3,7 @@ # ================================================================================ # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2020 Pantheon.tech. All rights reserved. -# Copyright (c) 2020 Nokia. All rights reserved. +# Copyright (c) 2020-2021 Nokia. All rights reserved. # Copyright (c) 2020 J. F. Lucas. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,7 @@ from setuptools import setup setup( name='k8splugin', description='Cloudify plugin for containerized components deployed using Kubernetes', - version="3.5.2", + version="3.5.3", 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, -- cgit 1.2.3-korg