From 86c9f3ac9a19ffba6ef9ca92ac088a0c24abcb3f Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Wed, 16 Sep 2020 14:01:01 -0400 Subject: Label k8s Deployments for healthcheck Issue-ID: DCAEGEN2-2433 Signed-off-by: Jack Lucas Change-Id: I12b5ca5d0c70d7c8d42c1ec1ce88841d2cf25cd7 --- k8s/k8sclient/k8sclient.py | 3 ++- k8s/k8splugin_types.yaml | 3 ++- k8s/plugin_testing_blueprints/blueprints/nginx-svc-appconfig.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-bad.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-dr-sub.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-mr-pub.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-env.yaml | 2 +- .../blueprints/nginx-svc-lifecycle-inputs.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-loc.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-log.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-nodeport.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-noports.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-override.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-loc.yaml | 2 +- .../blueprints/nginx-svc-policy-no-notify.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-script-bad.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-script.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-client.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-server.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc-udp.yaml | 2 +- k8s/plugin_testing_blueprints/blueprints/nginx-svc.yaml | 2 +- k8s/pom.xml | 3 ++- k8s/setup.py | 3 ++- 24 files changed, 28 insertions(+), 24 deletions(-) diff --git a/k8s/k8sclient/k8sclient.py b/k8s/k8sclient/k8sclient.py index a41d32d..68feaec 100644 --- a/k8s/k8sclient/k8sclient.py +++ b/k8s/k8sclient/k8sclient.py @@ -4,6 +4,7 @@ # Copyright (c) 2019-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 J. F. Lucas. 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. @@ -216,7 +217,7 @@ def _create_deployment_object(component_name, deployment = client.V1Deployment( api_version="apps/v1", kind="Deployment", - metadata=client.V1ObjectMeta(name=deployment_name), + metadata=client.V1ObjectMeta(name=deployment_name, labels=labels), spec=spec ) diff --git a/k8s/k8splugin_types.yaml b/k8s/k8splugin_types.yaml index f6c518b..d216e31 100644 --- a/k8s/k8splugin_types.yaml +++ b/k8s/k8splugin_types.yaml @@ -2,6 +2,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 J. F. Lucas. 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. @@ -23,7 +24,7 @@ plugins: k8s: executor: 'central_deployment_agent' package_name: k8splugin - package_version: 3.4.1 + package_version: 3.4.2 data_types: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-appconfig.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-appconfig.yaml index 4373680..d11db0e 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-appconfig.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-appconfig.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-bad.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-bad.yaml index 2b51650..8219608 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-bad.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-bad.yaml @@ -9,7 +9,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-dr-sub.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-dr-sub.yaml index 1bbbf34..edc9f6d 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-dr-sub.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-dr-sub.yaml @@ -7,7 +7,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - plugin:dmaap?version=1.5.0 - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: feed00: type: dcaegen2.nodes.Feed diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-mr-pub.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-mr-pub.yaml index 177598c..056f238 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-mr-pub.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-dmaap-mr-pub.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 - plugin:dmaap?version=1.5.0 node_templates: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-env.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-env.yaml index b9e3fae..bec3f2c 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-env.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-env.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-lifecycle-inputs.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-lifecycle-inputs.yaml index 61c9de4..1237011 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-lifecycle-inputs.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-lifecycle-inputs.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-loc.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-loc.yaml index e1863c6..d842dba 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-loc.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-loc.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-log.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-log.yaml index 61dc274..ceeff6a 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-log.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-log.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-nodeport.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-nodeport.yaml index c22a96b..68469e2 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-nodeport.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-nodeport.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-noports.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-noports.yaml index bf93df4..fbdb657 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-noports.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-noports.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-override.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-override.yaml index fdaf1b0..fac9901 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-override.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-override.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-loc.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-loc.yaml index c09b610..eec8e14 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-loc.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-loc.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 - plugin:dcaepolicyplugin?version=2.4.0 node_templates: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-no-notify.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-no-notify.yaml index 7ae6c36..75ec82e 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-no-notify.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy-no-notify.yaml @@ -9,7 +9,7 @@ description: > a policy is updated. imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 - plugin:dcaepolicyplugin?version=2.4.0 node_templates: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy.yaml index d8bde75..5f761d9 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-policy.yaml @@ -9,7 +9,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 - plugin:dcaepolicyplugin?version=2.4.0 node_templates: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-script-bad.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-script-bad.yaml index d080fd7..2e5ad53 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-script-bad.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-script-bad.yaml @@ -9,7 +9,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-script.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-script.yaml index 97306d3..093c1bd 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-script.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-script.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-client.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-client.yaml index 02e61ee..ed1d80b 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-client.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-client.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-server.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-server.yaml index aefc0af..14cdae6 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-server.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-tls-server.yaml @@ -8,7 +8,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-udp.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-udp.yaml index 3eb3019..e394448 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc-udp.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc-udp.yaml @@ -6,7 +6,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/plugin_testing_blueprints/blueprints/nginx-svc.yaml b/k8s/plugin_testing_blueprints/blueprints/nginx-svc.yaml index 98078b7..59ce663 100644 --- a/k8s/plugin_testing_blueprints/blueprints/nginx-svc.yaml +++ b/k8s/plugin_testing_blueprints/blueprints/nginx-svc.yaml @@ -5,7 +5,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=>=3.0.0,<4.0.0 node_templates: web_server: diff --git a/k8s/pom.xml b/k8s/pom.xml index 5cdc265..9b47a6e 100644 --- a/k8s/pom.xml +++ b/k8s/pom.xml @@ -4,6 +4,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 J. F. Lucas. 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. @@ -28,7 +29,7 @@ limitations under the License. org.onap.dcaegen2.platform.plugins k8s k8s-plugin - 3.4.1-SNAPSHOT + 3.4.2-SNAPSHOT http://maven.apache.org UTF-8 diff --git a/k8s/setup.py b/k8s/setup.py index ad1072e..282aef8 100644 --- a/k8s/setup.py +++ b/k8s/setup.py @@ -4,6 +4,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 J. F. Lucas. 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. @@ -23,7 +24,7 @@ from setuptools import setup setup( name='k8splugin', description='Cloudify plugin for containerized components deployed using Kubernetes', - version="3.4.1", + version="3.4.2", author='J. F. Lucas, Michael Hwang, Tommy Carpenter, Joanna Jeremicz, Sylwia Jakubek, Jan Malkiewicz, Remigiusz Janeczek', packages=['k8splugin','k8sclient','configure'], zip_safe=False, -- cgit 1.2.3-korg