From e9fd1004ab9ef843b3d168b278c2775d1f01ab6c Mon Sep 17 00:00:00 2001 From: Daniel Mellado Date: Tue, 19 Jun 2018 07:12:13 -0400 Subject: [PATCH] Deprecate running Kuryr-Kubernetes with lbaasv2 This commit marks the deprecation of the support of neutron-lbaasv2 in Kuryr-Kubernetes. It adds a deprecation message, release note and removes the usage of lbaasv2 in the upstream gates. From now on, the default option for lbaasv2 will always be octavia. Change-Id: I528fc7c0462445c880d13268435c993c2e2ff00f --- .zuul.d/lbaasv2.yaml | 65 ------------------- .zuul.d/project.yaml | 9 +-- .zuul.d/sdn.yaml | 2 +- kuryr_kubernetes/config.py | 6 +- .../deprecate_lbaasv2-a524aedf5d3a36bc.yaml | 15 +++++ 5 files changed, 23 insertions(+), 74 deletions(-) create mode 100644 releasenotes/notes/deprecate_lbaasv2-a524aedf5d3a36bc.yaml diff --git a/.zuul.d/lbaasv2.yaml b/.zuul.d/lbaasv2.yaml index df9eff787..26dc7fded 100644 --- a/.zuul.d/lbaasv2.yaml +++ b/.zuul.d/lbaasv2.yaml @@ -35,68 +35,3 @@ vars: devstack_services: kuryr-daemon: true - -- job: - name: kuryr-kubernetes-tempest-daemon-pools-lbaasv2 - parent: kuryr-kubernetes-tempest-daemon-lbaasv2 - description: | - Kuryr-Kubernetes tempest job using port-pool feature - vars: - tempest_test_regex: '^(kuryr_tempest_plugin.tests.scenario.test_port_pool.TestPortPoolScenario.test_port_pool)' - devstack_localrc: - KURYR_USE_PORT_POOLS: true - KURYR_POD_VIF_DRIVER: neutron-vif - KURYR_VIF_POOL_DRIVER: neutron - TEMPEST_CONCURRENCY: 1 - -- job: - name: kuryr-kubernetes-tempest-containerized-lbaasv2 - parent: kuryr-kubernetes-tempest-lbaasv2 - description: | - Tempest with LBaaSV2 and containers - vars: - devstack_localrc: - KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true - -- job: - name: kuryr-kubernetes-tempest-daemon-containerized-lbaasv2 - parent: kuryr-kubernetes-tempest-daemon-lbaasv2 - description: | - Tempest with LBaaSV2, CNI daemon enabled and containers - vars: - devstack_localrc: - KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true - -- job: - name: kuryr-kubernetes-tempest-openshift-lbaasv2 - parent: kuryr-kubernetes-tempest-lbaasv2 - description: | - Kuryr-Kubernetes tempest job using lbaasv2 and OpenShift - vars: - devstack_localrc: - DOCKER_CGROUP_DRIVER: "systemd" - devstack_services: - kubernetes-api: false - kubernetes-controller-manager: false - kubernetes-scheduler: false - kubelet: false - openshift-master: true - openshift-node: true - -- job: - name: kuryr-kubernetes-tempest-daemon-openshift-lbaasv2 - parent: kuryr-kubernetes-tempest-openshift-lbaasv2 - description: | - Kuryr-Kubernetes tempest job using lbaasv2, CNI daemon and OpenShift - vars: - devstack_services: - kuryr-daemon: true - voting: false - -- job: - name: kuryr-kubernetes-tempest-daemon-containerized-openshift-lbaasv2 - description: Tempest with LBaaS v2, CNI daemon enabled, containers and OpenShift - parent: kuryr-kubernetes-tempest-daemon-openshift-lbaasv2 - vars: - devstack_localrc: - KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 706b4a3a3..5dd3d07e6 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -21,10 +21,7 @@ - kuryr-kubernetes-tempest-daemon-octavia - kuryr-kubernetes-tempest-daemon-openshift-octavia - kuryr-kubernetes-tempest-daemon-lbaasv2 - - kuryr-kubernetes-tempest-daemon-openshift-lbaasv2 - kuryr-kubernetes-tempest-daemon-containerized-octavia - - kuryr-kubernetes-tempest-multinode-octavia - - kuryr-kubernetes-tempest-octavia-centos-7 - kuryr-kubernetes-tempest-dragonflow - kuryr-kubernetes-tempest-daemon-containerized-ovn gate: @@ -37,10 +34,8 @@ - kuryr-kubernetes-tempest-daemon-containerized-octavia experimental: jobs: - - kuryr-kubernetes-tempest-containerized-lbaasv2 - - kuryr-kubernetes-tempest-daemon-containerized-openshift-lbaasv2 - - kuryr-kubernetes-tempest-daemon-pools-lbaasv2 - - kuryr-kubernetes-tempest-daemon-containerized-lbaasv2 + - kuryr-kubernetes-tempest-multinode-octavia + - kuryr-kubernetes-tempest-octavia-centos-7 - kuryr-kubernetes-tempest-daemon-containerized-octavia-l2 - kuryr-kubernetes-tempest-daemon-containerized-octavia-namespace - kuryr-kubernetes-tempest-daemon-ovn diff --git a/.zuul.d/sdn.yaml b/.zuul.d/sdn.yaml index 0f1647b64..17c4af0a3 100644 --- a/.zuul.d/sdn.yaml +++ b/.zuul.d/sdn.yaml @@ -62,7 +62,7 @@ - job: name: kuryr-kubernetes-tempest-dragonflow - parent: kuryr-kubernetes-tempest-lbaasv2 + parent: kuryr-kubernetes-tempest-octavia description: | Kuryr-Kubernetes tempest job using Dragonflow required-projects: diff --git a/kuryr_kubernetes/config.py b/kuryr_kubernetes/config.py index 486e6a3e7..679e96c66 100644 --- a/kuryr_kubernetes/config.py +++ b/kuryr_kubernetes/config.py @@ -130,7 +130,11 @@ k8s_opts = [ cfg.StrOpt('endpoints_lbaas_driver', help=_("The driver that provides LoadBalancers for " "Kubernetes Endpoints"), - default='lbaasv2'), + default='lbaasv2', + deprecated_for_removal=True, + deprecated_reason="Default and supported lbaas endpoint is " + "now Octavia", + deprecated_since="Rocky"), cfg.StrOpt('vif_pool_driver', help=_("The driver that manages VIFs pools for " "Kubernetes Pods"), diff --git a/releasenotes/notes/deprecate_lbaasv2-a524aedf5d3a36bc.yaml b/releasenotes/notes/deprecate_lbaasv2-a524aedf5d3a36bc.yaml new file mode 100644 index 000000000..a4d5d0ddd --- /dev/null +++ b/releasenotes/notes/deprecate_lbaasv2-a524aedf5d3a36bc.yaml @@ -0,0 +1,15 @@ +--- +upgrade: + - | + Legacy Kuryr deployment relying on neutron-lbaas as the LBaaSv2 endpoint is + now deprecated. The possibility of using it as Kuryr's lbaasv2 endpoint + will be totally removed in one of the next releases. +deprecations: + - | + Running Kuryr-Kubernetes with neutron-lbaasv2 is now deprecated. The main + motivation for this is the deprecation of the neutron-lbaas implementation + in favour to Octavia. + + Possibility of running Kuryr-Kubernetes with the lbaas handler pointing to + anything but Octavia or SDN lbaas implementations will be removed in + future releases.