Skip to content

Commit d82537c

Browse files
awgreeneawgreene
authored
Update e2e catalogSources to run in restricted mode (#2909)
With the recent changes to default to legacy mode, some distributions of OLM are unable to run as the catalogSources are running in legacy mode in restricted namespaces. This commit configures the catalogSource pods in the e2e suite to run in restricted mode. Signed-off-by: Alexander Greene <[email protected]> Signed-off-by: Alexander Greene <[email protected]>
1 parent a0dab22 commit d82537c

13 files changed

+103
-6
lines changed

‎test/e2e/bundle_e2e_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ var _ = Describe("Installing bundles with new object types", func() {
102102
Spec: v1alpha1.CatalogSourceSpec{
103103
SourceType: v1alpha1.SourceTypeGrpc,
104104
Image: imageName,
105+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
106+
SecurityContextConfig: v1alpha1.Restricted,
107+
},
105108
},
106109
}
107110

‎test/e2e/catalog_e2e_test.go

+23-2
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
562562
Spec: v1alpha1.CatalogSourceSpec{
563563
SourceType: v1alpha1.SourceTypeGrpc,
564564
Address: net.JoinHostPort(mainCopy.Status.PodIP, "50051"),
565+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
566+
SecurityContextConfig: v1alpha1.Restricted,
567+
},
565568
},
566569
}
567570

@@ -702,6 +705,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
702705
Spec: v1alpha1.CatalogSourceSpec{
703706
SourceType: v1alpha1.SourceTypeGrpc,
704707
Image: communityOperatorsImage,
708+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
709+
SecurityContextConfig: v1alpha1.Restricted,
710+
},
705711
},
706712
}
707713

@@ -830,6 +836,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
830836
Spec: v1alpha1.CatalogSourceSpec{
831837
SourceType: v1alpha1.SourceTypeGrpc,
832838
Image: image,
839+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
840+
SecurityContextConfig: v1alpha1.Restricted,
841+
},
833842
UpdateStrategy: &v1alpha1.UpdateStrategy{
834843
RegistryPoll: &v1alpha1.RegistryPoll{
835844
// Using RawInterval rather than Interval due to this issue:
@@ -1014,6 +1023,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
10141023
Spec: v1alpha1.CatalogSourceSpec{
10151024
SourceType: v1alpha1.SourceTypeGrpc,
10161025
Image: catSrcImage + ":1.0.0-with-ListBundles-method",
1026+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
1027+
SecurityContextConfig: v1alpha1.Restricted,
1028+
},
10171029
},
10181030
}
10191031

@@ -1117,6 +1129,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
11171129
Spec: v1alpha1.CatalogSourceSpec{
11181130
SourceType: v1alpha1.SourceTypeGrpc,
11191131
Image: "quay.io/olmtest/catsrc-update-test:new",
1132+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
1133+
SecurityContextConfig: v1alpha1.Restricted,
1134+
},
11201135
UpdateStrategy: &v1alpha1.UpdateStrategy{
11211136
RegistryPoll: &v1alpha1.RegistryPoll{
11221137
RawInterval: "45s",
@@ -1195,6 +1210,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
11951210
Spec: v1alpha1.CatalogSourceSpec{
11961211
SourceType: v1alpha1.SourceTypeGrpc,
11971212
Image: "quay.io/olmtest/catsrc-update-test:new",
1213+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
1214+
SecurityContextConfig: v1alpha1.Restricted,
1215+
},
11981216
UpdateStrategy: &v1alpha1.UpdateStrategy{
11991217
RegistryPoll: &v1alpha1.RegistryPoll{
12001218
RawInterval: incorrectInterval,
@@ -1274,6 +1292,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
12741292
Spec: v1alpha1.CatalogSourceSpec{
12751293
SourceType: v1alpha1.SourceTypeGrpc,
12761294
Image: "quay.io/olmtest/catsrc-update-test:old",
1295+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
1296+
SecurityContextConfig: v1alpha1.Restricted,
1297+
},
12771298
},
12781299
}
12791300

@@ -1511,11 +1532,11 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
15111532
Labels: map[string]string{"olm.catalogSource": sourceName},
15121533
},
15131534
Spec: v1alpha1.CatalogSourceSpec{
1535+
SourceType: v1alpha1.SourceTypeGrpc,
1536+
Image: "quay.io/olmtest/old-opm-catsrc:v1.21.0",
15141537
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
15151538
SecurityContextConfig: operatorsv1alpha1.Legacy,
15161539
},
1517-
SourceType: v1alpha1.SourceTypeGrpc,
1518-
Image: "quay.io/olmtest/old-opm-catsrc:v1.21.0",
15191540
},
15201541
}
15211542

‎test/e2e/catalog_exclusion_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ var _ = Describe("Global Catalog Exclusion", func() {
5454
DisplayName: "Broken Global Catalog Source",
5555
SourceType: v1alpha1.SourceTypeGrpc,
5656
Address: "1.1.1.1:1337", // points to non-existing service
57+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
58+
SecurityContextConfig: v1alpha1.Restricted,
59+
},
5760
},
5861
}
5962
_ = determinedE2eClient.Create(context.Background(), globalCatalog)

‎test/e2e/catsrc_pod_config_e2e_test.go

+11-4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ var _ = Describe("CatalogSource Grpc Pod Config", func() {
5656
Spec: v1alpha1.CatalogSourceSpec{
5757
SourceType: v1alpha1.SourceTypeGrpc,
5858
Image: "repo/image:tag",
59+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
60+
SecurityContextConfig: v1alpha1.Restricted,
61+
},
5962
},
6063
}
6164
})
@@ -78,7 +81,8 @@ var _ = Describe("CatalogSource Grpc Pod Config", func() {
7881

7982
// create catalog source
8083
catalogSource.Spec.GrpcPodConfig = &v1alpha1.GrpcPodConfig{
81-
PriorityClassName: &overridenPriorityClassName,
84+
PriorityClassName: &overridenPriorityClassName,
85+
SecurityContextConfig: v1alpha1.Restricted,
8286
}
8387
mustCreateCatalogSource(client, catalogSource)
8488

@@ -95,7 +99,8 @@ var _ = Describe("CatalogSource Grpc Pod Config", func() {
9599

96100
// create catalog source
97101
catalogSource.Spec.GrpcPodConfig = &v1alpha1.GrpcPodConfig{
98-
PriorityClassName: &overridenPriorityClassName,
102+
PriorityClassName: &overridenPriorityClassName,
103+
SecurityContextConfig: v1alpha1.Restricted,
99104
}
100105
mustCreateCatalogSource(client, catalogSource)
101106

@@ -115,7 +120,8 @@ var _ = Describe("CatalogSource Grpc Pod Config", func() {
115120

116121
// create catalog source
117122
catalogSource.Spec.GrpcPodConfig = &v1alpha1.GrpcPodConfig{
118-
NodeSelector: overridenNodeSelector,
123+
NodeSelector: overridenNodeSelector,
124+
SecurityContextConfig: v1alpha1.Restricted,
119125
}
120126
mustCreateCatalogSource(client, catalogSource)
121127

@@ -145,7 +151,8 @@ var _ = Describe("CatalogSource Grpc Pod Config", func() {
145151

146152
// create catalog source
147153
catalogSource.Spec.GrpcPodConfig = &v1alpha1.GrpcPodConfig{
148-
Tolerations: overriddenTolerations,
154+
Tolerations: overriddenTolerations,
155+
SecurityContextConfig: v1alpha1.Restricted,
149156
}
150157
mustCreateCatalogSource(client, catalogSource)
151158

‎test/e2e/dynamic_resource_e2e_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ var _ = Describe("Subscriptions create required objects from Catalogs", func() {
6868
Spec: v1alpha1.CatalogSourceSpec{
6969
Image: "quay.io/olmtest/catsrc_dynamic_resources:e2e-test",
7070
SourceType: v1alpha1.SourceTypeGrpc,
71+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
72+
SecurityContextConfig: v1alpha1.Restricted,
73+
},
7174
},
7275
}
7376

‎test/e2e/gc_e2e_test.go

+9
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,9 @@ var _ = Describe("Garbage collection for dependent resources", func() {
350350
Spec: v1alpha1.CatalogSourceSpec{
351351
SourceType: v1alpha1.SourceTypeGrpc,
352352
Image: imageName,
353+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
354+
SecurityContextConfig: v1alpha1.Restricted,
355+
},
353356
},
354357
}
355358

@@ -470,6 +473,9 @@ var _ = Describe("Garbage collection for dependent resources", func() {
470473
Spec: v1alpha1.CatalogSourceSpec{
471474
SourceType: v1alpha1.SourceTypeGrpc,
472475
Image: imageName,
476+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
477+
SecurityContextConfig: v1alpha1.Restricted,
478+
},
473479
},
474480
}
475481

@@ -585,6 +591,9 @@ var _ = Describe("Garbage collection for dependent resources", func() {
585591
Spec: v1alpha1.CatalogSourceSpec{
586592
SourceType: v1alpha1.SourceTypeGrpc,
587593
Image: imageName,
594+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
595+
SecurityContextConfig: v1alpha1.Restricted,
596+
},
588597
},
589598
}
590599

‎test/e2e/installplan_e2e_test.go

+12
Original file line numberDiff line numberDiff line change
@@ -3089,6 +3089,9 @@ var _ = Describe("Install Plan", func() {
30893089
Spec: operatorsv1alpha1.CatalogSourceSpec{
30903090
Image: "quay.io/operator-framework/ci-index:latest",
30913091
SourceType: operatorsv1alpha1.SourceTypeGrpc,
3092+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
3093+
SecurityContextConfig: operatorsv1alpha1.Restricted,
3094+
},
30923095
},
30933096
}
30943097
catsrc, err = crc.OperatorsV1alpha1().CatalogSources(catsrc.GetNamespace()).Create(context.Background(), catsrc, metav1.CreateOptions{})
@@ -3245,6 +3248,9 @@ var _ = Describe("Install Plan", func() {
32453248
Spec: operatorsv1alpha1.CatalogSourceSpec{
32463249
SourceType: operatorsv1alpha1.SourceTypeGrpc,
32473250
Address: dependentCatalogSource.Status.RegistryServiceStatus.Address(),
3251+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
3252+
SecurityContextConfig: operatorsv1alpha1.Restricted,
3253+
},
32483254
},
32493255
}
32503256
addressSource.SetName(genName("alt-dep-"))
@@ -3419,6 +3425,9 @@ var _ = Describe("Install Plan", func() {
34193425
Spec: operatorsv1alpha1.CatalogSourceSpec{
34203426
Image: "localhost:0/not/exist:catsrc",
34213427
SourceType: operatorsv1alpha1.SourceTypeGrpc,
3428+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
3429+
SecurityContextConfig: operatorsv1alpha1.Restricted,
3430+
},
34223431
},
34233432
}
34243433
Eventually(func() error {
@@ -3633,6 +3642,9 @@ var _ = Describe("Install Plan", func() {
36333642
Spec: operatorsv1alpha1.CatalogSourceSpec{
36343643
Image: "quay.io/operator-framework/ci-index:latest",
36353644
SourceType: operatorsv1alpha1.SourceTypeGrpc,
3645+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
3646+
SecurityContextConfig: operatorsv1alpha1.Restricted,
3647+
},
36363648
},
36373649
}
36383650
catsrc, err = crc.OperatorsV1alpha1().CatalogSources(catsrc.GetNamespace()).Create(context.Background(), catsrc, metav1.CreateOptions{})

‎test/e2e/magic_catalog.go

+3
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,9 @@ func (c *MagicCatalog) makeCatalogSource() *operatorsv1alpha1.CatalogSource {
247247
Spec: operatorsv1alpha1.CatalogSourceSpec{
248248
SourceType: operatorsv1alpha1.SourceTypeGrpc,
249249
Address: fmt.Sprintf("%s.%s.svc:50051", c.serviceName, c.namespace),
250+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
251+
SecurityContextConfig: operatorsv1alpha1.Restricted,
252+
},
250253
},
251254
}
252255
}

‎test/e2e/operator_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,9 @@ var _ = Describe("Operator API", func() {
267267
Spec: operatorsv1alpha1.CatalogSourceSpec{
268268
SourceType: operatorsv1alpha1.SourceTypeGrpc,
269269
Image: "quay.io/operator-framework/ci-index:latest",
270+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
271+
SecurityContextConfig: operatorsv1alpha1.Restricted,
272+
},
270273
},
271274
}
272275
cs.SetNamespace(ns.GetName())

‎test/e2e/packagemanifest_e2e_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ var _ = Describe("Package Manifest API lists available Operators from Catalog So
227227
SourceType: v1alpha1.SourceTypeGrpc,
228228
Image: image,
229229
DisplayName: displayName,
230+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
231+
SecurityContextConfig: v1alpha1.Restricted,
232+
},
230233
},
231234
}
232235

‎test/e2e/subscription_e2e_test.go

+15
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,9 @@ var _ = Describe("Subscription", func() {
773773
},
774774
Spec: operatorsv1alpha1.CatalogSourceSpec{
775775
SourceType: "goose",
776+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
777+
SecurityContextConfig: operatorsv1alpha1.Restricted,
778+
},
776779
},
777780
}
778781

@@ -832,6 +835,9 @@ var _ = Describe("Subscription", func() {
832835
},
833836
Spec: operatorsv1alpha1.CatalogSourceSpec{
834837
SourceType: operatorsv1alpha1.SourceTypeGrpc,
838+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
839+
SecurityContextConfig: operatorsv1alpha1.Restricted,
840+
},
835841
},
836842
}
837843

@@ -889,6 +895,9 @@ var _ = Describe("Subscription", func() {
889895
},
890896
Spec: operatorsv1alpha1.CatalogSourceSpec{
891897
SourceType: operatorsv1alpha1.SourceTypeInternal,
898+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
899+
SecurityContextConfig: operatorsv1alpha1.Restricted,
900+
},
892901
},
893902
}
894903

@@ -942,6 +951,9 @@ var _ = Describe("Subscription", func() {
942951
},
943952
Spec: operatorsv1alpha1.CatalogSourceSpec{
944953
SourceType: operatorsv1alpha1.SourceTypeInternal,
954+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
955+
SecurityContextConfig: operatorsv1alpha1.Restricted,
956+
},
945957
},
946958
}
947959

@@ -2528,6 +2540,9 @@ var (
25282540
Spec: operatorsv1alpha1.CatalogSourceSpec{
25292541
SourceType: "internal",
25302542
ConfigMap: catalogConfigMapName,
2543+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
2544+
SecurityContextConfig: operatorsv1alpha1.Restricted,
2545+
},
25312546
},
25322547
}
25332548
)

‎test/e2e/util.go

+12
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,9 @@ func createInvalidGRPCCatalogSource(c operatorclient.ClientInterface, crc versio
582582
Spec: operatorsv1alpha1.CatalogSourceSpec{
583583
SourceType: "grpc",
584584
Image: "localhost:0/not/exists:catsrc",
585+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
586+
SecurityContextConfig: operatorsv1alpha1.Restricted,
587+
},
585588
},
586589
}
587590

@@ -616,6 +619,9 @@ func createInternalCatalogSource(
616619
Spec: operatorsv1alpha1.CatalogSourceSpec{
617620
SourceType: "internal",
618621
ConfigMap: configMap.GetName(),
622+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
623+
SecurityContextConfig: operatorsv1alpha1.Restricted,
624+
},
619625
},
620626
}
621627

@@ -657,6 +663,9 @@ func createInternalCatalogSourceWithPriority(c operatorclient.ClientInterface,
657663
SourceType: "internal",
658664
ConfigMap: configMap.GetName(),
659665
Priority: priority,
666+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
667+
SecurityContextConfig: operatorsv1alpha1.Restricted,
668+
},
660669
},
661670
}
662671
catalogSource.SetNamespace(namespace)
@@ -700,6 +709,9 @@ func createV1CRDInternalCatalogSource(
700709
Spec: operatorsv1alpha1.CatalogSourceSpec{
701710
SourceType: "internal",
702711
ConfigMap: configMap.GetName(),
712+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
713+
SecurityContextConfig: operatorsv1alpha1.Restricted,
714+
},
703715
},
704716
}
705717
catalogSource.SetNamespace(namespace)

‎test/e2e/webhook_e2e_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,9 @@ var _ = Describe("CSVs with a Webhook", func() {
669669
Spec: operatorsv1alpha1.CatalogSourceSpec{
670670
SourceType: operatorsv1alpha1.SourceTypeGrpc,
671671
Image: catSrcImage + ":0.0.3",
672+
GrpcPodConfig: &operatorsv1alpha1.GrpcPodConfig{
673+
SecurityContextConfig: operatorsv1alpha1.Restricted,
674+
},
672675
},
673676
}
674677

0 commit comments

Comments
 (0)