Merge pull request #2064 from jsturtevant/calico-fix

k8s-ci-robot · web-flow · commit 71f1710f119c · 2022-02-09T13:53:51.000-08:00
Drop disable flag from calico spec so calico pod goes ready
diff --git a/templates/addons/calico.yaml b/templates/addons/calico.yaml
@@ -3786,8 +3786,6 @@ spec:
             configMapKeyRef:
               key: veth_mtu
               name: calico-config
-        - name: FELIX_AWSSRCDSTCHECK
-          value: Disable
         - name: CALICO_DISABLE_FILE_LOGGING
           value: "true"
         - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/addons/calico/kustomization.yaml b/templates/addons/calico/kustomization.yaml
@@ -8,3 +8,9 @@ patches:
 - path: patches/calico-node.yaml
   target:
     kind: DaemonSet
+- target:
+    version: v1
+    kind: DaemonSet
+    name: calico-node
+    namespace: kube-system
+  path: patches/remove-aws-reference.yaml
diff --git a/templates/addons/calico/patches/remove-aws-reference.yaml b/templates/addons/calico/patches/remove-aws-reference.yaml
@@ -0,0 +1,5 @@
+# Drops the FELIX_AWSSRCDSTCHECK field
+# json patch doesn't allow for dropping fields in array by name
+# https://github.com/projectcalico/calico/issues/5101
+- op: remove
+  path: "/spec/template/spec/containers/0/env/12"
diff --git a/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml b/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml
@@ -4364,8 +4364,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
@@ -4364,8 +4364,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
@@ -4059,8 +4059,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
@@ -4373,8 +4373,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
@@ -4326,8 +4326,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
@@ -4139,8 +4139,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
@@ -7968,8 +7968,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
@@ -4068,8 +4068,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
@@ -4164,8 +4164,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
@@ -4229,8 +4229,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml
@@ -4253,8 +4253,6 @@ data:
                 configMapKeyRef:
                   key: veth_mtu
                   name: calico-config
-            - name: FELIX_AWSSRCDSTCHECK
-              value: Disable
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
