Merge pull request openyurtio#299 from yanyhui/master

It solves the problem that the cloud node configuration taint causes the pod of yurt controller manage to be unable to schedule to the cloud node
MrGirl · May 13, 2021 · 35b2304 · 35b2304
2 parents 543825c + c83263d
commit 35b2304
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/config/setup/yurt-controller-manager.yaml b/config/setup/yurt-controller-manager.yaml
@@ -104,6 +104,8 @@ spec:
     spec:
       serviceAccountName: yurt-controller-manager
       hostNetwork: true
+      tolerations:
+      - operator: "Exists"
       affinity:
         nodeAffinity:
           # we prefer allocating ecm on cloud node

diff --git a/config/yaml-template/yurt-controller-manager.yaml b/config/yaml-template/yurt-controller-manager.yaml
@@ -103,6 +103,8 @@ spec:
     spec:
       serviceAccountName: __project_prefix__-controller-manager
       hostNetwork: true
+      tolerations:
+      - operator: "Exists"
       affinity:
         nodeAffinity:
           # we prefer allocating ecm on cloud node

diff --git a/pkg/yurtctl/constants/constants.go b/pkg/yurtctl/constants/constants.go
@@ -143,6 +143,8 @@ spec:
     spec:
       serviceAccountName: yurt-controller-manager
       hostNetwork: true
+      tolerations:
+      - operator: "Exists"
       affinity:
         nodeAffinity:
           # we prefer allocating ecm on cloud node