Skip to content

Commit 3755d66

Browse files
committed
Change default namespace to olmv1-system
Use v0.14.0 of Catalogd which also uses olmv1-system namespace
1 parent 7d2fa3b commit 3755d66

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

cmd/manager/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import (
5757

5858
var (
5959
setupLog = ctrl.Log.WithName("setup")
60-
defaultSystemNamespace = "operator-controller-system"
60+
defaultSystemNamespace = "olmv1-system"
6161
)
6262

6363
// podNamespace checks whether the controller is running in a Pod vs.

config/base/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Adds namespace to all resources.
2-
namespace: operator-controller-system
2+
namespace: olmv1-system
33

44
# Value of this field is prepended to the
55
# names of all resources, e.g. a deployment named

config/overlays/e2e/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace: operator-controller-system
1+
namespace: olmv1-system
22

33
resources:
44
- ../../overlays/tls

config/overlays/tls/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Adds namespace to all resources.
2-
namespace: operator-controller-system
2+
namespace: olmv1-system
33

44
# Value of this field is prepended to the
55
# names of all resources, e.g. a deployment named

docs/Tasks/adding-a-catalog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
113113
Reason: UnpackSuccessful
114114
Status: True
115115
Type: Unpacked
116-
Content URL: http://catalogd-catalogserver.catalogd-system.svc/catalogs/operatorhubio/all.json
116+
Content URL: http://catalogd-catalogserver.olmv1-system.svc/catalogs/operatorhubio/all.json
117117
Observed Generation: 2
118118
Phase: Unpacked
119119
Resolved Source:

docs/Tasks/explore-available-packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Then you can query the catalog by using `curl` commands and the `jq` CLI tool to
1111
1. Port forward the catalog server service:
1212

1313
``` terminal
14-
$ kubectl -n catalogd-system port-forward svc/catalogd-catalogserver 8080:80
14+
$ kubectl -n olmv1-system port-forward svc/catalogd-catalogserver 8080:80
1515
```
1616
1717
2. Return a list of all the extensions in a catalog:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/go-logr/logr v1.4.2
1111
github.com/google/go-cmp v0.6.0
1212
github.com/operator-framework/api v0.25.0
13-
github.com/operator-framework/catalogd v0.13.0
13+
github.com/operator-framework/catalogd v0.14.0
1414
github.com/operator-framework/helm-operator-plugins v0.2.2-0.20240520180534-f463c36fedf9
1515
github.com/operator-framework/operator-registry v1.43.1
1616
github.com/operator-framework/rukpak v0.23.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,8 @@ github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE
475475
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
476476
github.com/operator-framework/api v0.25.0 h1:pSQwFSoPmZaTIERadawxtCwicehLkC7i9n3w3+70SVI=
477477
github.com/operator-framework/api v0.25.0/go.mod h1:PvyCQb0x53ytIqdTECH5e+iqv+am3uZ0qGsZWmL35gQ=
478-
github.com/operator-framework/catalogd v0.13.0 h1:yOhEb0LpvGbZymippotpau5gFMyUnq8zMnrEYrTaJIQ=
479-
github.com/operator-framework/catalogd v0.13.0/go.mod h1:v405w8d89Lr7K8IVE/x/Q37JtxvgdzLXGpgJxJ2Nweg=
478+
github.com/operator-framework/catalogd v0.14.0 h1:M/kDqhH1hBB9amUk7/dAV4WZuJIa5ARboeY6GMjhx0E=
479+
github.com/operator-framework/catalogd v0.14.0/go.mod h1:84M4gm0JPrwOLVbEOoCns/xjlg4ljenVMPYUO/Cs+Wc=
480480
github.com/operator-framework/helm-operator-plugins v0.2.2-0.20240520180534-f463c36fedf9 h1:f7/TMBpuIZEQ3JbD9UyP1L1ZCSLLWdR2aPN+A+dOHFY=
481481
github.com/operator-framework/helm-operator-plugins v0.2.2-0.20240520180534-f463c36fedf9/go.mod h1:ly6Bd9rSzmt37Wy6WtZHmA+IY9zG958MryJFLcVpCXw=
482482
github.com/operator-framework/operator-lib v0.14.0 h1:er+BgZymZD1im2wytLJiPLZpGALAX6N0gXaHx3PKbO4=

hack/e2e-coverage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44

55
COVERAGE_OUTPUT="${COVERAGE_OUTPUT:-e2e-cover.out}"
66

7-
OPERATOR_CONTROLLER_NAMESPACE="operator-controller-system"
7+
OPERATOR_CONTROLLER_NAMESPACE="olmv1-system"
88
OPERATOR_CONTROLLER_MANAGER_DEPLOYMENT_NAME="operator-controller-controller-manager"
99
COPY_POD_NAME="e2e-coverage-copy-pod"
1010

scripts/install.tpl.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ function kubectl_wait() {
3535
kubectl apply -f "https://github.com/cert-manager/cert-manager/releases/download/${cert_mgr_version}/cert-manager.yaml"
3636
kubectl_wait "cert-manager" "deployment/cert-manager-webhook" "60s"
3737

38-
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 -
39-
kubectl_wait "operator-controller-system" "deployment/catalogd-controller-manager" "60s"
38+
kubectl apply -f "https://github.com/operator-framework/catalogd/releases/download/${catalogd_version}/catalogd.yaml"
39+
kubectl_wait "olmv1-system" "deployment/catalogd-controller-manager" "60s"
4040

4141
kubectl apply -f "${operator_controller_manifest}"
42-
kubectl_wait "operator-controller-system" "deployment/operator-controller-controller-manager" "60s"
42+
kubectl_wait "olmv1-system" "deployment/operator-controller-controller-manager" "60s"

0 commit comments

Comments
 (0)