Change default namespace to olmv1-system

Use v0.14.0 of Catalogd which also uses olmv1-system namespace
operator-framework · Jun 13, 2024 · 3755d66 · 3755d66
1 parent 7d2fa3b
commit 3755d66
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -57,7 +57,7 @@ import (
 
 var (
 	setupLog               = ctrl.Log.WithName("setup")
-	defaultSystemNamespace = "operator-controller-system"
+	defaultSystemNamespace = "olmv1-system"
 )
 
 // podNamespace checks whether the controller is running in a Pod vs.

diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: operator-controller-system
+namespace: olmv1-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named

diff --git a/config/overlays/e2e/kustomization.yaml b/config/overlays/e2e/kustomization.yaml
@@ -1,4 +1,4 @@
-namespace: operator-controller-system
+namespace: olmv1-system
 
 resources:
 - ../../overlays/tls

diff --git a/config/overlays/tls/kustomization.yaml b/config/overlays/tls/kustomization.yaml
@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: operator-controller-system
+namespace: olmv1-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named

diff --git a/docs/Tasks/adding-a-catalog.md b/docs/Tasks/adding-a-catalog.md
@@ -113,7 +113,7 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
             Reason:                UnpackSuccessful
             Status:                True
             Type:                  Unpacked
-          Content URL:             http://catalogd-catalogserver.catalogd-system.svc/catalogs/operatorhubio/all.json
+          Content URL:             http://catalogd-catalogserver.olmv1-system.svc/catalogs/operatorhubio/all.json
           Observed Generation:     2
           Phase:                   Unpacked
           Resolved Source:

diff --git a/docs/Tasks/explore-available-packages.md b/docs/Tasks/explore-available-packages.md
@@ -11,7 +11,7 @@ Then you can query the catalog by using `curl` commands and the `jq` CLI tool to
 1. Port forward the catalog server service:
 
     ``` terminal
-    $ kubectl -n catalogd-system port-forward svc/catalogd-catalogserver 8080:80
+    $ kubectl -n olmv1-system port-forward svc/catalogd-catalogserver 8080:80
     ```
 
 2. Return a list of all the extensions in a catalog:

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0
 	github.com/operator-framework/api v0.25.0
-	github.com/operator-framework/catalogd v0.13.0
+	github.com/operator-framework/catalogd v0.14.0
 	github.com/operator-framework/helm-operator-plugins v0.2.2-0.20240520180534-f463c36fedf9
 	github.com/operator-framework/operator-registry v1.43.1
 	github.com/operator-framework/rukpak v0.23.1

diff --git a/go.sum b/go.sum
@@ -475,8 +475,8 @@ github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE
 github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/operator-framework/api v0.25.0 h1:pSQwFSoPmZaTIERadawxtCwicehLkC7i9n3w3+70SVI=
 github.com/operator-framework/api v0.25.0/go.mod h1:PvyCQb0x53ytIqdTECH5e+iqv+am3uZ0qGsZWmL35gQ=
-github.com/operator-framework/catalogd v0.13.0 h1:yOhEb0LpvGbZymippotpau5gFMyUnq8zMnrEYrTaJIQ=
-github.com/operator-framework/catalogd v0.13.0/go.mod h1:v405w8d89Lr7K8IVE/x/Q37JtxvgdzLXGpgJxJ2Nweg=
+github.com/operator-framework/catalogd v0.14.0 h1:M/kDqhH1hBB9amUk7/dAV4WZuJIa5ARboeY6GMjhx0E=
+github.com/operator-framework/catalogd v0.14.0/go.mod h1:84M4gm0JPrwOLVbEOoCns/xjlg4ljenVMPYUO/Cs+Wc=
 github.com/operator-framework/helm-operator-plugins v0.2.2-0.20240520180534-f463c36fedf9 h1:f7/TMBpuIZEQ3JbD9UyP1L1ZCSLLWdR2aPN+A+dOHFY=
 github.com/operator-framework/helm-operator-plugins v0.2.2-0.20240520180534-f463c36fedf9/go.mod h1:ly6Bd9rSzmt37Wy6WtZHmA+IY9zG958MryJFLcVpCXw=
 github.com/operator-framework/operator-lib v0.14.0 h1:er+BgZymZD1im2wytLJiPLZpGALAX6N0gXaHx3PKbO4=

diff --git a/hack/e2e-coverage.sh b/hack/e2e-coverage.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 COVERAGE_OUTPUT="${COVERAGE_OUTPUT:-e2e-cover.out}"
 
-OPERATOR_CONTROLLER_NAMESPACE="operator-controller-system"
+OPERATOR_CONTROLLER_NAMESPACE="olmv1-system"
 OPERATOR_CONTROLLER_MANAGER_DEPLOYMENT_NAME="operator-controller-controller-manager"
 COPY_POD_NAME="e2e-coverage-copy-pod"
 

diff --git a/scripts/install.tpl.sh b/scripts/install.tpl.sh
@@ -35,8 +35,8 @@ function kubectl_wait() {
 kubectl apply -f "https://github.com/cert-manager/cert-manager/releases/download/${cert_mgr_version}/cert-manager.yaml"
 kubectl_wait "cert-manager" "deployment/cert-manager-webhook" "60s"
 
-curl -L https://github.com/operator-framework/catalogd/releases/download/${catalogd_version}/catalogd.yaml | sed s/catalogd-system/operator-controller-system/g | kubectl apply -f -
-kubectl_wait "operator-controller-system" "deployment/catalogd-controller-manager" "60s"
+kubectl apply -f "https://github.com/operator-framework/catalogd/releases/download/${catalogd_version}/catalogd.yaml"
+kubectl_wait "olmv1-system" "deployment/catalogd-controller-manager" "60s"
 
 kubectl apply -f "${operator_controller_manifest}"
-kubectl_wait "operator-controller-system" "deployment/operator-controller-controller-manager" "60s"
+kubectl_wait "olmv1-system" "deployment/operator-controller-controller-manager" "60s"