Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only attempt to delete bootstrap data secret if InsecureSkipSecretsManager isn't set #3400

Merged
merged 2 commits into from
Apr 12, 2022
Merged

Only attempt to delete bootstrap data secret if InsecureSkipSecretsManager isn't set #3400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
823459d
Only attempt to delete bootstrap data secret if InsecureSkipSecretsMa…
Apr 8, 2022
d15f9bc
add unit test
Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions controllers/awsmachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,10 @@ func (r *AWSMachineReconciler) ignitionUserData(scope *scope.MachineScope, objec
}

func (r *AWSMachineReconciler) deleteBootstrapData(machineScope *scope.MachineScope, clusterScope cloud.ClusterScoper, objectStoreScope scope.S3Scope) error {
if err := r.deleteEncryptedBootstrapDataSecret(machineScope, clusterScope); err != nil {
return err
if !machineScope.AWSMachine.Spec.CloudInit.InsecureSkipSecretsManager {
if err := r.deleteEncryptedBootstrapDataSecret(machineScope, clusterScope); err != nil {
return err
}
}

if objectStoreScope != nil {
Expand Down
14 changes: 14 additions & 0 deletions controllers/awsmachine_controller_unit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,6 +1079,20 @@ func TestAWSMachineReconciler(t *testing.T) {
ec2Svc.EXPECT().TerminateInstanceAndWait(gomock.Any()).Return(nil).AnyTimes()
_, _ = reconciler.reconcileDelete(ms, cs, cs, cs, cs)
})
t.Run("should not attempt to delete the secret if InsecureSkipSecretsManager is set on CloudInit", func(t *testing.T) {
g := NewWithT(t)
awsMachine := getAWSMachine()
setup(t, g, awsMachine)
defer teardown(t, g)
setNodeRef(t, g)

ms.AWSMachine.Spec.CloudInit.InsecureSkipSecretsManager = true

secretSvc.EXPECT().Delete(gomock.Any()).Return(nil).Times(0)
ec2Svc.EXPECT().TerminateInstanceAndWait(gomock.Any()).Return(nil).AnyTimes()

_, _ = reconciler.reconcileDelete(ms, cs, cs, cs, cs)
})
})

t.Run("Secrets management lifecycle when there's only a secret ARN and no node ref", func(t *testing.T) {
Expand Down