Merge pull request #13901 from hakman/calico_single_manifest

Use Calico v3.23 for Kubernetes 1.22+

cmd/kops/integration_test.go

@@ -199,7 +199,7 @@ func (i integrationTest) withDefaultAddons24() *integrationTest {
 const (
 	awsCCMAddon         = "aws-cloud-controller.addons.k8s.io-k8s-1.18"
 	awsEBSCSIAddon      = "aws-ebs-csi-driver.addons.k8s.io-k8s-1.17"
-	calicoAddon         = "networking.projectcalico.org-k8s-1.23"
+	calicoAddon         = "networking.projectcalico.org-k8s-1.22"
 	certManagerAddon    = "certmanager.io-k8s-1.16"
 	ciliumAddon         = "networking.cilium.io-k8s-1.16"
 	dnsControllerAddon  = "dns-controller.addons.k8s.io-k8s-1.12"

tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content

@@ -53,8 +53,8 @@ spec:
     selector:
       k8s-addon: storage-aws.addons.k8s.io
     version: 9.99.0
-  - id: k8s-1.23
-    manifest: networking.projectcalico.org/k8s-1.23.yaml
+  - id: k8s-1.22
+    manifest: networking.projectcalico.org/k8s-1.22.yaml
     manifestHash: 5bf23f352fc3520fd6737474625969d90eba2794fd5a748f75a71505eda06db3
     name: networking.projectcalico.org
     selector:

tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf

@@ -720,10 +720,10 @@ resource "aws_s3_object" "minimal-ipv6-example-com-addons-limit-range-addons-k8s
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "minimal-ipv6-example-com-addons-networking-projectcalico-org-k8s-1-23" {
+resource "aws_s3_object" "minimal-ipv6-example-com-addons-networking-projectcalico-org-k8s-1-22" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.23_content")
-  key                    = "clusters.example.com/minimal-ipv6.example.com/addons/networking.projectcalico.org/k8s-1.23.yaml"
+  content                = file("${path.module}/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.22_content")
+  key                    = "clusters.example.com/minimal-ipv6.example.com/addons/networking.projectcalico.org/k8s-1.22.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content

@@ -53,8 +53,8 @@ spec:
     selector:
       k8s-addon: storage-aws.addons.k8s.io
     version: 9.99.0
-  - id: k8s-1.23
-    manifest: networking.projectcalico.org/k8s-1.23.yaml
+  - id: k8s-1.22
+    manifest: networking.projectcalico.org/k8s-1.22.yaml
     manifestHash: 9e337fe40420c5145cd25224a03c69838f945237096820cbe9abfaaa09c8b55a
     name: networking.projectcalico.org
     selector:

tests/integration/update_cluster/privatecalico/kubernetes.tf

@@ -878,10 +878,10 @@ resource "aws_s3_object" "privatecalico-example-com-addons-limit-range-addons-k8
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "privatecalico-example-com-addons-networking-projectcalico-org-k8s-1-23" {
+resource "aws_s3_object" "privatecalico-example-com-addons-networking-projectcalico-org-k8s-1-22" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.23_content")
-  key                    = "clusters.example.com/privatecalico.example.com/addons/networking.projectcalico.org/k8s-1.23.yaml"
+  content                = file("${path.module}/data/aws_s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.22_content")
+  key                    = "clusters.example.com/privatecalico.example.com/addons/networking.projectcalico.org/k8s-1.22.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content

@@ -48,7 +48,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.22
     manifest: networking.projectcalico.org.canal/k8s-1.22.yaml
-    manifestHash: ff8bbeaba0ec65a71b29563278683bcfe8130d023a388b5321f347b1ff932136
+    manifestHash: 29ccdd676c3e714cff126169a51cdc21bf058b59346650d9e32cfd643462529d
     name: networking.projectcalico.org.canal
     selector:
       role.kubernetes.io/networking: "1"

tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-networking.projectcalico.org.canal-k8s-1.22_content

@@ -4739,7 +4739,7 @@ metadata:
 
 ---
 
-apiVersion: policy/v1
+apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   creationTimestamp: null

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

@@ -4408,7 +4408,7 @@ spec:
 
 # This manifest creates a Pod Disruption Budget for Typha to allow K8s Cluster Autoscaler to evict
 
-apiVersion: policy/v1beta1
+apiVersion: policy/v1{{ if IsKubernetesLT "1.23" }}beta1{{ end }}
 kind: PodDisruptionBudget
 metadata:
   name: calico-typha
@@ -4826,7 +4826,7 @@ metadata:
 
 # This manifest creates a Pod Disruption Budget for Controller to allow K8s Cluster Autoscaler to evict
 
-apiVersion: policy/v1
+apiVersion: policy/v1{{ if IsKubernetesLT "1.23" }}beta1{{ end }}
 kind: PodDisruptionBudget
 metadata:
   name: calico-kube-controllers

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

@@ -4427,7 +4427,7 @@ spec:
 
 # This manifest creates a Pod Disruption Budget for Typha to allow K8s Cluster Autoscaler to evict
 
-apiVersion: policy/v1
+apiVersion: policy/v1{{ if IsKubernetesLT "1.23" }}beta1{{ end }}
 kind: PodDisruptionBudget
 metadata:
   name: calico-typha
@@ -4909,7 +4909,7 @@ metadata:
 
 # This manifest creates a Pod Disruption Budget for Controller to allow K8s Cluster Autoscaler to evict
 
-apiVersion: policy/v1
+apiVersion: policy/v1{{ if IsKubernetesLT "1.23" }}beta1{{ end }}
 kind: PodDisruptionBudget
 metadata:
   name: calico-kube-controllers

upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go

@@ -902,8 +902,8 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*Addon
 	if b.Cluster.Spec.Networking.Calico != nil {
 		key := "networking.projectcalico.org"
 
-		if b.IsKubernetesGTE("v1.23.0") {
-			id := "k8s-1.23"
+		if b.IsKubernetesGTE("v1.22.0") {
+			id := "k8s-1.22"
 			location := key + "/" + id + ".yaml"
 
 			addons.Add(&channelsapi.AddonSpec{

upup/pkg/fi/cloudup/template_functions.go

@@ -335,6 +335,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 	}
 
 	dest["IsKubernetesGTE"] = tf.IsKubernetesGTE
+	dest["IsKubernetesLT"] = tf.IsKubernetesLT
 
 	return nil
 }