artifacts/kubezero-calico/README.md

@@ -6,7 +6,6 @@ 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`

artifacts/kubezero-calico/remove-namespace.patch

@@ -1,5 +1,5 @@
---- canal.yaml.orig	2020-06-03 15:39:41.972295775 +0100
-+++ canal.yaml	2020-06-03 15:39:59.718477177 +0100
+--- canal.yaml.orig	2020-07-02 16:56:37.279169481 +0100
++++ canal.yaml	2020-07-02 16:56:37.285169542 +0100
 @@ -5,7 +5,6 @@
  apiVersion: v1
  metadata:
@@ -8,7 +8,7 @@
  data:
    # Typha is disabled.
    typha_service_name: "none"
-@@ -536,7 +535,6 @@
+@@ -3438,7 +3437,6 @@
  apiVersion: apps/v1
  metadata:
    name: canal
@@ -16,7 +16,7 @@
    labels:
      k8s-app: canal
  spec:
-@@ -781,7 +779,6 @@
+@@ -3683,7 +3681,6 @@
  kind: ServiceAccount
  metadata:
    name: canal
@@ -24,7 +24,7 @@
  
  ---
  # Source: calico/templates/calico-kube-controllers.yaml
-@@ -790,7 +787,6 @@
+@@ -3692,7 +3689,6 @@
  kind: Deployment
  metadata:
    name: calico-kube-controllers
@@ -32,15 +32,15 @@
    labels:
      k8s-app: calico-kube-controllers
  spec:
-@@ -804,7 +800,6 @@
+@@ -3706,7 +3702,6 @@
    template:
      metadata:
        name: calico-kube-controllers
 -      namespace: kube-system
        labels:
          k8s-app: calico-kube-controllers
-       annotations:
-@@ -841,7 +836,6 @@
+     spec:
+@@ -3741,7 +3736,6 @@
  kind: ServiceAccount
  metadata:
    name: calico-kube-controllers

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