Skip to content

Commit a0fb669

Browse files
porthorianporthorian
committed
more test fixes
1 parent 3764046 commit a0fb669

File tree

2 files changed

+80
-22
lines changed

2 files changed

+80
-22
lines changed

‎internal/mode/static/state/change_processor_test.go

Lines changed: 74 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ var _ = Describe("ChangeProcessor", func() {
422422
var (
423423
gcUpdated *v1.GatewayClass
424424
diffNsTLSSecret, sameNsTLSSecret *apiv1.Secret
425+
diffNsTLSCert, sameNsTLSCert *graph.CertificateBundle
425426
hr1, hr1Updated, hr2 *v1.HTTPRoute
426427
gr1, gr1Updated, gr2 *v1.GRPCRoute
427428
tr1, tr1Updated, tr2 *v1alpha2.TLSRoute
@@ -592,6 +593,14 @@ var _ = Describe("ChangeProcessor", func() {
592593
apiv1.TLSPrivateKeyKey: key,
593594
},
594595
}
596+
sameNsTLSCert = graph.NewCertificateBundle(
597+
types.NamespacedName{Namespace: sameNsTLSSecret.Namespace, Name: sameNsTLSSecret.Name},
598+
"Secret",
599+
&graph.Certificate{
600+
TLSCert: cert,
601+
TLSPrivateKey: key,
602+
},
603+
)
595604

596605
diffNsTLSSecret = &apiv1.Secret{
597606
TypeMeta: metav1.TypeMeta{
@@ -608,6 +617,15 @@ var _ = Describe("ChangeProcessor", func() {
608617
},
609618
}
610619

620+
diffNsTLSCert = graph.NewCertificateBundle(
621+
types.NamespacedName{Namespace: diffNsTLSSecret.Namespace, Name: diffNsTLSSecret.Name},
622+
"Secret",
623+
&graph.Certificate{
624+
TLSCert: cert,
625+
TLSPrivateKey: key,
626+
},
627+
)
628+
611629
gw1 = createGateway(
612630
"gateway-1",
613631
createHTTPListener(),
@@ -1200,6 +1218,14 @@ var _ = Describe("ChangeProcessor", func() {
12001218

12011219
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
12021220
Source: diffNsTLSSecret,
1221+
CertBundle: graph.NewCertificateBundle(
1222+
types.NamespacedName{Namespace: diffNsTLSSecret.Namespace, Name: diffNsTLSSecret.Name},
1223+
"Secret",
1224+
&graph.Certificate{
1225+
TLSCert: cert,
1226+
TLSPrivateKey: key,
1227+
},
1228+
),
12031229
}
12041230

12051231
processAndValidateGraph(expGraph)
@@ -1220,6 +1246,14 @@ var _ = Describe("ChangeProcessor", func() {
12201246

12211247
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
12221248
Source: diffNsTLSSecret,
1249+
CertBundle: graph.NewCertificateBundle(
1250+
types.NamespacedName{Namespace: diffNsTLSSecret.Namespace, Name: diffNsTLSSecret.Name},
1251+
"Secret",
1252+
&graph.Certificate{
1253+
TLSCert: cert,
1254+
TLSPrivateKey: key,
1255+
},
1256+
),
12231257
}
12241258

12251259
processAndValidateGraph(expGraph)
@@ -1230,7 +1264,8 @@ var _ = Describe("ChangeProcessor", func() {
12301264
processor.CaptureUpsertChange(trServiceRefGrant)
12311265

12321266
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1233-
Source: diffNsTLSSecret,
1267+
Source: diffNsTLSSecret,
1268+
CertBundle: diffNsTLSCert,
12341269
}
12351270

12361271
processAndValidateGraph(expGraph)
@@ -1241,7 +1276,8 @@ var _ = Describe("ChangeProcessor", func() {
12411276
processor.CaptureUpsertChange(gatewayAPICRDUpdated)
12421277

12431278
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1244-
Source: diffNsTLSSecret,
1279+
Source: diffNsTLSSecret,
1280+
CertBundle: diffNsTLSCert,
12451281
}
12461282

12471283
expGraph.GatewayClass.Conditions = conditions.NewGatewayClassSupportedVersionBestEffort(
@@ -1258,7 +1294,8 @@ var _ = Describe("ChangeProcessor", func() {
12581294
processor.CaptureUpsertChange(gatewayAPICRDSameVersion)
12591295

12601296
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1261-
Source: diffNsTLSSecret,
1297+
Source: diffNsTLSSecret,
1298+
CertBundle: diffNsTLSCert,
12621299
}
12631300

12641301
expGraph.GatewayClass.Conditions = conditions.NewGatewayClassSupportedVersionBestEffort(
@@ -1277,7 +1314,8 @@ var _ = Describe("ChangeProcessor", func() {
12771314
processor.CaptureUpsertChange(gatewayAPICRD)
12781315

12791316
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1280-
Source: diffNsTLSSecret,
1317+
Source: diffNsTLSSecret,
1318+
CertBundle: diffNsTLSCert,
12811319
}
12821320

12831321
processAndValidateGraph(expGraph)
@@ -1293,7 +1331,8 @@ var _ = Describe("ChangeProcessor", func() {
12931331
listener80 := getListenerByName(expGraph.Gateway, httpListenerName)
12941332
listener80.Routes[httpRouteKey1].Source.SetGeneration(hr1Updated.Generation)
12951333
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1296-
Source: diffNsTLSSecret,
1334+
Source: diffNsTLSSecret,
1335+
CertBundle: diffNsTLSCert,
12971336
}
12981337

12991338
processAndValidateGraph(expGraph)
@@ -1310,7 +1349,8 @@ var _ = Describe("ChangeProcessor", func() {
13101349
listener80 := getListenerByName(expGraph.Gateway, httpListenerName)
13111350
listener80.Routes[grpcRouteKey1].Source.SetGeneration(gr1Updated.Generation)
13121351
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1313-
Source: diffNsTLSSecret,
1352+
Source: diffNsTLSSecret,
1353+
CertBundle: diffNsTLSCert,
13141354
}
13151355

13161356
processAndValidateGraph(expGraph)
@@ -1324,7 +1364,8 @@ var _ = Describe("ChangeProcessor", func() {
13241364
tlsListener.L4Routes[trKey1].Source.SetGeneration(tr1Updated.Generation)
13251365

13261366
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1327-
Source: diffNsTLSSecret,
1367+
Source: diffNsTLSSecret,
1368+
CertBundle: diffNsTLSCert,
13281369
}
13291370

13301371
processAndValidateGraph(expGraph)
@@ -1336,7 +1377,8 @@ var _ = Describe("ChangeProcessor", func() {
13361377

13371378
expGraph.Gateway.Source.Generation = gw1Updated.Generation
13381379
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1339-
Source: diffNsTLSSecret,
1380+
Source: diffNsTLSSecret,
1381+
CertBundle: diffNsTLSCert,
13401382
}
13411383

13421384
processAndValidateGraph(expGraph)
@@ -1348,7 +1390,8 @@ var _ = Describe("ChangeProcessor", func() {
13481390

13491391
expGraph.GatewayClass.Source.Generation = gcUpdated.Generation
13501392
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1351-
Source: diffNsTLSSecret,
1393+
Source: diffNsTLSSecret,
1394+
CertBundle: diffNsTLSCert,
13521395
}
13531396

13541397
processAndValidateGraph(expGraph)
@@ -1359,7 +1402,8 @@ var _ = Describe("ChangeProcessor", func() {
13591402
processor.CaptureUpsertChange(diffNsTLSSecret)
13601403

13611404
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1362-
Source: diffNsTLSSecret,
1405+
Source: diffNsTLSSecret,
1406+
CertBundle: diffNsTLSCert,
13631407
}
13641408

13651409
processAndValidateGraph(expGraph)
@@ -1368,7 +1412,8 @@ var _ = Describe("ChangeProcessor", func() {
13681412
When("no changes are captured", func() {
13691413
It("returns nil graph", func() {
13701414
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1371-
Source: diffNsTLSSecret,
1415+
Source: diffNsTLSSecret,
1416+
CertBundle: diffNsTLSCert,
13721417
}
13731418

13741419
changed, graphCfg := processor.Process()
@@ -1382,7 +1427,8 @@ var _ = Describe("ChangeProcessor", func() {
13821427
processor.CaptureUpsertChange(sameNsTLSSecret)
13831428

13841429
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1385-
Source: diffNsTLSSecret,
1430+
Source: diffNsTLSSecret,
1431+
CertBundle: diffNsTLSCert,
13861432
}
13871433

13881434
changed, graphCfg := processor.Process()
@@ -1399,7 +1445,8 @@ var _ = Describe("ChangeProcessor", func() {
13991445
{Namespace: "test", Name: "gateway-2"}: gw2,
14001446
}
14011447
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1402-
Source: diffNsTLSSecret,
1448+
Source: diffNsTLSSecret,
1449+
CertBundle: diffNsTLSCert,
14031450
}
14041451

14051452
processAndValidateGraph(expGraph)
@@ -1422,7 +1469,8 @@ var _ = Describe("ChangeProcessor", func() {
14221469
FailedCondition: staticConds.NewRouteNotAcceptedGatewayIgnored(),
14231470
}
14241471
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1425-
Source: diffNsTLSSecret,
1472+
Source: diffNsTLSSecret,
1473+
CertBundle: diffNsTLSCert,
14261474
}
14271475

14281476
processAndValidateGraph(expGraph)
@@ -1456,7 +1504,8 @@ var _ = Describe("ChangeProcessor", func() {
14561504
}
14571505

14581506
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1459-
Source: diffNsTLSSecret,
1507+
Source: diffNsTLSSecret,
1508+
CertBundle: diffNsTLSCert,
14601509
}
14611510

14621511
processAndValidateGraph(expGraph)
@@ -1496,7 +1545,8 @@ var _ = Describe("ChangeProcessor", func() {
14961545
}
14971546

14981547
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(diffNsTLSSecret)] = &graph.Secret{
1499-
Source: diffNsTLSSecret,
1548+
Source: diffNsTLSSecret,
1549+
CertBundle: diffNsTLSCert,
15001550
}
15011551

15021552
processAndValidateGraph(expGraph)
@@ -1543,7 +1593,8 @@ var _ = Describe("ChangeProcessor", func() {
15431593
sameNsTLSSecretRef := helpers.GetPointer(client.ObjectKeyFromObject(sameNsTLSSecret))
15441594
listener443.ResolvedSecret = sameNsTLSSecretRef
15451595
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(sameNsTLSSecret)] = &graph.Secret{
1546-
Source: sameNsTLSSecret,
1596+
Source: sameNsTLSSecret,
1597+
CertBundle: sameNsTLSCert,
15471598
}
15481599

15491600
delete(expGraph.ReferencedServices, expRouteHR1.Spec.Rules[0].BackendRefs[0].SvcNsName)
@@ -1594,7 +1645,8 @@ var _ = Describe("ChangeProcessor", func() {
15941645
sameNsTLSSecretRef := helpers.GetPointer(client.ObjectKeyFromObject(sameNsTLSSecret))
15951646
listener443.ResolvedSecret = sameNsTLSSecretRef
15961647
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(sameNsTLSSecret)] = &graph.Secret{
1597-
Source: sameNsTLSSecret,
1648+
Source: sameNsTLSSecret,
1649+
CertBundle: sameNsTLSCert,
15981650
}
15991651

16001652
delete(expGraph.ReferencedServices, expRouteHR1.Spec.Rules[0].BackendRefs[0].SvcNsName)
@@ -1638,7 +1690,8 @@ var _ = Describe("ChangeProcessor", func() {
16381690
sameNsTLSSecretRef := helpers.GetPointer(client.ObjectKeyFromObject(sameNsTLSSecret))
16391691
listener443.ResolvedSecret = sameNsTLSSecretRef
16401692
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(sameNsTLSSecret)] = &graph.Secret{
1641-
Source: sameNsTLSSecret,
1693+
Source: sameNsTLSSecret,
1694+
CertBundle: sameNsTLSCert,
16421695
}
16431696

16441697
delete(expGraph.ReferencedServices, expRouteHR1.Spec.Rules[0].BackendRefs[0].SvcNsName)
@@ -1679,7 +1732,8 @@ var _ = Describe("ChangeProcessor", func() {
16791732
sameNsTLSSecretRef := helpers.GetPointer(client.ObjectKeyFromObject(sameNsTLSSecret))
16801733
listener443.ResolvedSecret = sameNsTLSSecretRef
16811734
expGraph.ReferencedSecrets[client.ObjectKeyFromObject(sameNsTLSSecret)] = &graph.Secret{
1682-
Source: sameNsTLSSecret,
1735+
Source: sameNsTLSSecret,
1736+
CertBundle: sameNsTLSCert,
16831737
}
16841738

16851739
expRouteHR1.Spec.Rules[0].BackendRefs[0].SvcNsName = types.NamespacedName{}

‎internal/mode/static/state/dataplane/configuration.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,15 @@ func buildRefCertificateBundles(
232232
bundles := []graph.CertificateBundle{}
233233

234234
for _, secret := range secrets {
235-
bundles = append(bundles, *secret.CertBundle)
235+
if secret.CertBundle != nil {
236+
bundles = append(bundles, *secret.CertBundle)
237+
}
236238
}
237239

238240
for _, configMap := range configMaps {
239-
bundles = append(bundles, *configMap.CertBundle)
241+
if configMap.CertBundle != nil {
242+
bundles = append(bundles, *configMap.CertBundle)
243+
}
240244
}
241245

242246
return bundles

0 commit comments

Comments
 (0)