fix(cluster): adjust SkipConditions priority

Signed-off-by: Tengfei Wang <[email protected]>
leoryu · Jun 30, 2020 · ec36387 · ec36387
1 parent a5bdb73
commit ec36387
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/platform/provider/baremetal/cluster/provider.go b/pkg/platform/provider/baremetal/cluster/provider.go
@@ -196,8 +196,8 @@ func (p *Provider) PreCreate(cluster *types.Cluster) error {
  if cluster.Spec.Properties.MaxNodePodNum == nil {
  cluster.Spec.Properties.MaxNodePodNum = pointer.ToInt32(256)
  }
- if cluster.Spec.Features.SkipConditions == nil {
- cluster.Spec.Features.SkipConditions = p.config.Feature.SkipConditions
+ if p.config.Feature.SkipConditions != nil {
+ cluster.Spec.Features.SkipConditions = append(cluster.Spec.Features.SkipConditions, p.config.Feature.SkipConditions...)
  }
 
  if cluster.Spec.Etcd == nil {