From 2b481880d0c3fe61ee206b43c7f6df8310937b79 Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Fri, 29 May 2020 17:34:30 +0200
Subject: [PATCH] fix path

---
 bin/update.sh          |  2 +-
 vars/calico-files.yaml | 48 +++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/bin/update.sh b/bin/update.sh
index 84c5192..c6c0d52 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -4,7 +4,7 @@ kubernetes-split-yaml calico.yaml > generated.log
 mv generated/*.yaml files/
 rmdir generated
 echo -e '---\ncalico_files:' > vars/calico-files.yaml
-cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)|  - "version/\2"|' >> vars/calico-files.yaml
+cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)|  - "\2"|' >> vars/calico-files.yaml
 rm -f generated.log calico.yaml
 
 # Configure the pod IP range
diff --git a/vars/calico-files.yaml b/vars/calico-files.yaml
index 1dd98ea..342a53c 100644
--- a/vars/calico-files.yaml
+++ b/vars/calico-files.yaml
@@ -1,26 +1,26 @@
 ---
 calico_files:
-  - "version/calico-config-ConfigMap.yaml"
-  - "version/bgpconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/bgppeers.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/blockaffinities.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/clusterinformations.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/felixconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/globalnetworkpolicies.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/globalnetworksets.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/hostendpoints.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/ipamblocks.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/ipamconfigs.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/ipamhandles.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/ippools.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/kubecontrollersconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/networkpolicies.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/networksets.crd.projectcalico.org-CustomResourceDefinition.yaml"
-  - "version/calico-kube-controllers-ClusterRole.yaml"
-  - "version/calico-kube-controllers-ClusterRoleBinding.yaml"
-  - "version/calico-node-ClusterRole.yaml"
-  - "version/calico-node-ClusterRoleBinding.yaml"
-  - "version/calico-node-DaemonSet.yaml"
-  - "version/calico-node-ServiceAccount.yaml"
-  - "version/calico-kube-controllers-Deployment.yaml"
-  - "version/calico-kube-controllers-ServiceAccount.yaml"
+  - "calico-config-ConfigMap.yaml"
+  - "bgpconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "bgppeers.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "blockaffinities.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "clusterinformations.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "felixconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "globalnetworkpolicies.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "globalnetworksets.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "hostendpoints.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "ipamblocks.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "ipamconfigs.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "ipamhandles.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "ippools.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "kubecontrollersconfigurations.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "networkpolicies.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "networksets.crd.projectcalico.org-CustomResourceDefinition.yaml"
+  - "calico-kube-controllers-ClusterRole.yaml"
+  - "calico-kube-controllers-ClusterRoleBinding.yaml"
+  - "calico-node-ClusterRole.yaml"
+  - "calico-node-ClusterRoleBinding.yaml"
+  - "calico-node-DaemonSet.yaml"
+  - "calico-node-ServiceAccount.yaml"
+  - "calico-kube-controllers-Deployment.yaml"
+  - "calico-kube-controllers-ServiceAccount.yaml"