From dfd878617f321dd1321cc7b48273be5ae2297c05 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 11 Jun 2024 13:41:21 -0400 Subject: [PATCH] Move the e2e into the operator-controler-system ns To allow access to the docker-registry certificate, move the e2e resources into the same namespace as the operator-controller-system namespace. Signed-off-by: Todd Short --- Makefile | 2 +- testdata/catalogs/test-catalog/catalog.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0f9eb20f..8a040ad3 100644 --- a/Makefile +++ b/Makefile @@ -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-e2e +E2E_REGISTRY_NAMESPACE := operator-controller-system export REG_PKG_NAME := registry-operator export REGISTRY_ROOT := $(E2E_REGISTRY_NAME).$(E2E_REGISTRY_NAMESPACE).svc:5000 diff --git a/testdata/catalogs/test-catalog/catalog.yaml b/testdata/catalogs/test-catalog/catalog.yaml index 2911e341..423bceef 100644 --- a/testdata/catalogs/test-catalog/catalog.yaml +++ b/testdata/catalogs/test-catalog/catalog.yaml @@ -24,7 +24,7 @@ entries: schema: olm.bundle name: prometheus-operator.1.0.0 package: prometheus -image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.0 +image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.0 properties: - type: olm.package value: @@ -34,7 +34,7 @@ properties: schema: olm.bundle name: prometheus-operator.1.0.1 package: prometheus -image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.1 +image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.0.1 properties: - type: olm.package value: @@ -44,7 +44,7 @@ properties: schema: olm.bundle name: prometheus-operator.1.2.0 package: prometheus -image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.2.0 +image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v1.2.0 properties: - type: olm.package value: @@ -54,7 +54,7 @@ properties: schema: olm.bundle name: prometheus-operator.2.0.0 package: prometheus -image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v2.0.0 +image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v2.0.0 properties: - type: olm.package value: @@ -74,7 +74,7 @@ entries: schema: olm.bundle name: package-with-webhooks.1.0.0 package: package-with-webhooks -image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/package-with-webhooks:v1.0.0 +image: docker-registry.operator-controller-system.svc.cluster.local:5000/bundles/registry-v1/package-with-webhooks:v1.0.0 properties: - type: olm.package value: