Merge "Upgrade to calico_tag=v3.21.2"

Author: Zuul

doc/source/user/index.rst

@@ -2719,6 +2719,8 @@ _`calico_tag`
   Stein default: v2.6.7
   Train default: v3.3.6
   Ussuri default: v3.13.1
+  Victoria default: v3.13.1
+  Wallaby default: v3.13.1
 
 
 Besides, the Calico network driver needs kube_tag with v1.9.3 or later, because

magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh

@@ -52,6 +52,7 @@ PASSWORD="$PASSWORD"
 CLUSTER_NETWORK="$CLUSTER_NETWORK"
 CLUSTER_NETWORK_NAME="$CLUSTER_NETWORK_NAME"
 CLUSTER_SUBNET="$CLUSTER_SUBNET"
+CLUSTER_SUBNET_CIDR="$CLUSTER_SUBNET_CIDR"
 TLS_DISABLED="$TLS_DISABLED"
 KUBE_DASHBOARD_ENABLED="$KUBE_DASHBOARD_ENABLED"
 INFLUX_GRAFANA_DASHBOARD_ENABLED="$INFLUX_GRAFANA_DASHBOARD_ENABLED"
@@ -155,6 +156,7 @@ CONTAINERD_TARBALL_URL="$CONTAINERD_TARBALL_URL"
 CONTAINERD_TARBALL_SHA256="$CONTAINERD_TARBALL_SHA256"
 POST_INSTALL_MANIFEST_URL="$POST_INSTALL_MANIFEST_URL"
 METRICS_SCRAPER_TAG="$METRICS_SCRAPER_TAG"
+CLUSTER_SUBNET_CIDR="$CLUSTER_SUBNET_CIDR"
 EOF
 }
 

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

@@ -1214,6 +1214,7 @@ resources:
           fixed_network: {get_attr: [network, fixed_network]}
           fixed_network_name: {get_param: fixed_network_name}
           fixed_subnet: {get_attr: [network, fixed_subnet]}
+          fixed_subnet_cidr: {get_param: fixed_subnet_cidr}
           api_pool_id: {get_attr: [api_lb, pool_id]}
           etcd_pool_id: {get_attr: [etcd_lb, pool_id]}
           username: {get_param: username}

magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml

@@ -212,6 +212,10 @@ parameters:
     type: string
     description: Subnet from which to allocate fixed addresses.
 
+  fixed_subnet_cidr:
+    type: string
+    description: network range for fixed ip network
+
   network_driver:
     type: string
     description: network driver to use for instantiating container networks
@@ -779,6 +783,7 @@ resources:
                   "$CLUSTER_NETWORK": {get_param: fixed_network}
                   "$CLUSTER_NETWORK_NAME": {get_param: fixed_network_name}
                   "$CLUSTER_SUBNET": {get_param: fixed_subnet}
+                  "$CLUSTER_SUBNET_CIDR": {get_param: fixed_subnet_cidr}
                   "$TLS_DISABLED": {get_param: tls_disabled}
                   "$TRAEFIK_INGRESS_CONTROLLER_TAG": {get_param: traefik_ingress_controller_tag}
                   "$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}

magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

@@ -93,6 +93,10 @@ parameters:
     description: uuid/name of an existing subnet to use to provision machines
     default: ""
 
+  fixed_subnet_cidr:
+    type: string
+    description: network range for fixed ip network
+
   master_image:
     type: string
     description: glance image used to boot the server
@@ -578,7 +582,7 @@ parameters:
   calico_tag:
     type: string
     description: tag of the calico containers used to provision the calico node
-    default: v3.13.1
+    default: v3.21.2
 
   calico_kube_controllers_tag:
     type: string
@@ -1242,6 +1246,7 @@ resources:
           fixed_network: {get_attr: [network, fixed_network]}
           fixed_network_name: {get_param: fixed_network_name}
           fixed_subnet: {get_attr: [network, fixed_subnet]}
+          fixed_subnet_cidr: {get_param: fixed_subnet_cidr}
           api_pool_id: {get_attr: [api_lb, pool_id]}
           etcd_pool_id: {get_attr: [etcd_lb, pool_id]}
           username: {get_param: username}

magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

@@ -216,6 +216,10 @@ parameters:
     type: string
     description: Subnet from which to allocate fixed addresses.
 
+  fixed_subnet_cidr:
+    type: string
+    description: network range for fixed ip network
+
   network_driver:
     type: string
     description: network driver to use for instantiating container networks
@@ -797,7 +801,9 @@ resources:
                   "$PASSWORD": {get_param: password}
                   "$CLUSTER_NETWORK": {get_param: fixed_network}
                   "$CLUSTER_NETWORK_NAME": {get_param: fixed_network_name}
+                  "$CLUSTER_SUBNET_CIDR": {get_param: fixed_subnet_cidr}
                   "$CLUSTER_SUBNET": {get_param: fixed_subnet}
+                  "$CLUSTER_SUBNET_CIDR": {get_param: fixed_subnet_cidr}
                   "$TLS_DISABLED": {get_param: tls_disabled}
                   "$TRAEFIK_INGRESS_CONTROLLER_TAG": {get_param: traefik_ingress_controller_tag}
                   "$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}

magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Upgrade to calico_tag=v3.21.2. Additionally, use fixed subnet CIDR for
+    IP_AUTODETECTION_METHOD supported from v3.16.x onwards.