Merge pull request #9162 from johngmyers/revert-9152

Revert "Add EC2 instance lifecycle label to nodes"
kubernetes · May 22, 2020 · 1c9ca79 · 1c9ca79
2 parents ab79a41 + ca3b13d
commit 1c9ca79
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 28 deletions.
diff --git a/cmd/kops-controller/controllers/node_controller.go b/cmd/kops-controller/controllers/node_controller.go
@@ -118,15 +118,6 @@ func (r *NodeReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		return ctrl.Result{}, fmt.Errorf("unable to build config for node %s: %v", node.Name, err)
 	}
 
-	lifecycle, err := r.getInstanceLifecycle(ctx, node)
-	if err != nil {
-		return ctrl.Result{}, fmt.Errorf("unable to get instance lifecycle %s: %v", node.Name, err)
-	}
-
-	if len(lifecycle) > 0 {
-		labels[fmt.Sprintf("node-role.kubernetes.io/%s-worker", lifecycle)] = "true"
-	}
-
 	updateLabels := make(map[string]string)
 	for k, v := range labels {
 		actual, found := node.Labels[k]
@@ -196,17 +187,6 @@ func (r *NodeReconciler) getClusterForNode(node *corev1.Node) (*kops.Cluster, er
 	return cluster, nil
 }
 
-// getInstanceLifecycle returns InstanceLifecycle string object
-func (r *NodeReconciler) getInstanceLifecycle(ctx context.Context, node *corev1.Node) (string, error) {
-
-	identity, err := r.identifier.IdentifyNode(ctx, node)
-	if err != nil {
-		return "", fmt.Errorf("error identifying node %q: %v", node.Name, err)
-	}
-
-	return identity.InstanceLifecycle, nil
-}
-
 // getInstanceGroupForNode returns the kops.InstanceGroup object for the node
 func (r *NodeReconciler) getInstanceGroupForNode(ctx context.Context, node *corev1.Node) (*kops.InstanceGroup, error) {
 	// We assume that if the instancegroup label is set, that it is correct

diff --git a/pkg/nodeidentity/aws/identify.go b/pkg/nodeidentity/aws/identify.go
@@ -102,11 +102,6 @@ func (i *nodeIdentifier) IdentifyNode(ctx context.Context, node *corev1.Node) (*
 		return nil, fmt.Errorf("found instance %q, but state is %q", instanceID, instanceState)
 	}
 
-	lifecycle := ""
-	if instance.InstanceLifecycle != nil {
-		lifecycle = *instance.InstanceLifecycle
-	}
-
 	// TODO: Should we traverse to the ASG to confirm the tags there?
 	igName := getTag(instance.Tags, CloudTagInstanceGroupName)
 	if igName == "" {
@@ -115,7 +110,6 @@ func (i *nodeIdentifier) IdentifyNode(ctx context.Context, node *corev1.Node) (*
 
 	info := &nodeidentity.Info{}
 	info.InstanceGroup = igName
-	info.InstanceLifecycle = lifecycle
 
 	return info, nil
 }

diff --git a/pkg/nodeidentity/interfaces.go b/pkg/nodeidentity/interfaces.go
@@ -27,6 +27,5 @@ type Identifier interface {
 }
 
 type Info struct {
-	InstanceGroup     string
-	InstanceLifecycle string
+	InstanceGroup string
 }