Merge pull request #1409 from zexi/patch-k3s-calico-ignore-errors

fix(k3s): ignore errors when patch k3s calico-kube-controllers

Author: zexi

onecloud/roles/primary-master-node/setup_k3s/templates/calico.yaml.j2

@@ -5080,6 +5080,15 @@ spec:
       labels:
         k8s-app: calico-kube-controllers
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: onecloud.yunion.io/controller
+                operator: In
+                values:
+                - enable
       nodeSelector:
         kubernetes.io/os: linux
       tolerations:

onecloud/roles/utils/k8s/addons/calico/tasks/main.yml

@@ -3,4 +3,4 @@
     name: utils/k8s/addons/patch
   vars:
     resource_name: calico-kube-controllers
-
+  ignore_errors: true