From 1f19133ea8ec3d19a11abc997cd5e9d88c87e8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Serv=C3=A9n=20Mar=C3=ADn?= <lserven@gmail.com>
Date: Wed, 20 Apr 2022 14:57:21 +0200
Subject: [PATCH] manifests: use CNI 0.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As mentioned in the Kilo Slack [0], Kubernetes supports CNI 0.4.0 and
does not yet support 1.0.0. Correspondingly, this commit downgrades the
declared CNI version in the configuration to 0.4.0 and crucially updates
the configuration used in the e2e tests to exercise this new CNI
version.

[0] https://kubernetes.slack.com/archives/C022EB4R7TK/p1650455432970199?thread_ts=1650368553.132859&cid=C022EB4R7TK

Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
---
 e2e/kilo-kind-userspace.yaml                    | 2 +-
 manifests/kilo-bootkube.yaml                    | 2 +-
 manifests/kilo-k3s-userspace-heterogeneous.yaml | 2 +-
 manifests/kilo-k3s-userspace.yaml               | 2 +-
 manifests/kilo-k3s.yaml                         | 2 +-
 manifests/kilo-kubeadm-userspace.yaml           | 2 +-
 manifests/kilo-kubeadm.yaml                     | 2 +-
 manifests/kilo-typhoon.yaml                     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/e2e/kilo-kind-userspace.yaml b/e2e/kilo-kind-userspace.yaml
index e4a7e86..17c0228 100644
--- a/e2e/kilo-kind-userspace.yaml
+++ b/e2e/kilo-kind-userspace.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   cni-conf.json: |
     {
-       "cniVersion":"0.3.1",
+       "cniVersion":"0.4.0",
        "name":"kilo",
        "plugins":[
           {
diff --git a/manifests/kilo-bootkube.yaml b/manifests/kilo-bootkube.yaml
index 1246787..fff07cc 100644
--- a/manifests/kilo-bootkube.yaml
+++ b/manifests/kilo-bootkube.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   cni-conf.json: |
     {
-       "cniVersion":"1.0.0",
+       "cniVersion":"0.4.0",
        "name":"kilo",
        "plugins":[
           {
diff --git a/manifests/kilo-k3s-userspace-heterogeneous.yaml b/manifests/kilo-k3s-userspace-heterogeneous.yaml
index 64c56bf..f819f57 100644
--- a/manifests/kilo-k3s-userspace-heterogeneous.yaml
+++ b/manifests/kilo-k3s-userspace-heterogeneous.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   cni-conf.json: |
     {
-       "cniVersion":"1.0.0",
+       "cniVersion":"0.4.0",
        "name":"kilo",
        "plugins":[
           {
diff --git a/manifests/kilo-k3s-userspace.yaml b/manifests/kilo-k3s-userspace.yaml
index 3d345b8..281e5ea 100644
--- a/manifests/kilo-k3s-userspace.yaml
+++ b/manifests/kilo-k3s-userspace.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   cni-conf.json: |
     {
-       "cniVersion":"1.0.0",
+       "cniVersion":"0.4.0",
        "name":"kilo",
        "plugins":[
           {
diff --git a/manifests/kilo-k3s.yaml b/manifests/kilo-k3s.yaml
index de17114..ad29607 100644
--- a/manifests/kilo-k3s.yaml
+++ b/manifests/kilo-k3s.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   cni-conf.json: |
     {
-       "cniVersion":"1.0.0",
+       "cniVersion":"0.4.0",
        "name":"kilo",
        "plugins":[
           {
diff --git a/manifests/kilo-kubeadm-userspace.yaml b/manifests/kilo-kubeadm-userspace.yaml
index c100da3..0e88702 100644
--- a/manifests/kilo-kubeadm-userspace.yaml
+++ b/manifests/kilo-kubeadm-userspace.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   cni-conf.json: |
     {
-       "cniVersion":"1.0.0",
+       "cniVersion":"0.4.0",
        "name":"kilo",
        "plugins":[
           {
diff --git a/manifests/kilo-kubeadm.yaml b/manifests/kilo-kubeadm.yaml
index 03f732b..fdad26b 100644
--- a/manifests/kilo-kubeadm.yaml
+++ b/manifests/kilo-kubeadm.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   cni-conf.json: |
     {
-       "cniVersion":"1.0.0",
+       "cniVersion":"0.4.0",
        "name":"kilo",
        "plugins":[
           {
diff --git a/manifests/kilo-typhoon.yaml b/manifests/kilo-typhoon.yaml
index cde17a2..fed14f5 100644
--- a/manifests/kilo-typhoon.yaml
+++ b/manifests/kilo-typhoon.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   cni-conf.json: |
     {
-       "cniVersion":"1.0.0",
+       "cniVersion":"0.4.0",
        "name":"kilo",
        "plugins":[
           {