@@ -144,7 +144,7 @@ var _ = Describe("Generate Image registry patches", func() {
144
144
145
145
testDefs := []struct {
146
146
capitest.PatchTestDef
147
- expectOwnerReferenceOnSecret bool
147
+ expectOwnerReferenceOnSecrets bool
148
148
}{
149
149
{
150
150
PatchTestDef : capitest.PatchTestDef {
@@ -271,7 +271,7 @@ var _ = Describe("Generate Image registry patches", func() {
271
271
},
272
272
},
273
273
},
274
- expectOwnerReferenceOnSecret : true ,
274
+ expectOwnerReferenceOnSecrets : true ,
275
275
},
276
276
{
277
277
PatchTestDef : capitest.PatchTestDef {
@@ -390,7 +390,7 @@ var _ = Describe("Generate Image registry patches", func() {
390
390
},
391
391
},
392
392
},
393
- expectOwnerReferenceOnSecret : true ,
393
+ expectOwnerReferenceOnSecrets : true ,
394
394
},
395
395
{
396
396
PatchTestDef : capitest.PatchTestDef {
@@ -457,18 +457,24 @@ var _ = Describe("Generate Image registry patches", func() {
457
457
It (tt .Name , func () {
458
458
capitest .AssertGeneratePatches (GinkgoT (), patchGenerator , & tt .PatchTestDef )
459
459
460
- // validate an OwnerReference was added to the Secret
461
- if tt .expectOwnerReferenceOnSecret {
460
+ // validate an OwnerReference was added to the user provided and generated Secrets
461
+ if tt .expectOwnerReferenceOnSecrets {
462
462
client , err := helpers .TestEnv .GetK8sClientWithScheme (clientScheme )
463
463
gomega .Expect (err ).To (gomega .BeNil ())
464
464
465
- secret := newRegistryCredentialsSecret (validSecretName , request .Namespace )
466
- gomega .Expect (client .Get (
467
- context .Background (),
468
- ctrlclient .ObjectKeyFromObject (secret ),
469
- secret ,
470
- )).To (gomega .BeNil ())
471
- gomega .Expect (secret .OwnerReferences ).ToNot (gomega .BeEmpty ())
465
+ for _ , name := range []string {validSecretName , credentialSecretName (request .ClusterName )} {
466
+ key := ctrlclient.ObjectKey {
467
+ Namespace : request .Namespace ,
468
+ Name : name ,
469
+ }
470
+ secret := & corev1.Secret {}
471
+ gomega .Expect (client .Get (
472
+ context .Background (),
473
+ key ,
474
+ secret ,
475
+ )).To (gomega .BeNil ())
476
+ gomega .Expect (secret .OwnerReferences ).ToNot (gomega .BeEmpty ())
477
+ }
472
478
}
473
479
})
474
480
}
0 commit comments