Skip to content

Commit a9b32ea

Browse files
double indent to fix code block spacing issues
1 parent a77505c commit a9b32ea

File tree

4 files changed

+86
-87
lines changed

4 files changed

+86
-87
lines changed

content/embeds/k8s-642-redb-admission-webhook-name-change.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
1. Delete the existing `ValidatingWebhookConfiguration` on the Kubernetes cluster (named `redb-admission`).
44

5-
```sh
6-
kubectl delete ValidatingWebhookConfiguration redb-admission
7-
```
5+
```sh
6+
kubectl delete ValidatingWebhookConfiguration redb-admission
7+
```
88

99
1. Apply the resource from the new file.
1010

11-
```sh
12-
kubectl apply -f deploy/admission/webhook.yaml
13-
```
11+
```sh
12+
kubectl apply -f deploy/admission/webhook.yaml
13+
```
Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
1. Verify the `admission-tls` secret exists.
22

3-
```sh
4-
kubectl get secret admission-tls
5-
```
3+
```sh
4+
kubectl get secret admission-tls
5+
```
66

77
The output should look similar to
88

9-
```
10-
NAME TYPE DATA AGE
11-
admission-tls Opaque 2 2m43s
12-
```
9+
```sh
10+
NAME TYPE DATA AGE
11+
admission-tls Opaque 2 2m43s
12+
```
1313

14-
2. Save the certificate to a local environment variable.
14+
1. Save the certificate to a local environment variable.
1515

16-
```sh
17-
CERT=`kubectl get secret admission-tls -o jsonpath='{.data.cert}'`
18-
```
16+
```sh
17+
CERT=`kubectl get secret admission-tls -o jsonpath='{.data.cert}'`
18+
```
1919

20-
3. Create a Kubernetes validating webhook, replacing `<namespace>` with the namespace where the REC was installed.
20+
1. Create a Kubernetes validating webhook, replacing `<namespace>` with the namespace where the REC was installed.
2121

