Skip to content

Commit 5d12b49

Browse files
authored
Revert "Move the e2e into the operator-controler-system ns (#927)" (#930)
This ends up overwriting the security policy of the operator-controller-system namespace, which really isn't something we want to do in a valid e2e test. Many of the e2e components need to run as root in order to do the things they need to do. This reverts commit aa48e70.
1 parent a1cb8a6 commit 5d12b49

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ e2e: #EXHELP Run the e2e tests.
121121
go test -v ./test/e2e/...
122122

123123
E2E_REGISTRY_NAME := docker-registry
124-
E2E_REGISTRY_NAMESPACE := operator-controller-system
124+
E2E_REGISTRY_NAMESPACE := operator-controller-e2e
125125

126126
export REG_PKG_NAME := registry-operator
127127
export REGISTRY_ROOT := $(E2E_REGISTRY_NAME).$(E2E_REGISTRY_NAMESPACE).svc:5000

testdata/catalogs/test-catalog/catalog.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ entries:
2424
schema: olm.bundle
2525
name: prometheus-operator.1.0.0
2626
package: prometheus
27-
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.0
27+
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.0
2828
properties:
2929
- type: olm.package
3030
value:
@@ -34,7 +34,7 @@ properties:
3434
schema: olm.bundle
3535
name: prometheus-operator.1.0.1
3636
package: prometheus
37-
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.1
37+
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.1
3838
properties:
3939
- type: olm.package
4040
value:
@@ -44,7 +44,7 @@ properties:
4444
schema: olm.bundle
4545
name: prometheus-operator.1.2.0
4646
package: prometheus
47-
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.2.0
47+
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.2.0
4848
properties:
4949
- type: olm.package
5050
value:
@@ -54,7 +54,7 @@ properties:
5454
schema: olm.bundle
5555
name: prometheus-operator.2.0.0
5656
package: prometheus
57-
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v2.0.0
57+
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v2.0.0
5858
properties:
5959
- type: olm.package
6060
value:
@@ -74,7 +74,7 @@ entries:
7474
schema: olm.bundle
7575
name: package-with-webhooks.1.0.0
7676
package: package-with-webhooks
77-
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/package-with-webhooks:v1.0.0
77+
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/package-with-webhooks:v1.0.0
7878
properties:
7979
- type: olm.package
8080
value:

0 commit comments

Comments
 (0)