Merge "Remove calico_kube_controllers_tag label"

Author: Zuul

magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh

@@ -100,7 +100,6 @@ DNS_CLUSTER_DOMAIN="$DNS_CLUSTER_DOMAIN"
 CERT_MANAGER_API="$CERT_MANAGER_API"
 CA_KEY="$CA_KEY"
 CALICO_TAG="$CALICO_TAG"
-CALICO_KUBE_CONTROLLERS_TAG="$CALICO_KUBE_CONTROLLERS_TAG"
 CALICO_IPV4POOL="$CALICO_IPV4POOL"
 CALICO_IPV4POOL_IPIP="$CALICO_IPV4POOL_IPIP"
 INGRESS_CONTROLLER="$INGRESS_CONTROLLER"

magnum/drivers/heat/k8s_coreos_template_def.py

@@ -61,7 +61,7 @@ def get_params(self, context, cluster_template, cluster, **kwargs):
                       'kube_tag', 'container_infra_prefix',
                       'availability_zone',
                       'calico_tag',
-                      'calico_kube_controllers_tag', 'calico_ipv4pool',
+                      'calico_ipv4pool',
                       'calico_ipv4pool_ipip',
                       'etcd_tag', 'flannel_tag']
 

magnum/drivers/heat/k8s_fedora_template_def.py

@@ -83,7 +83,7 @@ def get_params(self, context, cluster_template, cluster, **kwargs):
                       'containerd_tarball_url',
                       'containerd_tarball_sha256',
                       'calico_tag',
-                      'calico_kube_controllers_tag', 'calico_ipv4pool',
+                      'calico_ipv4pool',
                       'calico_ipv4pool_ipip',
                       'cinder_csi_enabled', 'cinder_csi_plugin_tag',
                       'csi_attacher_tag', 'csi_provisioner_tag',

magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

@@ -585,11 +585,6 @@ parameters:
     description: tag of the calico containers used to provision the calico node
     default: v3.21.2
 
-  calico_kube_controllers_tag:
-    type: string
-    description: tag of the kube_controllers used to provision the calico node
-    default: v1.0.3
-
   calico_ipv4pool:
     type: string
     description: Configure the IP pool from which Pod IPs will be chosen
@@ -1320,7 +1315,6 @@ resources:
           ca_key: {get_param: ca_key}
           cert_manager_api: {get_param: cert_manager_api}
           calico_tag: {get_param: calico_tag}
-          calico_kube_controllers_tag: {get_param: calico_kube_controllers_tag}
           calico_ipv4pool: {get_param: calico_ipv4pool}
           calico_ipv4pool_ipip: {get_param: calico_ipv4pool_ipip}
           pods_network_cidr: {get_param: pods_network_cidr}

magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml

@@ -373,10 +373,6 @@ parameters:
     type: string
     description: tag of the calico containers used to provision the calico node
 
-  calico_kube_controllers_tag:
-    type: string
-    description: tag of the kube_controllers used to provision the calico node
-
   calico_ipv4pool:
     type: string
     description: Configure the IP pool from which Pod IPs will be chosen
@@ -847,7 +843,6 @@ resources:
                   "$CERT_MANAGER_API": {get_param: cert_manager_api}
                   "$CA_KEY": {get_param: ca_key}
                   "$CALICO_TAG": {get_param: calico_tag}
-                  "$CALICO_KUBE_CONTROLLERS_TAG": {get_param: calico_kube_controllers_tag}
                   "$CALICO_IPV4POOL": {get_param: calico_ipv4pool}
                   "$CALICO_IPV4POOL_IPIP": {get_param: calico_ipv4pool_ipip}
                   "$INGRESS_CONTROLLER": {get_param: ingress_controller}

magnum/tests/unit/drivers/test_template_definition.py

@@ -423,8 +423,6 @@ def test_k8s_get_params(self, mock_generate_csr_and_key,
         cert_manager_api = mock_cluster.labels.get('cert_manager_api')
         calico_tag = mock_cluster.labels.get(
             'calico_tag')
-        calico_kube_controllers_tag = mock_cluster.labels.get(
-            'calico_kube_controllers_tag')
         calico_ipv4pool = mock_cluster.labels.get(
             'calico_ipv4pool')
         calico_ipv4pool_ipip = mock_cluster.labels.get(
@@ -602,7 +600,6 @@ def test_k8s_get_params(self, mock_generate_csr_and_key,
             'availability_zone': availability_zone,
             'cert_manager_api': cert_manager_api,
             'calico_tag': calico_tag,
-            'calico_kube_controllers_tag': calico_kube_controllers_tag,
             'calico_ipv4pool': calico_ipv4pool,
             'calico_ipv4pool_ipip': calico_ipv4pool_ipip,
             'cgroup_driver': cgroup_driver,
@@ -977,8 +974,6 @@ def test_k8s_get_params_insecure(self, mock_generate_csr_and_key,
         cert_manager_api = mock_cluster.labels.get('cert_manager_api')
         calico_tag = mock_cluster.labels.get(
             'calico_tag')
-        calico_kube_controllers_tag = mock_cluster.labels.get(
-            'calico_kube_controllers_tag')
         calico_ipv4pool = mock_cluster.labels.get(
             'calico_ipv4pool')
         calico_ipv4pool_ipip = mock_cluster.labels.get(
@@ -1160,7 +1155,6 @@ def test_k8s_get_params_insecure(self, mock_generate_csr_and_key,
             'availability_zone': availability_zone,
             'cert_manager_api': cert_manager_api,
             'calico_tag': calico_tag,
-            'calico_kube_controllers_tag': calico_kube_controllers_tag,
             'calico_ipv4pool': calico_ipv4pool,
             'calico_ipv4pool_ipip': calico_ipv4pool_ipip,
             'cgroup_driver': cgroup_driver,