Merge pull request #6838 from mikesplain/automated-cherry-pick-of-#6837-

#6823-origin-release-1.13

Automated cherry pick of #6837: Add t3a family #6823: Canal manifest updates for k8s v1.12+

hack/machine_types/vpc_ip_resource_limit.go

@@ -200,6 +200,13 @@ var InstanceENIsAvailable = map[string]int{
 	"t3.large":      3,
 	"t3.xlarge":     4,
 	"t3.2xlarge":    4,
+	"t3a.nano":      2,
+	"t3a.micro":     2,
+	"t3a.small":     3,
+	"t3a.medium":    3,
+	"t3a.large":     3,
+	"t3a.xlarge":    4,
+	"t3a.2xlarge":   4,
 	"u-6tb1.metal":  5,
 	"u-9tb1.metal":  5,
 	"u-12tb1.metal": 5,
@@ -391,6 +398,13 @@ var InstanceIPsAvailable = map[string]int64{
 	"t3.large":      12,
 	"t3.xlarge":     15,
 	"t3.2xlarge":    15,
+	"t3a.nano":      2,
+	"t3a.micro":     2,
+	"t3a.small":     4,
+	"t3a.medium":    6,
+	"t3a.large":     12,
+	"t3a.xlarge":    15,
+	"t3a.2xlarge":   15,
 	"u-6tb1.metal":  30,
 	"u-9tb1.metal":  30,
 	"u-12tb1.metal": 30,

pkg/apis/kops/networking.go

@@ -110,6 +110,8 @@ type CanalNetworkingSpec struct {
 	// LogSeveritySys the severity to set for logs which are sent to syslog
 	// Default: INFO (other options: DEBUG, WARNING, ERROR, CRITICAL, NONE)
 	LogSeveritySys string `json:"logSeveritySys,omitempty"`
+	// MTU to be set in the cni-network-config (default: 1500)
+	MTU *int32 `json:"mtu,omitempty"`
 	// PrometheusGoMetricsEnabled enables Prometheus Go runtime metrics collection
 	PrometheusGoMetricsEnabled bool `json:"prometheusGoMetricsEnabled,omitempty"`
 	// PrometheusMetricsEnabled can be set to enable the experimental Prometheus

pkg/apis/kops/v1alpha1/networking.go

@@ -110,6 +110,8 @@ type CanalNetworkingSpec struct {
 	// LogSeveritySys the severity to set for logs which are sent to syslog
 	// Default: INFO (other options: DEBUG, WARNING, ERROR, CRITICAL, NONE)
 	LogSeveritySys string `json:"logSeveritySys,omitempty"`
+	// MTU to be set in the cni-network-config (default: 1500)
+	MTU *int32 `json:"mtu,omitempty"`
 	// PrometheusGoMetricsEnabled enables Prometheus Go runtime metrics collection
 	PrometheusGoMetricsEnabled bool `json:"prometheusGoMetricsEnabled,omitempty"`
 	// PrometheusMetricsEnabled can be set to enable the experimental Prometheus

pkg/apis/kops/v1alpha2/networking.go

@@ -110,6 +110,8 @@ type CanalNetworkingSpec struct {
 	// LogSeveritySys the severity to set for logs which are sent to syslog
 	// Default: INFO (other options: DEBUG, WARNING, ERROR, CRITICAL, NONE)
 	LogSeveritySys string `json:"logSeveritySys,omitempty"`
+	// MTU to be set in the cni-network-config (default: 1500)
+	MTU *int32 `json:"mtu,omitempty"`
 	// PrometheusGoMetricsEnabled enables Prometheus Go runtime metrics collection
 	PrometheusGoMetricsEnabled bool `json:"prometheusGoMetricsEnabled,omitempty"`
 	// PrometheusMetricsEnabled can be set to enable the experimental Prometheus

pkg/model/openstackmodel/firewall.go

@@ -21,6 +21,7 @@ import (
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstacktasks"
+
 	//TODO: Replace with klog
 	"github.com/golang/glog"
 	"k8s.io/kops/pkg/dns"

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.12.yaml.template

@@ -1,8 +1,8 @@
-# Canal Version v3.5.0
-# https://docs.projectcalico.org/v3.5/releases#v3.5.0
+# Canal Version v3.6.1
+# https://docs.projectcalico.org/v3.6/release-notes/#v361
 # This manifest includes the following component versions:
-#   calico/node:v3.5.0
-#   calico/cni:v3.5.0
+#   calico/node:v3.6.1
+#   calico/cni:v3.6.1
 #   coreos/flannel:v0.11.0
 
 # This ConfigMap is used to configure a self-hosted Canal installation.
@@ -23,6 +23,9 @@ data:
   # the pod network.
   masquerade: "true"
 
+  # MTU default is 1500, can be overridden
+  veth_mtu: "{{- or .Networking.Canal.MTU "1500" }}"
+
   # The CNI network configuration to install on each node.  The special
   # values in this config will be automatically populated.
   cni_network_config: |-
@@ -34,6 +37,7 @@ data:
           "type": "calico",
           "log_level": "info",
           "datastore_type": "kubernetes",
+          "mtu": __CNI_MTU__,
           "nodename": "__KUBERNETES_NODE_NAME__",
           "ipam": {
             "type": "host-local",
@@ -115,12 +119,18 @@ spec:
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: calico/cni:v3.5.0
+          image: calico/cni:v3.6.1
           command: ["/install-cni.sh"]
           env:
             # Name of the CNI config file to create.
             - name: CNI_CONF_NAME
               value: "10-canal.conflist"
+            # CNI MTU Config variable
+            - name: CNI_MTU
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: veth_mtu
             # The CNI network config to install on each node.
             - name: CNI_NETWORK_CONFIG
               valueFrom:
@@ -145,7 +155,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: calico/node:v3.5.0
+          image: calico/node:v3.6.1
           env:
             # Use Kubernetes API as the backing datastore.
             - name: DATASTORE_TYPE
@@ -173,6 +183,11 @@ spec:
             # Disable file logging so `kubectl logs` works.
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
+            - name: FELIX_IPINIPMTU
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: veth_mtu
             # Disable IPv6 on Kubernetes.
             - name: FELIX_IPV6SUPPORT
               value: "false"
@@ -367,6 +382,7 @@ rules:
       - globalbgpconfigs
       - bgpconfigurations
       - ippools
+      - ipamblocks
       - globalnetworkpolicies
       - globalnetworksets
       - networkpolicies

upup/pkg/fi/cloudup/awsup/machine_types.go

@@ -1826,6 +1826,84 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		Burstable:         true,
 	},
 
+	// t3a family
+	{
+		Name:              "t3a.nano",
+		MemoryGB:          0.5,
+		ECU:               0 * BurstableCreditsToECUS,
+		Cores:             2,
+		InstanceENIs:      2,
+		InstanceIPsPerENI: 2,
+		EphemeralDisks:    nil,
+		Burstable:         true,
+	},
+
+	{
+		Name:              "t3a.micro",
+		MemoryGB:          1,
+		ECU:               0 * BurstableCreditsToECUS,
+		Cores:             2,
+		InstanceENIs:      2,
+		InstanceIPsPerENI: 2,
+		EphemeralDisks:    nil,
+		Burstable:         true,
+	},
+
+	{
+		Name:              "t3a.small",
+		MemoryGB:          2,
+		ECU:               0 * BurstableCreditsToECUS,
+		Cores:             2,
+		InstanceENIs:      3,
+		InstanceIPsPerENI: 4,
+		EphemeralDisks:    nil,
+		Burstable:         true,
+	},
+
+	{
+		Name:              "t3a.medium",
+		MemoryGB:          4,
+		ECU:               0 * BurstableCreditsToECUS,
+		Cores:             2,
+		InstanceENIs:      3,
+		InstanceIPsPerENI: 6,
+		EphemeralDisks:    nil,
+		Burstable:         true,
+	},
+
+	{
+		Name:              "t3a.large",
+		MemoryGB:          8,
+		ECU:               0 * BurstableCreditsToECUS,
+		Cores:             2,
+		InstanceENIs:      3,
+		InstanceIPsPerENI: 12,
+		EphemeralDisks:    nil,
+		Burstable:         true,
+	},
+
+	{
+		Name:              "t3a.xlarge",
+		MemoryGB:          16,
+		ECU:               0 * BurstableCreditsToECUS,
+		Cores:             4,
+		InstanceENIs:      4,
+		InstanceIPsPerENI: 15,
+		EphemeralDisks:    nil,
+		Burstable:         true,
+	},
+
+	{
+		Name:              "t3a.2xlarge",
+		MemoryGB:          32,
+		ECU:               0 * BurstableCreditsToECUS,
+		Cores:             8,
+		InstanceENIs:      4,
+		InstanceIPsPerENI: 15,
+		EphemeralDisks:    nil,
+		Burstable:         true,
+	},
+
 	// x1 family
 	{
 		Name:              "x1.16xlarge",

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -893,13 +893,12 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.Canal != nil {
 		key := "networking.projectcalico.org.canal"
-		// 2.6.3-kops.1 = 2.6.2 with kops manifest tweaks.  This should go away with the next version bump.
 		versions := map[string]string{
 			"pre-k8s-1.6": "2.4.2-kops.2",
 			"k8s-1.6":     "2.4.2-kops.2",
 			"k8s-1.8":     "2.6.7-kops.3",
 			"k8s-1.9":     "3.2.3-kops.1",
-			"k8s-1.12":    "3.5.0",
+			"k8s-1.12":    "3.6.1",
 		}
 		{
 			id := "pre-k8s-1.6"

upup/pkg/fi/cloudup/openstacktasks/lb.go

@@ -18,9 +18,10 @@ package openstacktasks
 
 import (
 	"fmt"
-	"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
 	"time"
 
+	"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
+
 	"github.com/golang/glog"
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers"