Rename MachineCreated status condition to MachineLaunched (#257)

kubernetes-sigs · Mar 29, 2023 · d544d21 · d544d21
1 parent ec51fba
commit d544d21
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/pkg/apis/v1alpha5/machine_status.go b/pkg/apis/v1alpha5/machine_status.go
@@ -37,14 +37,14 @@ type MachineStatus struct {
 
 func (in *Machine) StatusConditions() apis.ConditionManager {
 	return apis.NewLivingConditionSet(
-		MachineCreated,
+		MachineLaunched,
 		MachineRegistered,
 		MachineInitialized,
 	).Manage(in)
 }
 
 var (
-	MachineCreated     apis.ConditionType = "MachineCreated"
+	MachineLaunched    apis.ConditionType = "MachineLaunched"
 	MachineRegistered  apis.ConditionType = "MachineRegistered"
 	MachineInitialized apis.ConditionType = "MachineInitialized"
 )

diff --git a/pkg/controllers/machine/garbagecollect/controller.go b/pkg/controllers/machine/garbagecollect/controller.go
@@ -66,8 +66,8 @@ func (c *Controller) Reconcile(ctx context.Context, _ reconcile.Request) (reconc
 		return m.Status.ProviderID
 	})...)
 	machines := lo.Filter(lo.ToSlicePtr(machineList.Items), func(m *v1alpha5.Machine, _ int) bool {
-		return m.StatusConditions().GetCondition(v1alpha5.MachineCreated).IsTrue() &&
-			c.clock.Since(m.StatusConditions().GetCondition(v1alpha5.MachineCreated).LastTransitionTime.Inner.Time) > time.Second*10 &&
+		return m.StatusConditions().GetCondition(v1alpha5.MachineLaunched).IsTrue() &&
+			c.clock.Since(m.StatusConditions().GetCondition(v1alpha5.MachineLaunched).LastTransitionTime.Inner.Time) > time.Second*10 &&
 			!cloudProviderProviderIDs.Has(m.Status.ProviderID)
 	})
 

diff --git a/pkg/controllers/machine/launch.go b/pkg/controllers/machine/launch.go
@@ -59,7 +59,7 @@ func (l *Launch) Reconcile(ctx context.Context, machine *v1alpha5.Machine) (reco
 				})
 				return reconcile.Result{}, nil
 			}
-			machine.StatusConditions().MarkFalse(v1alpha5.MachineCreated, "LinkFailed", truncateMessage(err.Error()))
+			machine.StatusConditions().MarkFalse(v1alpha5.MachineLaunched, "LinkFailed", truncateMessage(err.Error()))
 			return reconcile.Result{}, fmt.Errorf("linking machine, %w", err)
 		}
 		logging.FromContext(ctx).Debugf("linked machine")
@@ -70,14 +70,14 @@ func (l *Launch) Reconcile(ctx context.Context, machine *v1alpha5.Machine) (reco
 				logging.FromContext(ctx).Error(err)
 				return reconcile.Result{}, client.IgnoreNotFound(l.kubeClient.Delete(ctx, machine))
 			}
-			machine.StatusConditions().MarkFalse(v1alpha5.MachineCreated, "LaunchFailed", truncateMessage(err.Error()))
+			machine.StatusConditions().MarkFalse(v1alpha5.MachineLaunched, "LaunchFailed", truncateMessage(err.Error()))
 			return reconcile.Result{}, fmt.Errorf("creating machine, %w", err)
 		}
 		logging.FromContext(ctx).Debugf("created machine")
 	}
 	l.cache.SetDefault(client.ObjectKeyFromObject(machine).String(), created)
 	PopulateMachineDetails(machine, created)
-	machine.StatusConditions().MarkTrue(v1alpha5.MachineCreated)
+	machine.StatusConditions().MarkTrue(v1alpha5.MachineLaunched)
 	return reconcile.Result{}, nil
 }
 

diff --git a/pkg/controllers/machine/launch_test.go b/pkg/controllers/machine/launch_test.go
@@ -55,7 +55,7 @@ var _ = Describe("Launch", func() {
 		_, err := cloudProvider.Get(ctx, machine.Status.ProviderID)
 		Expect(err).ToNot(HaveOccurred())
 	})
