From eb56044c32d5ebee8582507c8a469d1fb368b1d8 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Sat, 22 May 2021 20:12:13 +0200
Subject: [PATCH] Update calico to latest version

---
 files/calico-kube-controllers-Deployment.yaml             | 2 +-
 files/calico-node-DaemonSet.yaml                          | 8 ++++----
 files/calicoctl-Pod.yaml                                  | 2 +-
 files/calicoctl-ServiceAccount.yaml                       | 6 +++---
 ...ns.crd.projectcalico.org-CustomResourceDefinition.yaml | 6 ++----
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/files/calico-kube-controllers-Deployment.yaml b/files/calico-kube-controllers-Deployment.yaml
index 9ef405b..491a304 100644
--- a/files/calico-kube-controllers-Deployment.yaml
+++ b/files/calico-kube-controllers-Deployment.yaml
@@ -34,7 +34,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: calico-kube-controllers
-          image: docker.io/calico/kube-controllers:v3.19.0
+          image: docker.io/calico/kube-controllers:v3.19.1
           env:
             # Choose which controllers to run.
             - name: ENABLED_CONTROLLERS
diff --git a/files/calico-node-DaemonSet.yaml b/files/calico-node-DaemonSet.yaml
index 56827c7..1b7e973 100644
--- a/files/calico-node-DaemonSet.yaml
+++ b/files/calico-node-DaemonSet.yaml
@@ -44,7 +44,7 @@ spec:
         # It can be deleted if this is a fresh installation, or if you have already
         # upgraded to use calico-ipam.
         - name: upgrade-ipam
-          image: docker.io/calico/cni:v3.19.0
+          image: docker.io/calico/cni:v3.19.1
           command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
           envFrom:
           - configMapRef:
@@ -71,7 +71,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: docker.io/calico/cni:v3.19.0
+          image: docker.io/calico/cni:v3.19.1
           command: ["/opt/cni/bin/install"]
           envFrom:
           - configMapRef:
@@ -112,7 +112,7 @@ spec:
         # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
         # to communicate with Felix over the Policy Sync API.
         - name: flexvol-driver
-          image: docker.io/calico/pod2daemon-flexvol:v3.19.0
+          image: docker.io/calico/pod2daemon-flexvol:v3.19.1
           volumeMounts:
           - name: flexvol-driver-host
             mountPath: /host/driver
@@ -123,7 +123,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: docker.io/calico/node:v3.19.0
+          image: docker.io/calico/node:v3.19.1
           envFrom:
           - configMapRef:
               # Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
diff --git a/files/calicoctl-Pod.yaml b/files/calicoctl-Pod.yaml
index 1b7820e..3fc3932 100644
--- a/files/calicoctl-Pod.yaml
+++ b/files/calicoctl-Pod.yaml
@@ -11,7 +11,7 @@ spec:
   serviceAccountName: calicoctl
   containers:
   - name: calicoctl
-    image: calico/ctl:v3.19.0
+    image: calico/ctl:v3.19.1
     command:
       - /calicoctl
     args:
diff --git a/files/calicoctl-ServiceAccount.yaml b/files/calicoctl-ServiceAccount.yaml
index 8713e2f..bc7f0bc 100644
--- a/files/calicoctl-ServiceAccount.yaml
+++ b/files/calicoctl-ServiceAccount.yaml
@@ -1,7 +1,7 @@
-# Calico Version v3.19.0
-# https://docs.projectcalico.org/releases#v3.19.0
+# Calico Version v3.19.1
+# https://docs.projectcalico.org/releases#v3.19.1
 # This manifest includes the following component versions:
-#   calico/ctl:v3.19.0
+#   calico/ctl:v3.19.1
 
 apiVersion: v1
 kind: ServiceAccount
diff --git a/files/felixconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml b/files/felixconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml
index 51206cb..1ea236f 100644
--- a/files/felixconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml
+++ b/files/felixconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml
@@ -183,7 +183,7 @@ spec:
                   udp:68, tcp:179, tcp:2379, tcp:2380, tcp:6443, tcp:6666, tcp:6667]'
                 items:
                   description: ProtoPort is combination of protocol, port, and CIDR.
-                    All three must be specified.
+                    Protocol and port must be specified.
                   properties:
                     net:
                       type: string
@@ -192,7 +192,6 @@ spec:
                     protocol:
                       type: string
                   required:
-                  - net
                   - port
                   - protocol
                   type: object
@@ -211,7 +210,7 @@ spec:
                   tcp:6667, udp:53, udp:67]'
                 items:
                   description: ProtoPort is combination of protocol, port, and CIDR.
-                    All three must be specified.
+                    Protocol and port must be specified.
                   properties:
                     net:
                       type: string
@@ -220,7 +219,6 @@ spec:
                     protocol:
                       type: string
                   required:
-                  - net
                   - port
                   - protocol
                   type: object