djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #311 from vmware-tanzu/dont-block-owner-deletion

Browse Source 
Remove blockOwnerDeletion from the supervisor secrets
This commit is contained in:
Margo Crawford 2021-01-05 13:18:39 -08:00 committed by GitHub
commit 0d4588aa8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/controller/supervisorconfig/generator/supervisor_secrets.go
View File

@ -206,7 +206,6 @@ func generateSecret(namespace, name string, labels map[string]string, secretData
Kind: "Deployment", Kind: "Deployment",
} }
blockOwnerDeletion := true
isController := false isController := false
return &corev1.Secret{ return &corev1.Secret{
@ -215,12 +214,11 @@ func generateSecret(namespace, name string, labels map[string]string, secretData
Namespace: namespace, Namespace: namespace,
OwnerReferences: []metav1.OwnerReference{ OwnerReferences: []metav1.OwnerReference{
{ {
APIVersion: deploymentGVK.GroupVersion().String(), APIVersion: deploymentGVK.GroupVersion().String(),
Kind: deploymentGVK.Kind, Kind: deploymentGVK.Kind,
Name: owner.GetName(), Name: owner.GetName(),
UID: owner.GetUID(), UID: owner.GetUID(),
BlockOwnerDeletion: &blockOwnerDeletion, Controller: &isController,
Controller: &isController,
}, },
}, },
Labels: labels, Labels: labels,

27
internal/controller/supervisorconfig/generator/supervisor_secrets_test.go
View File

@ -268,20 +268,18 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
generatedSymmetricKey = []byte("some-neato-32-byte-generated-key") generatedSymmetricKey = []byte("some-neato-32-byte-generated-key")
otherGeneratedSymmetricKey = []byte("some-funio-32-byte-generated-key") otherGeneratedSymmetricKey = []byte("some-funio-32-byte-generated-key")
blockOwnerDeletion = true isController = false
isController = false generatedSecret = &corev1.Secret{
generatedSecret = &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: generatedSecretName, Name: generatedSecretName,
Namespace: generatedSecretNamespace, Namespace: generatedSecretNamespace,
OwnerReferences: []metav1.OwnerReference{ OwnerReferences: []metav1.OwnerReference{
{ {
APIVersion: ownerGVK.GroupVersion().String(), APIVersion: ownerGVK.GroupVersion().String(),
Kind: ownerGVK.Kind, Kind: ownerGVK.Kind,
Name: owner.GetName(), Name: owner.GetName(),
UID: owner.GetUID(), UID: owner.GetUID(),
BlockOwnerDeletion: &blockOwnerDeletion, Controller: &isController,
Controller: &isController,
}, },
}, },
Labels: labels, Labels: labels,
@ -298,12 +296,11 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
Namespace: generatedSecretNamespace, Namespace: generatedSecretNamespace,
OwnerReferences: []metav1.OwnerReference{ OwnerReferences: []metav1.OwnerReference{
{ {
APIVersion: ownerGVK.GroupVersion().String(), APIVersion: ownerGVK.GroupVersion().String(),
Kind: ownerGVK.Kind, Kind: ownerGVK.Kind,
Name: owner.GetName(), Name: owner.GetName(),
UID: owner.GetUID(), UID: owner.GetUID(),
BlockOwnerDeletion: &blockOwnerDeletion, Controller: &isController,
Controller: &isController,
}, },
}, },
Labels: labels, Labels: labels,