feat: support taints for master and worker

tkestack · Apr 13, 2020 · af5e105 · af5e105
1 parent 82b048a
commit af5e105
Show file tree

Hide file tree

Showing 14 changed files with 559 additions and 446 deletions.
diff --git a/api/openapi/zz_generated.openapi.go b/api/openapi/zz_generated.openapi.go
diff --git a/api/platform/types.go b/api/platform/types.go
@@ -19,6 +19,7 @@
 package platform
 
 import (
+ corev1 "k8s.io/api/core/v1"
  "k8s.io/apimachinery/pkg/api/resource"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -63,6 +64,7 @@ type ClusterMachine struct {
  PrivateKey []byte
  PassPhrase []byte
  Labels map[string]string
+ Taints []corev1.Taint
 }
 
 // ClusterSpec is a description of a cluster.
@@ -1286,6 +1288,7 @@ type MachineSpec struct {
  PrivateKey []byte
  PassPhrase []byte
  Labels map[string]string
+ Taints []corev1.Taint
 }
 
 // MachineStatus represents information about the status of an machine.

diff --git a/api/platform/v1/generated.pb.go b/api/platform/v1/generated.pb.go
diff --git a/api/platform/v1/generated.proto b/api/platform/v1/generated.proto
diff --git a/api/platform/v1/types.go b/api/platform/v1/types.go
@@ -19,6 +19,7 @@
 package v1
 
 import (
+ corev1 "k8s.io/api/core/v1"
  "k8s.io/apimachinery/pkg/api/resource"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -67,6 +68,9 @@ type ClusterMachine struct {
  PassPhrase []byte `json:"passPhrase,omitempty" protobuf:"bytes,6,opt,name=passPhrase"`
  // +optional
  Labels map[string]string `json:"labels,omitempty" protobuf:"bytes,7,opt,name=labels"`
+ // If specified, the node's taints.
+ // +optional
+ Taints []corev1.Taint `json:"taints,omitempty" protobuf:"bytes,8,opt,name=taints"`
 }
 
 // ClusterSpec is a description of a cluster.
@@ -1298,6 +1302,9 @@ type MachineSpec struct {
  PassPhrase []byte `json:"passPhrase,omitempty" protobuf:"bytes,10,opt,name=passPhrase"`
  // +optional
  Labels map[string]string `json:"labels,omitempty" protobuf:"bytes,11,opt,name=labels"`
+ // If specified, the node's taints.
+ // +optional
+ Taints []corev1.Taint `json:"taints,omitempty" protobuf:"bytes,12,opt,name=taints"`
 }
 
 // MachineStatus represents information about the status of an machine.

diff --git a/api/platform/v1/types_swagger_doc_generated.go b/api/platform/v1/types_swagger_doc_generated.go
diff --git a/api/platform/v1/zz_generated.conversion.go b/api/platform/v1/zz_generated.conversion.go
diff --git a/api/platform/v1/zz_generated.deepcopy.go b/api/platform/v1/zz_generated.deepcopy.go
diff --git a/api/platform/zz_generated.deepcopy.go b/api/platform/zz_generated.deepcopy.go
diff --git a/pkg/platform/provider/baremetal/cluster/create.go b/pkg/platform/provider/baremetal/cluster/create.go
@@ -30,7 +30,9 @@ import (
  "strings"
  "time"
 
- "tkestack.io/tke/pkg/util/template"
+ "github.com/thoas/go-funk"
+
+ "tkestack.io/tke/pkg/util/apiclient"
 
  "github.com/pkg/errors"
  "github.com/segmentio/ksuid"
@@ -48,11 +50,11 @@ import (
  "tkestack.io/tke/pkg/platform/provider/baremetal/phases/kubeadm"
  "tkestack.io/tke/pkg/platform/provider/baremetal/phases/kubeconfig"
  "tkestack.io/tke/pkg/platform/provider/baremetal/phases/kubelet"
- "tkestack.io/tke/pkg/platform/provider/baremetal/phases/markcontrolplane"
  "tkestack.io/tke/pkg/platform/provider/baremetal/preflight"
  "tkestack.io/tke/pkg/platform/provider/baremetal/util/hosts"
  "tkestack.io/tke/pkg/util/log"
  "tkestack.io/tke/pkg/util/ssh"
+ "tkestack.io/tke/pkg/util/template"
 )
 
 const (
@@ -662,20 +664,21 @@ func (p *Provider) EnsureMarkControlPlane(c *Cluster) error {
  return err
  }
 
- option := &markcontrolplane.Option{}
- if !c.Spec.Features.EnableMasterSchedule {
- option.Taints = []corev1.Taint{
- {
- Key: "node-role.kubernetes.io/master",
+ for _, machine := range c.Spec.Machines {
+ if machine.Labels == nil {
+ machine.Labels = make(map[string]string)
+ machine.Labels[constants.LabelNodeRoleMaster] = ""
+ }
+ if !c.Spec.Features.EnableMasterSchedule {
+ taint := corev1.Taint{
+ Key: constants.LabelNodeRoleMaster,
  Effect: corev1.TaintEffectNoSchedule,
- },
+ }
+ if !funk.Contains(machine.Taints, taint) {
+ machine.Taints = append(machine.Taints, taint)
+ }
  }
- }
-
- for _, machine := range c.Spec.Machines {
- option.NodeName = machine.IP
- option.Labels = machine.Labels
- err := markcontrolplane.Install(clientset, option)
+ err := apiclient.MarkNode(clientset, machine.IP, machine.Labels, machine.Taints)
  if err != nil {
  return errors.Wrap(err, machine.IP)
  }

diff --git a/pkg/platform/provider/baremetal/machine/create.go b/pkg/platform/provider/baremetal/machine/create.go
@@ -26,6 +26,8 @@ import (
  "strings"
  "time"
 
+ "tkestack.io/tke/pkg/util/apiclient"
+
  platformv1 "tkestack.io/tke/api/platform/v1"
 
  corev1 "k8s.io/api/core/v1"
@@ -38,7 +40,6 @@ import (
  "tkestack.io/tke/pkg/platform/provider/baremetal/phases/kubeadm"
  "tkestack.io/tke/pkg/platform/provider/baremetal/phases/kubeconfig"
  "tkestack.io/tke/pkg/platform/provider/baremetal/phases/kubelet"
- "tkestack.io/tke/pkg/platform/provider/baremetal/phases/marknode"
  "tkestack.io/tke/pkg/platform/provider/baremetal/preflight"
  "tkestack.io/tke/pkg/platform/provider/baremetal/util"
  "tkestack.io/tke/pkg/platform/provider/baremetal/util/hosts"
@@ -294,15 +295,7 @@ func (p *Provider) EnsureJoinNode(m *Machine) error {
 }
 
 func (p *Provider) EnsureMarkNode(m *Machine) error {
- if len(m.Spec.Labels) == 0 {
- return nil
- }
-
- option := &marknode.Option{
- NodeName: m.Spec.IP,
- Labels: m.Spec.Labels,
- }
- err := marknode.Install(m.ClientSet, option)
+ err := apiclient.MarkNode(m.ClientSet, m.Spec.IP, m.Spec.Labels, m.Spec.Taints)
  if err != nil {
  return err
  }