Calico version bump

artifacts/kubezero-calico/README.md

@@ -1,12 +1,5 @@
 # Calico CNI
 
-## Known issues
-Due to a bug in Kustomize V2 vs. V3 we have to remove all namespaces from the base resources.
-The kube-system namespace will be applied by kustomize.  
-
-See eg: `https://github.com/kubernetes-sigs/kustomize/issues/1351`
-
-
 ## Upgrade
 See: https://docs.projectcalico.org/maintenance/kubernetes-upgrade  
-`curl https://docs.projectcalico.org/manifests/canal.yaml -O && patch < remove-namespace.patch`
+`wget https://docs.projectcalico.org/manifests/canal.yaml`

artifacts/kubezero-calico/remove-namespace.patch

@@ -1,50 +0,0 @@
---- canal.yaml.orig	2020-06-03 15:39:41.972295775 +0100
-+++ canal.yaml	2020-06-03 15:39:59.718477177 +0100
-@@ -5,7 +5,6 @@
- apiVersion: v1
- metadata:
-   name: canal-config
--  namespace: kube-system
- data:
-   # Typha is disabled.
-   typha_service_name: "none"
-@@ -536,7 +535,6 @@
- apiVersion: apps/v1
- metadata:
-   name: canal
--  namespace: kube-system
-   labels:
-     k8s-app: canal
- spec:
-@@ -781,7 +779,6 @@
- kind: ServiceAccount
- metadata:
-   name: canal
--  namespace: kube-system
- 
- ---
- # Source: calico/templates/calico-kube-controllers.yaml
-@@ -790,7 +787,6 @@
- kind: Deployment
- metadata:
-   name: calico-kube-controllers
--  namespace: kube-system
-   labels:
-     k8s-app: calico-kube-controllers
- spec:
-@@ -804,7 +800,6 @@
-   template:
-     metadata:
-       name: calico-kube-controllers
--      namespace: kube-system
-       labels:
-         k8s-app: calico-kube-controllers
-       annotations:
-@@ -841,7 +836,6 @@
- kind: ServiceAccount
- metadata:
-   name: calico-kube-controllers
--  namespace: kube-system
- 
- ---
- # Source: calico/templates/calico-etcd-secrets.yaml

deploy/deploy.sh

@@ -20,7 +20,7 @@ helm repo update
 # Determine if we bootstrap or update
 helm list -n argocd -f kubezero -q | grep -q kubezero && rc=$? || rc=$?
 if [ $rc -eq 0 ]; then
-  helm template $DEPLOY_DIR -f values.yaml -f kubezero.yaml > generated-values.yaml
+  helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml > generated-values.yaml
   helm upgrade -n argocd kubezero kubezero/kubezero-argo-cd -f generated-values.yaml
 else
   # During bootstrap we first generate a minimal values.yaml to prevent various deadlocks