Merge pull request #164 from stackhpc/zed_refresh_032024

Sync Zed with Yoga backports

doc/source/user/index.rst

@@ -422,13 +422,6 @@ the table are linked to more details elsewhere in the user guide.
 +---------------------------------------+--------------------+---------------+
 | `k8s_keystone_auth_tag`_              | see below          | see below     |
 +---------------------------------------+--------------------+---------------+
-| `tiller_enabled`_                     | - true             | false         |
-|                                       | - false            |               |
-+---------------------------------------+--------------------+---------------+
-| `tiller_tag`_                         | see below          | ""            |
-+---------------------------------------+--------------------+---------------+
-| `tiller_namespace`_                   | see below          | see below     |
-+---------------------------------------+--------------------+---------------+
 | `helm_client_url`_                    | see below          | see below     |
 +---------------------------------------+--------------------+---------------+
 | `helm_client_sha256`_                 | see below          | see below     |
@@ -1499,22 +1492,6 @@ _`k8s_keystone_auth_tag`
   Train default: v1.14.0
   Ussuri default: v1.18.0
 
-_`tiller_enabled`
-  If set to true, tiller will be deployed in the kube-system namespace.
-  Ussuri default: false
-  Train default: false
-
-_`tiller_tag`
-  This label allows users to override the default container tag for Tiller.
-  For additional tags, `refer to Tiller page
-  <https://github.com/helm/helm/tags>`_ and look for tags<v3.0.0.
-  Train default: v2.12.3
-  Ussuri default: v2.16.7
-
-_`tiller_namespace`
-  The namespace in which Tiller and Helm v2 chart install jobs are installed.
-  Default: magnum-tiller
-
 _`helm_client_url`
   URL of the helm client binary.
   Default: ''
@@ -1526,8 +1503,7 @@ _`helm_client_sha256`
 _`helm_client_tag`
   This label allows users to override the default container tag for Helm
   client.  For additional tags, `refer to Helm client page
-  <https://github.com/helm/helm/tags>`_. You must use identical tiller_tag if
-  you wish to use Tiller (for helm_client_tag<v3.0.0).
+  <https://github.com/helm/helm/tags>`_.
   Ussuri default: v3.2.1
 
 _`master_lb_floating_ip_enabled`
@@ -1739,8 +1715,6 @@ _`ingress_controller`
   Controller is configured. For more details about octavia-ingress-controller
   please refer to `cloud-provider-openstack document
   <https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/octavia-ingress-controller/using-octavia-ingress-controller.md>`_
-  To use 'nginx' ingress controller, tiller_enabled must be true when using
-  helm_client_tag<v3.0.0.
 
 _`ingress_controller_role`
   This label defines the role nodes should have to run an instance of the

doc/source/user/monitoring.rst

@@ -28,8 +28,6 @@ The installation of these services is controlled with the following labels:
 _`metrics_server_enabled`
   metrics_server_enabled is used to enable disable the installation of
   the metrics server.
-  To use this service tiller_enabled must be true when using
-  helm_client_tag<v3.0.0.
   Train default: true
   Stein default: true
 

magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh → magnum/drivers/common/templates/kubernetes/fragments/calico-service-v3-21-x.sh

@@ -1,4 +1,4 @@
-step="calico-service"
+step="calico-service-v3-21-x"
 printf "Starting to run ${step}\n"
 
 set -e
@@ -4441,7 +4441,7 @@ metadata:
 
 # This manifest creates a Pod Disruption Budget for Controller to allow K8s Cluster Autoscaler to evict
 
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: calico-kube-controllers