Skip to content

Commit e5b550c

Browse files
committed
Address comments on 'Move Single Own Namespace back to alpha'
Signed-off-by: Todd Short <tshort@redhat.com>
1 parent e7a9611 commit e5b550c

5 files changed

Lines changed: 7 additions & 15 deletions

File tree

docs/draft/howto/single-ownnamespace-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Description
22

33
!!! note
4-
This feature is still in *alpha* the `SingleOwnNamespaceInstallSupport` feature-gate must be enabled to make use of it.
4+
This feature is still in *alpha*. The `SingleOwnNamespaceInstallSupport` feature-gate is disabled by default and must be enabled to make use of it.
55
See the instructions below on how to enable it.
66

77
---

docs/draft/tutorials/explore-available-content-metas-endpoint.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Then you can query the catalog by using `curl` commands and the `jq` CLI tool to
9292
```
9393
9494
!!! important
95-
OLM 1.0 supports installing extensions that define webhooks. Targeting a single or specified set of namespaces requires enabling the `SingleOwnNamespaceInstallSupport` feature-gate.
95+
OLM 1.0 supports installing extensions that define webhooks. Targeting a single namespace (SingleNamespace or OwnNamespace install modes) requires enabling the `SingleOwnNamespaceInstallSupport` feature-gate.
9696
9797
3. Return list of packages which support `AllNamespaces` install mode, do not use webhooks, and where the channel head version uses `olm.csv.metadata` format:
9898

docs/tutorials/explore-available-content.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Then you can query the catalog by using `curl` commands and the `jq` CLI tool to
9292
```
9393
9494
!!! important
95-
OLM 1.0 supports installing extensions that define webhooks. Targeting a single or specified set of namespaces requires enabling the `SingleOwnNamespaceInstallSupport` feature-gate.
95+
OLM 1.0 supports installing extensions that define webhooks. Targeting a single namespace (SingleNamespace or OwnNamespace install modes) requires enabling the `SingleOwnNamespaceInstallSupport` feature-gate.
9696
9797
3. Return list of packages that support `AllNamespaces` install mode and do not use webhooks:
9898

hack/demo/own-namespace-demo-script.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,9 @@ kubectl delete clusterextension argocd-operator --ignore-not-found=true
5757
kubectl delete namespace argocd-system --ignore-not-found=true
5858
kubectl delete clusterrolebinding argocd-installer-crb --ignore-not-found=true
5959

60-
# remove feature gate from deployment
61-
echo "Removing feature gate from operator-controller..."
62-
kubectl patch deployment -n olmv1-system operator-controller-controller-manager --type='json' -p='[{"op": "remove", "path": "/spec/template/spec/containers/0/args", "value": "--feature-gates=SingleOwnNamespaceInstallSupport=true"}]' || true
63-
64-
# restore standard CRDs
60+
# restore standard CRDs and reset deployment (removes experimental feature gates)
6561
echo "Restoring standard CRDs..."
66-
kubectl apply -f "$(dirname "${BASH_SOURCE[0]}")/../../manifests/base.yaml"
62+
kubectl apply -f "$(dirname "${BASH_SOURCE[0]}")/../../manifests/standard.yaml"
6763

6864
# wait for standard CRDs to be available
6965
kubectl wait --for condition=established --timeout=60s crd/clusterextensions.olm.operatorframework.io

hack/demo/single-namespace-demo-script.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,9 @@ kubectl delete clusterextension argocd-operator --ignore-not-found=true
6060
kubectl delete namespace argocd-system argocd --ignore-not-found=true
6161
kubectl delete clusterrolebinding argocd-installer-crb --ignore-not-found=true
6262

63-
# remove feature gate from deployment
64-
echo "Removing feature gate from operator-controller..."
65-
kubectl patch deployment -n olmv1-system operator-controller-controller-manager --type='json' -p='[{"op": "remove", "path": "/spec/template/spec/containers/0/args", "value": "--feature-gates=SingleOwnNamespaceInstallSupport=true"}]' || true
66-
67-
# restore standard CRDs
63+
# restore standard CRDs and reset deployment (removes experimental feature gates)
6864
echo "Restoring standard CRDs..."
69-
kubectl apply -f "$(dirname "${BASH_SOURCE[0]}")/../../manifests/base.yaml"
65+
kubectl apply -f "$(dirname "${BASH_SOURCE[0]}")/../../manifests/standard.yaml"
7066

7167
# wait for standard CRDs to be available
7268
kubectl wait --for condition=established --timeout=60s crd/clusterextensions.olm.operatorframework.io

0 commit comments

Comments
 (0)