From 4b352b4ca483762c0532ba7c98a0af0397212aaf Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 10 Oct 2019 14:05:59 -0600 Subject: [PATCH] Deprecate kubespray kubernetes install We haven't tested this in many cycles and is not currently being persued as a supported service to install via TripleO. Change-Id: Iec607ab6a5ba5b5156009073a264fa88ac59331e --- .../kubernetes/kubernetes-master-baremetal-ansible.yaml | 0 .../kubernetes/kubernetes-worker-baremetal-ansible.yaml | 0 environments/kubernetes.yaml | 4 ++-- overcloud-resource-registry-puppet.j2.yaml | 4 ++-- .../notes/deprecate-kubernetes-services-69ca5ec733d24644.yaml | 4 ++++ zuul.d/layout.yaml | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) rename deployment/{ => deprecated}/kubernetes/kubernetes-master-baremetal-ansible.yaml (100%) rename deployment/{ => deprecated}/kubernetes/kubernetes-worker-baremetal-ansible.yaml (100%) create mode 100644 releasenotes/notes/deprecate-kubernetes-services-69ca5ec733d24644.yaml diff --git a/deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml b/deployment/deprecated/kubernetes/kubernetes-master-baremetal-ansible.yaml similarity index 100% rename from deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml rename to deployment/deprecated/kubernetes/kubernetes-master-baremetal-ansible.yaml diff --git a/deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml b/deployment/deprecated/kubernetes/kubernetes-worker-baremetal-ansible.yaml similarity index 100% rename from deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml rename to deployment/deprecated/kubernetes/kubernetes-worker-baremetal-ansible.yaml diff --git a/environments/kubernetes.yaml b/environments/kubernetes.yaml index d2ba91313c..c48dccca14 100644 --- a/environments/kubernetes.yaml +++ b/environments/kubernetes.yaml @@ -1,4 +1,4 @@ resource_registry: OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml - OS::TripleO::Services::Kubernetes::Worker: ../deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml - OS::TripleO::Services::Kubernetes::Master: ../deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml + OS::TripleO::Services::Kubernetes::Worker: ../deployment/deprecated/kubernetes/kubernetes-worker-baremetal-ansible.yaml + OS::TripleO::Services::Kubernetes::Master: ../deployment/deprecated/kubernetes/kubernetes-master-baremetal-ansible.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 3e890d92d0..2fd307027b 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -131,8 +131,8 @@ resource_registry: OS::TripleO::Services::HeatApiCloudwatch: deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml OS::TripleO::Services::HeatEngine: deployment/heat/heat-engine-container-puppet.yaml OS::TripleO::Services::Kernel: deployment/kernel/kernel-baremetal-ansible.yaml - OS::TripleO::Services::Kubernetes::Master: deployment/kubernetes/kubernetes-master-baremetal-ansible.yaml - OS::TripleO::Services::Kubernetes::Worker: deployment/kubernetes/kubernetes-worker-baremetal-ansible.yaml + OS::TripleO::Services::Kubernetes::Master: deployment/deprecated/kubernetes/kubernetes-master-baremetal-ansible.yaml + OS::TripleO::Services::Kubernetes::Worker: deployment/deprecated/kubernetes/kubernetes-worker-baremetal-ansible.yaml OS::TripleO::Services::MySQL: deployment/database/mysql-container-puppet.yaml OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None diff --git a/releasenotes/notes/deprecate-kubernetes-services-69ca5ec733d24644.yaml b/releasenotes/notes/deprecate-kubernetes-services-69ca5ec733d24644.yaml new file mode 100644 index 0000000000..04b0989103 --- /dev/null +++ b/releasenotes/notes/deprecate-kubernetes-services-69ca5ec733d24644.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + Kubernetes installation via Kubespray has been deprecated. diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 9b4c0cffc8..d41f493a3c 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -130,7 +130,7 @@ - ^ci/common/.*$ - ^coe/kubernetes.*$ - ^environments/kubernetes.*$ - - ^deployment/kubernetes/.*$ + - ^deployment/.*kubernetes/.*$ - ci/environments/scenario006-multinode.yaml - ^deployed-server/.*$ - ^common/.*$