Skip to content

Commit

Permalink
Revert "Move the e2e into the operator-controler-system ns (#927)" (#930
Browse files Browse the repository at this point in the history
)

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.
  • Loading branch information
tmshort committed Jun 13, 2024
1 parent a1cb8a6 commit 5d12b49
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ e2e: #EXHELP Run the e2e tests.
go test -v ./test/e2e/...

E2E_REGISTRY_NAME := docker-registry
E2E_REGISTRY_NAMESPACE := operator-controller-system
E2E_REGISTRY_NAMESPACE := operator-controller-e2e

export REG_PKG_NAME := registry-operator
export REGISTRY_ROOT := $(E2E_REGISTRY_NAME).$(E2E_REGISTRY_NAMESPACE).svc:5000
Expand Down
10 changes: 5 additions & 5 deletions testdata/catalogs/test-catalog/catalog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ entries:
schema: olm.bundle
name: prometheus-operator.1.0.0
package: prometheus
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.0
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.0
properties:
- type: olm.package
value:
Expand All @@ -34,7 +34,7 @@ properties:
schema: olm.bundle
name: prometheus-operator.1.0.1
package: prometheus
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.1
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.1
properties:
- type: olm.package
value:
Expand All @@ -44,7 +44,7 @@ properties:
schema: olm.bundle
name: prometheus-operator.1.2.0
package: prometheus
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.2.0
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.2.0
properties:
- type: olm.package
value:
Expand All @@ -54,7 +54,7 @@ properties:
schema: olm.bundle
name: prometheus-operator.2.0.0
package: prometheus
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v2.0.0
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v2.0.0
properties:
- type: olm.package
value:
Expand All @@ -74,7 +74,7 @@ entries:
schema: olm.bundle
name: package-with-webhooks.1.0.0
package: package-with-webhooks
image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/package-with-webhooks:v1.0.0
image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/package-with-webhooks:v1.0.0
properties:
- type: olm.package
value:
Expand Down

0 comments on commit 5d12b49

Please sign in to comment.