From cd26be16c66ac80ff463a8507eeb43718c763f35 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Tue, 18 Jun 2019 16:36:22 -0400 Subject: [PATCH] calico: drop calico_cni_tag This variable was not being used anywhere so it was an extra parameter that served no purpose. Change-Id: I7ae84ab6683530d95a8bca51487558b381f9cef2 --- doc/source/user/index.rst | 3 --- .../kubernetes/fragments/write-heat-params-master.sh | 1 - magnum/drivers/heat/k8s_coreos_template_def.py | 2 +- magnum/drivers/heat/k8s_fedora_template_def.py | 2 +- magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml | 6 ------ magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml | 4 ---- .../drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml | 6 ------ .../drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml | 5 ----- magnum/tests/unit/drivers/test_template_definition.py | 6 ------ 9 files changed, 2 insertions(+), 33 deletions(-) diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index 6af9439bdd..2141cced06 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -2376,9 +2376,6 @@ _`calico_ipv4pool` _`calico_tag` Tag of the calico containers used to provision the calico node -_`calico_cni_tag` - Tag of the cni used to provision the calico node - _`calico_kube_controllers_tag` Tag of the kube_controllers used to provision the calico node diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh index 1cb0882988..cf3e330ac3 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh @@ -68,7 +68,6 @@ HEAT_PARAMS=/etc/sysconfig/heat-params CERT_MANAGER_API="$CERT_MANAGER_API" CA_KEY="$CA_KEY" CALICO_TAG="$CALICO_TAG" - CALICO_CNI_TAG="$CALICO_CNI_TAG" CALICO_KUBE_CONTROLLERS_TAG="$CALICO_KUBE_CONTROLLERS_TAG" CALICO_IPV4POOL="$CALICO_IPV4POOL" INGRESS_CONTROLLER="$INGRESS_CONTROLLER" diff --git a/magnum/drivers/heat/k8s_coreos_template_def.py b/magnum/drivers/heat/k8s_coreos_template_def.py index c965b76205..3eb03c1ec4 100644 --- a/magnum/drivers/heat/k8s_coreos_template_def.py +++ b/magnum/drivers/heat/k8s_coreos_template_def.py @@ -129,7 +129,7 @@ class CoreOSK8sTemplateDefinition(k8s_template_def.K8sTemplateDefinition): label_list = ['coredns_tag', 'kube_tag', 'container_infra_prefix', 'availability_zone', - 'calico_tag', 'calico_cni_tag', + 'calico_tag', 'calico_kube_controllers_tag', 'calico_ipv4pool', 'etcd_tag', 'flannel_tag'] for label in label_list: diff --git a/magnum/drivers/heat/k8s_fedora_template_def.py b/magnum/drivers/heat/k8s_fedora_template_def.py index 20a171d30e..7a0dc7b7a4 100644 --- a/magnum/drivers/heat/k8s_fedora_template_def.py +++ b/magnum/drivers/heat/k8s_fedora_template_def.py @@ -124,7 +124,7 @@ class K8sFedoraTemplateDefinition(k8s_template_def.K8sTemplateDefinition): 'kube_tag', 'container_infra_prefix', 'availability_zone', 'cgroup_driver', - 'calico_tag', 'calico_cni_tag', + 'calico_tag', 'calico_kube_controllers_tag', 'calico_ipv4pool', 'etcd_tag', 'flannel_tag', 'flannel_cni_tag', 'cloud_provider_enabled', 'cloud_provider_tag', diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml index bf1f69cacf..6a5ebcfe9e 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml @@ -428,11 +428,6 @@ parameters: description: tag of the calico containers used to provision the calico node default: v2.6.7 - calico_cni_tag: - type: string - description: tag of the cni used to provision the calico node - default: v1.11.2 - calico_kube_controllers_tag: type: string description: tag of the kube_controllers used to provision the calico node @@ -705,7 +700,6 @@ resources: ca_key: {get_param: ca_key} cert_manager_api: {get_param: cert_manager_api} calico_tag: {get_param: calico_tag} - calico_cni_tag: {get_param: calico_cni_tag} calico_kube_controllers_tag: {get_param: calico_kube_controllers_tag} calico_ipv4pool: {get_param: calico_ipv4pool} pods_network_cidr: {get_param: pods_network_cidr} diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml index f601298153..61a779fbe8 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml @@ -299,10 +299,6 @@ parameters: type: string description: tag of the calico containers used to provision the calico node - calico_cni_tag: - type: string - description: tag of the cni used to provision the calico node - calico_kube_controllers_tag: type: string description: tag of the kube_controllers used to provision the calico node diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 11ac51120a..96f7ac976c 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -455,11 +455,6 @@ parameters: description: tag of the calico containers used to provision the calico node default: v3.3.6 - calico_cni_tag: - type: string - description: tag of the cni used to provision the calico node - default: v1.11.2 - calico_kube_controllers_tag: type: string description: tag of the kube_controllers used to provision the calico node @@ -908,7 +903,6 @@ resources: ca_key: {get_param: ca_key} cert_manager_api: {get_param: cert_manager_api} calico_tag: {get_param: calico_tag} - calico_cni_tag: {get_param: calico_cni_tag} calico_kube_controllers_tag: {get_param: calico_kube_controllers_tag} calico_ipv4pool: {get_param: calico_ipv4pool} pods_network_cidr: {get_param: pods_network_cidr} diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index fb48d6b06f..2bdf1d0f16 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -327,10 +327,6 @@ parameters: type: string description: tag of the calico containers used to provision the calico node - calico_cni_tag: - type: string - description: tag of the cni used to provision the calico node - calico_kube_controllers_tag: type: string description: tag of the kube_controllers used to provision the calico node @@ -593,7 +589,6 @@ resources: "$CERT_MANAGER_API": {get_param: cert_manager_api} "$CA_KEY": {get_param: ca_key} "$CALICO_TAG": {get_param: calico_tag} - "$CALICO_CNI_TAG": {get_param: calico_cni_tag} "$CALICO_KUBE_CONTROLLERS_TAG": {get_param: calico_kube_controllers_tag} "$CALICO_IPV4POOL": {get_param: calico_ipv4pool} "$INGRESS_CONTROLLER": {get_param: ingress_controller} diff --git a/magnum/tests/unit/drivers/test_template_definition.py b/magnum/tests/unit/drivers/test_template_definition.py index 39ead86537..5fa5d85e10 100644 --- a/magnum/tests/unit/drivers/test_template_definition.py +++ b/magnum/tests/unit/drivers/test_template_definition.py @@ -462,8 +462,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase): cert_manager_api = mock_cluster.labels.get('cert_manager_api') calico_tag = mock_cluster.labels.get( 'calico_tag') - calico_cni_tag = mock_cluster.labels.get( - 'calico_cni_tag') calico_kube_controllers_tag = mock_cluster.labels.get( 'calico_kube_controllers_tag') calico_ipv4pool = mock_cluster.labels.get( @@ -570,7 +568,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase): 'availability_zone': availability_zone, 'cert_manager_api': cert_manager_api, 'calico_tag': calico_tag, - 'calico_cni_tag': calico_cni_tag, 'calico_kube_controllers_tag': calico_kube_controllers_tag, 'calico_ipv4pool': calico_ipv4pool, 'cgroup_driver': cgroup_driver, @@ -865,8 +862,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase): cert_manager_api = mock_cluster.labels.get('cert_manager_api') calico_tag = mock_cluster.labels.get( 'calico_tag') - calico_cni_tag = mock_cluster.labels.get( - 'calico_cni_tag') calico_kube_controllers_tag = mock_cluster.labels.get( 'calico_kube_controllers_tag') calico_ipv4pool = mock_cluster.labels.get( @@ -975,7 +970,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase): 'availability_zone': availability_zone, 'cert_manager_api': cert_manager_api, 'calico_tag': calico_tag, - 'calico_cni_tag': calico_cni_tag, 'calico_kube_controllers_tag': calico_kube_controllers_tag, 'calico_ipv4pool': calico_ipv4pool, 'cgroup_driver': cgroup_driver,