ACM-8593: Update ignition token on refresh (#91)

avishayt · web-flow · commit 4141a690bc73 · 2023-11-16T08:58:33.000Z
The call to Update was replaced by ensureSecretLabel in commit 83908f2. This introduces a bug because ensureSecretLabel calls Update only if a label doesn't already exist, whereas we need to call it every time.
diff --git a/controllers/agentmachine_controller.go b/controllers/agentmachine_controller.go
@@ -500,7 +500,7 @@ func (r *AgentMachineReconciler) processBootstrapDataSecret(ctx context.Context,
 	if apierrors.IsAlreadyExists(err) {
 		log.Infof("ignitionTokenSecret %s already exists, updating secret content",
 			fmt.Sprintf("agent-%s", *machine.Spec.Bootstrap.DataSecretName))
-		err = ensureSecretLabel(ctx, r.Client, ignitionTokenSecret)
+		err = r.Client.Update(ctx, ignitionTokenSecret)
 	}
 	if err != nil {
 		log.WithError(err).Error("Failed to create ignitionTokenSecret")

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ func (r *AgentMachineReconciler) processBootstrapDataSecret(ctx context.Context,`
`500`	`500`	`if apierrors.IsAlreadyExists(err) {`
`501`	`501`	`log.Infof("ignitionTokenSecret %s already exists, updating secret content",`
`502`	`502`	`fmt.Sprintf("agent-%s", *machine.Spec.Bootstrap.DataSecretName))`
`503`		`- err = ensureSecretLabel(ctx, r.Client, ignitionTokenSecret)`
	`503`	`+ err = r.Client.Update(ctx, ignitionTokenSecret)`
`504`	`504`	`}`
`505`	`505`	`if err != nil {`
`506`	`506`	`log.WithError(err).Error("Failed to create ignitionTokenSecret")`