respond to pr comments

aws · Jul 8, 2024 · 9be1f46 · 9be1f46
1 parent 4484dfb
commit 9be1f46
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -57,8 +57,7 @@ test: ## Run tests
 		-cover -coverprofile=coverage.out -outputdir=. -coverpkg=./... \
 		--ginkgo.focus="${FOCUS}" \
 		--ginkgo.randomize-all \
-		--ginkgo.v \
-		--ginkgo.fail-fast \
+		--ginkgo.vv
 
 deflake: ## Run randomized, racing tests until the test fails to catch flakes
 	ginkgo \

diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go
@@ -342,8 +342,8 @@ func (c *CloudProvider) instanceToNodeClaim(i *instance.Instance, instanceType *
 	if v, ok := i.Tags[corev1beta1.NodePoolLabelKey]; ok {
 		labels[corev1beta1.NodePoolLabelKey] = v
 	}
-	if v, ok := i.Tags[v1beta1.LabelNodeClass]; ok {
-		annotations[v1beta1.LabelNodeClass] = v
+	if v, ok := i.Tags[corev1beta1.NodePoolLabelKey]; ok {
+		annotations[corev1beta1.NodePoolLabelKey] = v
 	}
 	nodeClaim.Labels = labels
 	nodeClaim.Annotations = annotations

diff --git a/pkg/controllers/nodeclaim/garbagecollection/controller.go b/pkg/controllers/nodeclaim/garbagecollection/controller.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/aws/karpenter-provider-aws/pkg/apis/v1beta1"
 	"github.com/awslabs/operatorpkg/singleton"
 	"github.com/samber/lo"
 	"go.uber.org/multierr"
@@ -62,7 +61,7 @@ func (c *Controller) Reconcile(ctx context.Context) (reconcile.Result, error) {
 		return reconcile.Result{}, fmt.Errorf("listing cloudprovider machines, %w", err)
 	}
 	managedRetrieved := lo.Filter(retrieved, func(nc *corev1beta1.NodeClaim, _ int) bool {
-		return nc.Annotations[v1beta1.LabelNodeClass] != "" && nc.DeletionTimestamp.IsZero()
+		return nc.Annotations[corev1beta1.NodePoolLabelKey] != "" && nc.DeletionTimestamp.IsZero()
 	})
 	nodeClaimList := &corev1beta1.NodeClaimList{}
 	if err = c.kubeClient.List(ctx, nodeClaimList); err != nil {

diff --git a/pkg/controllers/nodeclaim/garbagecollection/suite_test.go b/pkg/controllers/nodeclaim/garbagecollection/suite_test.go
@@ -137,8 +137,7 @@ var _ = Describe("GarbageCollection", func() {
 		awsEnv.EC2API.Instances.Store(aws.StringValue(instance.InstanceId), instance)
 
 		ExpectSingletonReconciled(ctx, garbageCollectionController)
-		nc, err := cloudProvider.Get(ctx, providerID)
-		fmt.Println(nc)
+		_, err := cloudProvider.Get(ctx, providerID)
 		Expect(err).To(HaveOccurred())
 		Expect(corecloudprovider.IsNodeClaimNotFoundError(err)).To(BeTrue())
 	})
@@ -291,7 +290,7 @@ var _ = Describe("GarbageCollection", func() {
 	It("should not delete an instance if it was not launched by a NodeClaim", func() {
 		// Remove the nodepool tag (this isn't launched by a machine)
 		instance.Tags = lo.Reject(instance.Tags, func(t *ec2.Tag, _ int) bool {
-			return aws.StringValue(t.Key) == v1beta1.LabelNodeClass
+			return aws.StringValue(t.Key) == corev1beta1.NodePoolLabelKey
 		})
 
 		// Launch time was 1m ago