-	It("should add the MachineCreated status condition after creating the Machine", func() {
+	It("should add the MachineLaunched status condition after creating the Machine", func() {
 		machine := test.Machine(v1alpha5.Machine{
 			ObjectMeta: metav1.ObjectMeta{
 				Labels: map[string]string{
@@ -67,7 +67,7 @@ var _ = Describe("Launch", func() {
 		ExpectReconcileSucceeded(ctx, machineController, client.ObjectKeyFromObject(machine))
 
 		machine = ExpectExists(ctx, env.Client, machine)
-		Expect(ExpectStatusConditionExists(machine, v1alpha5.MachineCreated).Status).To(Equal(v1.ConditionTrue))
+		Expect(ExpectStatusConditionExists(machine, v1alpha5.MachineLaunched).Status).To(Equal(v1.ConditionTrue))
 	})
 	It("should link an instance with the karpenter.sh/linked annotation", func() {
 		cloudProviderMachine := &v1alpha5.Machine{

diff --git a/pkg/controllers/machine/liveness.go b/pkg/controllers/machine/liveness.go
@@ -50,7 +50,7 @@ func (l *Liveness) Reconcile(ctx context.Context, machine *v1alpha5.Machine) (re
 }
 
 func (l *Liveness) launchTTL(ctx context.Context, machine *v1alpha5.Machine) (reconcile.Result, error) {
-	if machine.StatusConditions().GetCondition(v1alpha5.MachineCreated).IsTrue() {
+	if machine.StatusConditions().GetCondition(v1alpha5.MachineLaunched).IsTrue() {
 		return reconcile.Result{}, nil
 	}
 	if machine.CreationTimestamp.IsZero() || l.clock.Since(machine.CreationTimestamp.Time) < launchTTL {

diff --git a/pkg/controllers/machine/liveness_test.go b/pkg/controllers/machine/liveness_test.go
@@ -60,7 +60,7 @@ var _ = Describe("Liveness", func() {
 		ExpectApplied(ctx, env.Client, provisioner, machine)
 		ExpectReconcileFailed(ctx, machineController, client.ObjectKeyFromObject(machine))
 		machine = ExpectExists(ctx, env.Client, machine)
-		Expect(machine.StatusConditions().GetCondition(v1alpha5.MachineCreated).IsTrue()).To(BeFalse())
+		Expect(machine.StatusConditions().GetCondition(v1alpha5.MachineLaunched).IsTrue()).To(BeFalse())
 
 		// If the node hasn't registered in the creation timeframe, then we deprovision the Machine
 		fakeClock.Step(time.Minute * 3)

diff --git a/pkg/test/expectations/expectations.go b/pkg/test/expectations/expectations.go
@@ -297,7 +297,7 @@ func ExpectMachineDeployedWithOffset(offset int, ctx context.Context, c client.C
 
 	// Make the machine ready in the status conditions
 	machine.PopulateMachineDetails(m, resolved)
-	m.StatusConditions().MarkTrue(v1alpha5.MachineCreated)
+	m.StatusConditions().MarkTrue(v1alpha5.MachineLaunched)
 	m.StatusConditions().MarkTrue(v1alpha5.MachineRegistered)
 
 	// Mock the machine launch and node joining at the apiserver
@@ -330,7 +330,7 @@ func ExpectMakeMachinesReady(ctx context.Context, c client.Client, machines ...*
 func ExpectMakeMachinesReadyWithOffset(offset int, ctx context.Context, c client.Client, machines ...*v1alpha5.Machine) {
 	for i := range machines {
 		machines[i] = ExpectExistsWithOffset(offset+1, ctx, c, machines[i])
-		machines[i].StatusConditions().MarkTrue(v1alpha5.MachineCreated)
+		machines[i].StatusConditions().MarkTrue(v1alpha5.MachineLaunched)
 		machines[i].StatusConditions().MarkTrue(v1alpha5.MachineRegistered)
 		machines[i].StatusConditions().MarkTrue(v1alpha5.MachineInitialized)
 		ExpectAppliedWithOffset(offset+1, ctx, c, machines[i])

diff --git a/pkg/utils/machine/machine.go b/pkg/utils/machine/machine.go
@@ -176,7 +176,7 @@ func NewFromNode(node *v1.Node) *v1alpha5.Machine {
 	if _, ok := node.Labels[v1alpha5.LabelNodeInitialized]; ok {
 		m.StatusConditions().MarkTrue(v1alpha5.MachineInitialized)
 	}
-	m.StatusConditions().MarkTrue(v1alpha5.MachineCreated)
+	m.StatusConditions().MarkTrue(v1alpha5.MachineLaunched)
 	m.StatusConditions().MarkTrue(v1alpha5.MachineRegistered)
 	return m
 }