Update Calico from v3.21.2 to v3.22.1

* Calico aims to fix projectcalico/calico#5011
poseidon · Mar 11, 2022 · fa4745d · fa4745d
1 parent db159bb
commit fa4745d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/resources/calico/crd-felixconfigurations.yaml b/resources/calico/crd-felixconfigurations.yaml
@@ -210,6 +210,9 @@ spec:
                     pattern: ^.*
                     x-kubernetes-int-or-string: true
                   type: array
+                logDebugFilenameRegex:
+                  description: LogDebugFilenameRegex controls which source code files have their Debug log output included in the logs. Only logs from files with names that match the given regular expression are included.  The filter only applies to Debug level logs.
+                  type: string
                 logFilePath:
                   description: 'LogFilePath is the full path to the Felix log. Set to none to disable file logging. [Default: /var/log/calico/felix.log]'
                   type: string

diff --git a/resources/calico/crd-ippools.yaml b/resources/calico/crd-ippools.yaml
@@ -38,7 +38,7 @@ spec:
                   description: The pool CIDR.
                   type: string
                 disableBGPExport:
-                  description: 'Disable exporting routes from this IP Pool’s CIDR over BGP. [Default: false]'
+                  description: 'Disable exporting routes from this IP Pool''s CIDR over BGP. [Default: false]'
                   type: boolean
                 disabled:
                   description: When disabled is true, Calico IPAM will not assign addresses from this pool.

diff --git a/variables.tf b/variables.tf
@@ -60,8 +60,8 @@ variable "container_images" {
   description = "Container images to use"
 
   default = {
-    calico                  = "quay.io/calico/node:v3.21.2"
-    calico_cni              = "quay.io/calico/cni:v3.21.2"
+    calico                  = "quay.io/calico/node:v3.22.1"
+    calico_cni              = "quay.io/calico/cni:v3.22.1"
     cilium_agent            = "quay.io/cilium/cilium:v1.11.2"
     cilium_operator         = "quay.io/cilium/operator-generic:v1.11.2"
     coredns                 = "k8s.gcr.io/coredns/coredns:v1.8.6"