22-
The `webhook.yaml` template can be found in [redis-enterprise-k8s-docs/admission](https://github.com/RedisLabs/redis-enterprise-k8s-docs/tree/master/admission)
23-
24-
```sh
25-
sed 's/OPERATOR_NAMESPACE/<namespace>/g' webhook.yaml | kubectl create -f -
26-
```
27-
28-
4. Create a patch file for the Kubernetes validating webhook.
29-
30-
```sh
31-
cat > modified-webhook.yaml <<EOF
32-
webhooks:
33-
- name: redisenterprise.admission.redislabs
34-
clientConfig:
35-
caBundle: $CERT
36-
admissionReviewVersions: ["v1beta1"]
37-
EOF
38-
```
39-
40-
5. Patch the webhook with the certificate.
41-
42-
```sh
43-
kubectl patch ValidatingWebhookConfiguration \
44-
redis-enterprise-admission --patch "$(cat modified-webhook.yaml)"
45-
```
22+
The `webhook.yaml` template can be found in [redis-enterprise-k8s-docs/admission](https://github.com/RedisLabs/redis-enterprise-k8s-docs/tree/master/admission)
23+
24+
```sh
25+
sed 's/OPERATOR_NAMESPACE/<namespace>/g' webhook.yaml | kubectl create -f -
26+
```
27+
28+
1. Create a patch file for the Kubernetes validating webhook.
29+
30+
```sh
31+
cat > modified-webhook.yaml <<EOF
32+
webhooks:
33+
- name: redisenterprise.admission.redislabs
34+
clientConfig:
35+
caBundle: $CERT
36+
admissionReviewVersions: ["v1beta1"]
37+
EOF
38+
```
39+
40+
1. Patch the webhook with the certificate.
41+
42+
```sh
43+
kubectl patch ValidatingWebhookConfiguration \
44+
redis-enterprise-admission --patch "$(cat modified-webhook.yaml)"
45+
```

content/operate/kubernetes/active-active/_index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ For a full list of fields and options, see the [RERC API reference]({{<relref "/
8686
### Limitations
8787
8888
* Existing Redis databases cannot be migrated to a REAADB. (DOC-3594)
89-
9089
* Admission is not blocking REAADB with `shardCount` which exceeds license quota. (RED-96301)
91-
9290
Workaround: Fix the problems with the REAADB and reapply.
9391
* The `<rec-name>/<rec-namespace>` value must be unique for each RERC resource. (RED-96302)
9492
* Only global database options are supported, no support for specifying configuration per location.

content/operate/kubernetes/deployment/openshift/openshift-cli.md

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To see which version of Redis Enterprise for Kubernetes supports your OpenShift
4242

4343
1. Deploy the OpenShift operator bundle.
4444

45-
{{<note>}} If you are using version 6.2.18-41 or earlier, you must [apply the security context constraint](#install-security-context-constraint) before the operator bundle. {{</note>}}
45+
If you are using version 6.2.18-41 or earlier, you must [apply the security context constraint](#install-security-context-constraint) before the operator bundle.
4646

4747
```sh
4848
oc apply -f openshift.bundle.yaml
@@ -92,12 +92,12 @@ The Redis Enterprise pods must run in OpenShift with privileges set in a [Securi
9292
system:serviceaccount:<my-project>:<rec>
9393
```
9494

95-
{{<note>}} If you are using version 6.2.18-41 or earlier, add additional permissions for your cluster.
95+
{{<note>}} If you are using version 6.2.18-41 or earlier, add additional permissions for your cluster.
9696

9797
oc adm policy add-scc-to-user redis-enterprise-scc \
9898
system:serviceaccount:<my-project>:redis-enterprise-operator
9999

100-
{{</note>}}
100+
{{</note>}}
101101

102102
You can check the name of your project using the `oc project` command. To replace the project name, use `oc edit project myproject`. Replace `rec` with the name of your Redis Enterprise cluster, if different.
103103

@@ -109,28 +109,28 @@ The Redis Enterprise pods must run in OpenShift with privileges set in a [Securi
109109

110110
The REC name cannot be changed after cluster creation.
111111

112-
{{<note>}}
113-
Each Redis Enterprise cluster requires at least 3 nodes. Single-node RECs are not supported.
114-
{{</note>}}
112+
{{<note>}}
113+
Each Redis Enterprise cluster requires at least 3 nodes. Single-node RECs are not supported.
114+
{{</note>}}
115115

116116
2. Apply the custom resource file to create your Redis Enterprise cluster.
117117

118118
```sh
119119
oc apply -f <rec_rhel>.yaml
120120
```
121121

122-
The operator typically creates the REC within a few minutes.
122+
The operator typically creates the REC within a few minutes.
123123

124124
3. Check the cluster status.
125125

126126
```sh
127127
oc get pod
128128
```
129129

130-
You should receive a response similar to the following:
131-
130+
You should receive a response similar to the following:
131+
132132
```sh
133-
| NAME | READY | STATUS | RESTARTS | AGE |
133+
NAME | READY | STATUS | RESTARTS | AGE |
134134
| -------------------------------- | ----- | ------- | -------- | --- |
135135
| rec-name-0 | 2/2 | Running | 0 | 1m |
136136
| rec-name-1 | 2/2 | Running | 0 | 1m |
@@ -149,41 +149,43 @@ If not limited, the webhook intercepts requests from all namespaces. If you have
149149
150150
1. Verify your namespace is labeled and the label is unique to this namespace, as shown in the next example.
151151
152-
```sh
153-
apiVersion: v1
154-
kind: Namespace
155-
metadata:
156-
labels:
157-
namespace-name: staging
158-
name: staging
159-
```
160-
161-
2. Patch the webhook spec with the `namespaceSelector` field.
162-
```sh
163-
cat > modified-webhook.yaml <<EOF
164-
webhooks:
165-
- name: redisenterprise.admission.redislabs
166-
namespaceSelector:
167-
matchLabels:
152+
```sh
153+
apiVersion: v1
154+
kind: Namespace
155+
metadata:
156+
labels:
168157
namespace-name: staging
169-
EOF
170-
```
158+
name: staging
159+
```
160+
161+
1. Patch the webhook spec with the `namespaceSelector` field.
162+
163+
```sh
164+
cat > modified-webhook.yaml <<EOF
165+
webhooks:
166+
- name: redisenterprise.admission.redislabs
167+
namespaceSelector:
168+
matchLabels:
169+
namespace-name: staging
170+
EOF
171+
```
171172
172173
3. Apply the patch.
173174
174-
```sh
175-
oc patch ValidatingWebhookConfiguration \
176-
redis-enterprise-admission --patch "$(cat modified-webhook.yaml)"
177-
```
178-
{{<note>}}
179-
For releases before 6.4.2-4, use this command instead:
180-
```sh
181-
oc patch ValidatingWebhookConfiguration \
182-
redb-admission --patch "$(cat modified-webhook.yaml)"
183-
```
175+
```sh
176+
oc patch ValidatingWebhookConfiguration \
177+
redis-enterprise-admission --patch "$(cat modified-webhook.yaml)"
178+
```
179+
180+
{{<note>}}
181+
For releases before 6.4.2-4, use this command instead:
182+
```sh
183+
oc patch ValidatingWebhookConfiguration \
184+
redb-admission --patch "$(cat modified-webhook.yaml)"
185+
```
184186
185-
The 6.4.2-4 release introduces a new `ValidatingWebhookConfiguration` to replace `redb-admission`. See the [6.4.2-4 release notes]({{< relref "/operate/kubernetes/release-notes/6-4-2-releases/" >}}).
186-
{{</note>}}
187+
The 6.4.2-4 release introduces a new `ValidatingWebhookConfiguration` to replace `redb-admission`. See the [6.4.2-4 release notes]({{< relref "/operate/kubernetes/release-notes/6-4-2-releases/" >}}).
188+
{{</note>}}
187189
188190
### Verify admission controller installation
189191
@@ -212,14 +214,14 @@ The operator uses the instructions in the Redis Enterprise database (REDB) custo
212214
213215
1. Create a `RedisEnterpriseDatabase` custom resource.
214216
215-
This example creates a test database. For production databases, see [create a database]({{< relref "/operate/kubernetes/re-databases/db-controller.md#create-a-database" >}}) and [RedisEnterpriseDatabase API reference]({{< relref "/operate/kubernetes/reference/redis_enterprise_database_api" >}}).
217+
This example creates a test database. For production databases, see [create a database]({{< relref "/operate/kubernetes/re-databases/db-controller.md#create-a-database" >}}) and [RedisEnterpriseDatabase API reference]({{< relref "/operate/kubernetes/reference/redis_enterprise_database_api" >}}).
216218
217219
```sh
218220
cat << EOF > /tmp/redis-enterprise-database.yml
219221
apiVersion: app.redislabs.com/v1alpha1
220222
kind: RedisEnterpriseDatabase
221223
metadata:
222-
name: redis-enterprise-database
224+
name: redis-enterprise-database
223225
spec:
224226
memorySize: 100MB
225227
EOF
@@ -235,4 +237,3 @@ The operator uses the instructions in the Redis Enterprise database (REDB) custo
235237
236238
- [Redis Enterprise cluster API]({{<relref "/operate/kubernetes/reference/redis_enterprise_cluster_api">}})
237239
- [Redis Enterprise database API]({{<relref "/operate/kubernetes/reference/redis_enterprise_database_api">}})
238-

0 commit comments

Comments
 (0)