From 790b2f21ce33ae930e7c0829fbd574e7cf0823d4 Mon Sep 17 00:00:00 2001
From: Johannes Scheerer <johannes.scheerer@sap.com>
Date: Mon, 12 Apr 2021 15:17:12 +0200
Subject: [PATCH] Added simple init container to calico-node to verify that the
 cni installation step worked.

---
 .../calico/templates/node/daemonset-calico-node.yaml   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/charts/internal/calico/templates/node/daemonset-calico-node.yaml b/charts/internal/calico/templates/node/daemonset-calico-node.yaml
index 43f1d0e66..5bb0bc01d 100644
--- a/charts/internal/calico/templates/node/daemonset-calico-node.yaml
+++ b/charts/internal/calico/templates/node/daemonset-calico-node.yaml
@@ -107,6 +107,16 @@ spec:
             mountPath: /host/driver
         securityContext:
           privileged: true
+      # Container just prints the content of the host /opt/cni/bin directory to check for copy failures
+      - name: install-cni-check
+        image: {{ index .Values.images "calico-podtodaemon-flex" }}
+        command:
+          - ls
+          - -la
+          - /host/opt/cni/bin
+        volumeMounts:
+          - mountPath: /host/opt/cni/bin
+            name: cni-bin-dir
       containers:
         # Runs calico-node container on each Kubernetes node. This
         # container programs network policy and routes on each