Browse Source

Merge "calico: drop calico_cni_tag"

changes/14/629514/10
Zuul 3 years ago committed by Gerrit Code Review
parent
commit
83569e8394
  1. 3
      doc/source/user/index.rst
  2. 1
      magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh
  3. 2
      magnum/drivers/heat/k8s_coreos_template_def.py
  4. 2
      magnum/drivers/heat/k8s_fedora_template_def.py
  5. 6
      magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml
  6. 4
      magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml
  7. 6
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
  8. 5
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
  9. 6
      magnum/tests/unit/drivers/test_template_definition.py

3
doc/source/user/index.rst

@ -2409,9 +2409,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

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

@ -72,7 +72,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"

2
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:

2
magnum/drivers/heat/k8s_fedora_template_def.py

@ -130,7 +130,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',

6
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}

4
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

6
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml

@ -460,11 +460,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
@ -937,7 +932,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}

5
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

@ -331,10 +331,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
@ -623,7 +619,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}

6
magnum/tests/unit/drivers/test_template_definition.py

@ -493,8 +493,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(
@ -609,7 +607,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,
@ -922,8 +919,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(
@ -1040,7 +1035,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,

Loading…
Cancel
Save