Skip to content

Commit 9efca5e

Browse files
OSDOCS#4429: Scrub the OpFrame docs for default namespaces
1 parent 44bb720 commit 9efca5e

6 files changed

+12
-12
lines changed

modules/osdk-ansible-k8s-local.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ The following example creates and deletes a config map based on the value of a v
2727
api_version: v1
2828
kind: ConfigMap
2929
name: example-config
30-
namespace: default <1>
30+
namespace: <operator_namespace> <1>
3131
state: "{{ state }}"
3232
ignore_errors: true <2>
3333
----
34-
<1> Change this value if you want the config map to be created in a different namespace from `default`.
34+
<1> Specify the namespace where you want the config map created.
3535
<2> Setting `ignore_errors: true` ensures that deleting a nonexistent config map does not fail.
3636
3737
. Modify the `roles/<kind>/defaults/main.yml` file to set `state` to `present` by default:

modules/osdk-crd-templates.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ The following full example provides templates for `EtcdCluster`, `EtcdBackup` an
1616
metadata:
1717
annotations:
1818
alm-examples: >-
19-
[{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdCluster","metadata":{"name":"example","namespace":"default"},"spec":{"size":3,"version":"3.2.13"}},{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdRestore","metadata":{"name":"example-etcd-cluster"},"spec":{"etcdCluster":{"name":"example-etcd-cluster"},"backupStorageType":"S3","s3":{"path":"<full-s3-path>","awsSecret":"<aws-secret>"}}},{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdBackup","metadata":{"name":"example-etcd-cluster-backup"},"spec":{"etcdEndpoints":["<etcd-cluster-endpoints>"],"storageType":"S3","s3":{"path":"<full-s3-path>","awsSecret":"<aws-secret>"}}}]
19+
[{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdCluster","metadata":{"name":"example","namespace":"<operator_namespace>"},"spec":{"size":3,"version":"3.2.13"}},{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdRestore","metadata":{"name":"example-etcd-cluster"},"spec":{"etcdCluster":{"name":"example-etcd-cluster"},"backupStorageType":"S3","s3":{"path":"<full-s3-path>","awsSecret":"<aws-secret>"}}},{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdBackup","metadata":{"name":"example-etcd-cluster-backup"},"spec":{"etcdEndpoints":["<etcd-cluster-endpoints>"],"storageType":"S3","s3":{"path":"<full-s3-path>","awsSecret":"<aws-secret>"}}}]
2020
----

modules/osdk-pruning-utility-config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cfg = Config{
1919
Resources: []schema.GroupVersionKind{
2020
{Group: "", Version: "", Kind: PodKind},
2121
},
22-
Namespaces: []string{"default"},
22+
Namespaces: []string{"<operator_namespace>"},
2323
Strategy: StrategyConfig{
2424
Mode: MaxCountStrategy,
2525
MaxCountSetting: 1,

modules/osdk-publish-catalog.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ apiVersion: operators.coreos.com/v1alpha1
7373
kind: CatalogSource
7474
metadata:
7575
name: cs-memcached
76-
namespace: default
76+
namespace: <operator_namespace>
7777
spec:
7878
displayName: My Test
7979
publisher: Company
@@ -115,10 +115,10 @@ apiVersion: operators.coreos.com/v1
115115
kind: OperatorGroup
116116
metadata:
117117
name: my-test
118-
namespace: default
118+
namespace: <operator_namespace>
119119
spec:
120120
targetNamespaces:
121-
- default
121+
- <operator_namespace>
122122
----
123123

124124
.. Define a `Subscription` object and create it by using the `oc apply` command or web console:
@@ -130,13 +130,13 @@ spec:
130130
kind: Subscription
131131
metadata:
132132
name: catalogtest
133-
namespace: default
133+
namespace: <catalog_namespace>
134134
spec:
135135
channel: "alpha"
136136
installPlanApproval: Manual
137137
name: catalog
138138
source: cs-memcached
139-
sourceNamespace: default
139+
sourceNamespace: <operator_namespace>
140140
startingCSV: memcached-operator.v0.0.1
141141
----
142142

modules/osdk-run-deployment.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ metadata:
8484
subjects:
8585
- kind: ServiceAccount
8686
name: memcached-quarkus-operator-operator
87-
namespace: default
87+
namespace: <operator_namespace>
8888
roleRef:
8989
kind: ClusterRole
9090
name: cluster-admin
@@ -180,4 +180,4 @@ ifeval::["{context}" == "osdk-golang-tutorial"]
180180
endif::[]
181181
ifeval::["{context}" == "osdk-java-tutorial"]
182182
:!java:
183-
endif::[]
183+
endif::[]

modules/osdk-run-locally.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ metadata:
112112
subjects:
113113
- kind: ServiceAccount
114114
name: memcached-quarkus-operator-operator
115-
namespace: default
115+
namespace: <operator_namespace>
116116
roleRef:
117117
kind: ClusterRole
118118
name: cluster-admin

0 commit comments

Comments
 (0)