Merge pull request #4495 from odvarkadaniel/ignition-secret-fix

Fix error loop for ignition

Author: k8s-ci-robot

controllers/awsmachine_controller.go

@@ -775,7 +775,12 @@ func (r *AWSMachineReconciler) ignitionUserData(scope *scope.MachineScope, objec
 }
 
 func (r *AWSMachineReconciler) deleteBootstrapData(machineScope *scope.MachineScope, clusterScope cloud.ClusterScoper, objectStoreScope scope.S3Scope) error {
-	if !machineScope.AWSMachine.Spec.CloudInit.InsecureSkipSecretsManager {
+	_, userDataFormat, err := machineScope.GetRawBootstrapDataWithFormat()
+	if err != nil {
+		return errors.Wrap(err, "failed to get raw userdata")
+	}
+
+	if machineScope.UseSecretsManager(userDataFormat) {
 		if err := r.deleteEncryptedBootstrapDataSecret(machineScope, clusterScope); err != nil {
 			return err
 		}

controllers/awsmachine_controller_test.go

@@ -177,6 +177,17 @@ func TestAWSMachineReconcilerIntegrationTests(t *testing.T) {
 		ns, err := testEnv.CreateNamespace(ctx, fmt.Sprintf("integ-test-%s", util.RandomString(5)))
 		g.Expect(err).To(BeNil())
 
+		secret := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "bootstrap-data",
+				Namespace: ns.Name,
+			},
+			Data: map[string][]byte{
+				"value": []byte("shell-script"),
+			},
+		}
+		g.Expect(testEnv.Create(ctx, secret)).To(Succeed())
+
 		setup(t, g)
 		awsMachine := getAWSMachine()
 		awsMachine.Namespace = ns.Name
@@ -337,6 +348,17 @@ func TestAWSMachineReconcilerIntegrationTests(t *testing.T) {
 		ns, err := testEnv.CreateNamespace(ctx, fmt.Sprintf("integ-test-%s", util.RandomString(5)))
 		g.Expect(err).To(BeNil())
 
+		secret := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "bootstrap-data",
+				Namespace: ns.Name,
+			},
+			Data: map[string][]byte{
+				"value": []byte("shell-script"),
+			},
+		}
+		g.Expect(testEnv.Create(ctx, secret)).To(Succeed())
+
 		setup(t, g)
 		awsMachine := getAWSMachine()
 		awsMachine.Namespace = ns.Name

controllers/awsmachine_controller_unit_test.go

@@ -1109,6 +1109,28 @@ func TestAWSMachineReconciler(t *testing.T) {
 
 				_, _ = reconciler.reconcileDelete(ms, cs, cs, cs, cs)
 			})
+			t.Run("should delete the secret from the S3 bucket", func(t *testing.T) {
+				g := NewWithT(t)
+				awsMachine := getAWSMachine()
+				setup(t, g, awsMachine)
+				defer teardown(t, g)
+				setNodeRef(t, g)
+
+				ms.AWSMachine.Spec.CloudInit = infrav1.CloudInit{}
+				ms.AWSMachine.Spec.Ignition = &infrav1.Ignition{
+					Version: "2.3",
+				}
+
+				buf := new(bytes.Buffer)
+				klog.SetOutput(buf)
+
+				objectStoreSvc.EXPECT().Delete(gomock.Any()).Return(nil).Times(1)
+				ec2Svc.EXPECT().TerminateInstance(gomock.Any()).Return(nil).AnyTimes()
+
+				_, err := reconciler.reconcileDelete(ms, cs, cs, cs, cs)
+				g.Expect(err).To(BeNil())
+				g.Expect(buf.String()).To(ContainSubstring("Deleting unneeded entry from AWS S3"))
+			})
 		})
 
 		t.Run("Secrets management lifecycle when there's only a secret ARN and no node ref", func(t *testing.T) {
@@ -2495,7 +2517,17 @@ func TestAWSMachineReconcilerReconcileDefaultsToLoadBalancerTypeClassic(t *testi
 		},
 	}
 
-	fakeClient := fake.NewClientBuilder().WithObjects(ownerCluster, awsCluster, ownerMachine, awsMachine, controllerIdentity).Build()
+	secret := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "bootstrap-data",
+			Namespace: ns,
+		},
+		Data: map[string][]byte{
+			"value": []byte("shell-script"),
+		},
+	}
+
+	fakeClient := fake.NewClientBuilder().WithObjects(ownerCluster, awsCluster, ownerMachine, awsMachine, controllerIdentity, secret).Build()
 
 	recorder := record.NewFakeRecorder(10)
 	reconciler := &AWSMachineReconciler{