Merge "Deprecate kubespray kubernetes install"

openstack-archive · Oct 15, 2019 · 9a09779 · 9a09779
2 parents 1d98473 + 4b352b4
commit 9a09779
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/.../kubernetes-master-baremetal-ansible.yaml → .../kubernetes-master-baremetal-ansible.yaml b/.../kubernetes-master-baremetal-ansible.yaml → .../kubernetes-master-baremetal-ansible.yaml
diff --git a/.../kubernetes-worker-baremetal-ansible.yaml → .../kubernetes-worker-baremetal-ansible.yaml b/.../kubernetes-worker-baremetal-ansible.yaml → .../kubernetes-worker-baremetal-ansible.yaml
diff --git 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
@@ -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
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - |
+    Kubernetes installation via Kubespray has been deprecated.
diff --git 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/.*$