Skip to content

Commit 3da5873

Browse files
final (hopefully) indent fix
1 parent ba544e2 commit 3da5873

File tree

4 files changed

+62
-59
lines changed

4 files changed

+62
-59
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010

1111
```sh
1212
kubectl apply -f deploy/admission/webhook.yaml
13-
```
13+
```
14+

content/embeds/k8s-admission-webhook-cert.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
4242
```sh
4343
kubectl patch ValidatingWebhookConfiguration \
44-
redis-enterprise-admission --patch "$(cat modified-webhook.yaml)"
44+
redis-enterprise-admission --patch "$(cat modified-webhook.yaml)"
4545
```

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

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,17 @@ To see which version of Redis Enterprise for Kubernetes supports your OpenShift
3939
git clone https://github.com/RedisLabs/redis-enterprise-k8s-docs
4040
```
4141

42-
4342
1. Deploy the OpenShift operator bundle.
4443

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.
46-
44+
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.
45+
4746
```sh
4847
oc apply -f openshift.bundle.yaml
4948
```
5049

51-
{{< warning >}}Changes to the `openshift.bundle.yaml` file can cause unexpected results.{{< /warning >}}
50+
{{< warning >}}
51+
Changes to the `openshift.bundle.yaml` file can cause unexpected results.
52+
{{< /warning >}}
5253

5354
1. Verify that your `redis-enterprise-operator` deployment is running.
5455

@@ -63,15 +64,19 @@ To see which version of Redis Enterprise for Kubernetes supports your OpenShift
6364
redis-enterprise-operator 1/1 1 1 0m36s
6465
```
6566

66-
{{<warning>}}DO NOT modify or delete the StatefulSet created during the deployment process. Doing so could destroy your Redis Enterprise cluster (REC).{{</warning>}}
67+
{{<warning>}}
68+
DO NOT modify or delete the StatefulSet created during the deployment process. Doing so could destroy your Redis Enterprise cluster (REC).
69+
{{</warning>}}
6770

6871
## Install security context constraint
6972

7073
The Redis Enterprise pods must run in OpenShift with privileges set in a [Security Context Constraint](https://docs.openshift.com/container-platform/4.4/authentication/managing-security-context-constraints.html#security-context-constraints-about_configuring-internal-oauth). This grants the pod various rights, such as the ability to change system limits or run as a particular user.
7174

7275
1. Apply the file `scc.yaml` file.
7376

74-
{{<warning>}}Do not edit this file. {{</warning>}}
77+
{{<warning>}}
78+
Do not edit this file.
79+
{{</warning>}}
7580

7681
```sh
7782
oc apply -f openshift/scc.yaml
@@ -92,12 +97,14 @@ The Redis Enterprise pods must run in OpenShift with privileges set in a [Securi
9297
system:serviceaccount:<my-project>:<rec>
9398
```
9499

95-
{{<note>}} If you are using version 6.2.18-41 or earlier, add additional permissions for your cluster.
96-
97-
oc adm policy add-scc-to-user redis-enterprise-scc \
98-
system:serviceaccount:<my-project>:redis-enterprise-operator
100+
{{<note>}}
101+
If you are using version 6.2.18-41 or earlier, add additional permissions for your cluster.
99102

100-
{{</note>}}
103+
```sh
104+
oc adm policy add-scc-to-user redis-enterprise-scc \
105+
system:serviceaccount:<my-project>:redis-enterprise-operator
106+
```
107+
{{</note>}}
101108

102109
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.
103110

@@ -110,7 +117,7 @@ The Redis Enterprise pods must run in OpenShift with privileges set in a [Securi
110117
The REC name cannot be changed after cluster creation.
111118

112119
{{<note>}}
113-
Each Redis Enterprise cluster requires at least 3 nodes. Single-node RECs are not supported.
120+
Each Redis Enterprise cluster requires at least 3 nodes. Single-node RECs are not supported.
114121
{{</note>}}
115122

116123
2. Apply the custom resource file to create your Redis Enterprise cluster.
@@ -121,13 +128,13 @@ The Redis Enterprise pods must run in OpenShift with privileges set in a [Securi
121128

122129
The operator typically creates the REC within a few minutes.
123130

124-
3. Check the cluster status.
131+
1. Check the cluster status.
125132

126133
```sh
127134
oc get pod
128135
```
129136

130-
You should receive a response similar to the following:
137+
You should receive a response similar to the following:
131138

132139
```sh
133140
NAME | READY | STATUS | RESTARTS | AGE |
@@ -158,7 +165,7 @@ If not limited, the webhook intercepts requests from all namespaces. If you have
158165
name: staging
159166
```
160167
161-
1. Patch the webhook spec with the `namespaceSelector` field.
168+
1. Patch the webhook spec with the `namespaceSelector` field.
162169
163170
```sh
164171
cat > modified-webhook.yaml <<EOF
@@ -170,22 +177,22 @@ If not limited, the webhook intercepts requests from all namespaces. If you have
170177
EOF
171178
```
172179
173-
3. Apply the patch.
180+
1. Apply the patch.
174181
175182
```sh
176183
oc patch ValidatingWebhookConfiguration \
177184
redis-enterprise-admission --patch "$(cat modified-webhook.yaml)"
178185
```
179186
180187
{{<note>}}
181-
For releases before 6.4.2-4, use this command instead:
182-
183-
```sh
184-
oc patch ValidatingWebhookConfiguration \
185-
redb-admission --patch "$(cat modified-webhook.yaml)"
186-
```
187-
188-
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+
For releases before 6.4.2-4, use this command instead:
189+
190+
```sh
191+
oc patch ValidatingWebhookConfiguration \
192+
redb-admission --patch "$(cat modified-webhook.yaml)"
193+
```
194+
195+
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/" >}}).
189196
{{</note>}}
190197
191198
### Verify admission controller installation

content/operate/kubernetes/deployment/quick-start.md

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ This guide works with most supported Kubernetes distributions. If you're using O
2323

2424
To deploy Redis Enterprise for Kubernetes, you'll need:
2525

26-
* a Kubernetes cluster in a [supported distribution]({{< relref "/operate/kubernetes/reference/supported_k8s_distributions.md" >}})
27-
* a minimum of three worker nodes
28-
* a Kubernetes client (kubectl)
29-
* access to DockerHub, RedHat Container Catalog, or a private repository that can hold the required images.
26+
- Kubernetes cluster in a [supported distribution]({{< relref "/operate/kubernetes/reference/supported_k8s_distributions.md" >}})
27+
- minimum of three worker nodes
28+
- Kubernetes client (kubectl)
29+
- access to DockerHub, RedHat Container Catalog, or a private repository that can hold the required images.
3030

3131
### Create a new namespace
3232

@@ -116,7 +116,7 @@ The following example creates a minimal Redis Enterprise cluster. See the [Redis
116116
1. Create a file that defines a Redis Enterprise cluster with three nodes.
117117

118118
{{<note>}}
119-
The REC name (`my-rec` in this example) cannot be changed after cluster creation.
119+
The REC name (`my-rec` in this example) cannot be changed after cluster creation.
120120
{{</note>}}
121121

122122
```sh
@@ -130,12 +130,11 @@ The following example creates a minimal Redis Enterprise cluster. See the [Redis
130130
EOF
131131
```
132132

133-
This will request a cluster with three Redis Enterprise nodes using the
134-
default requests (i.e., 2 CPUs and 4GB of memory per node).
133+
This will request a cluster with three Redis Enterprise nodes using the default requests (i.e., 2 CPUs and 4GB of memory per node).
135134

136-
To test with a larger configuration, use the example below to add node resources to the `spec` section of your test cluster (`my-rec.yaml`).
135+
To test with a larger configuration, use the example below to add node resources to the `spec` section of your test cluster (`my-rec.yaml`).
137136

138-
```yaml
137+
```sh
139138
redisEnterpriseNodeResources:
140139
limits:
141140
cpu: 2000m
@@ -146,52 +145,49 @@ The following example creates a minimal Redis Enterprise cluster. See the [Redis
146145
```
147146

148147
{{<note>}}
149-
Each cluster must have at least 3 nodes. Single-node RECs are not supported.
148+
Each cluster must have at least 3 nodes. Single-node RECs are not supported.
150149
{{</note>}}
151150

152-
See the [Redis Enterprise hardware requirements]({{< relref "/operate/rs/installing-upgrading/install/plan-deployment/hardware-requirements.md" >}}) for more
153-
information on sizing Redis Enterprise node resource requests.
151+
See the [Redis Enterprise hardware requirements]({{< relref "/operate/rs/installing-upgrading/install/plan-deployment/hardware-requirements.md" >}}) for more information on sizing Redis Enterprise node resource requests.
154152

155153
1. Apply your custom resource file in the same namespace as `my-rec.yaml`.
156154

157155
```sh
158156
kubectl apply -f my-rec.yaml
159157
```
160158

161-
You should see a result similar to this:
159+
You should see a result similar to this:
162160

163-
```sh
164-
redisenterprisecluster.app.redislabs.com/my-rec created
165-
```
161+
```sh
162+
redisenterprisecluster.app.redislabs.com/my-rec created
163+
```
166164

167165
1. You can verify the creation of the cluster with:
168166

169167
```sh
170168
kubectl get rec
171169
```
172170

173-
You should see a result similar to this:
171+
You should see a result similar to this:
174172

175173
```sh
176174
NAME AGE
177175
my-rec 1m
178176
```
179177

180-
At this point, the operator will go through the process of creating various
181-
services and pod deployments.
178+
At this point, the operator will go through the process of creating various services and pod deployments.
182179

183-
You can track the progress by examining the
184-
StatefulSet associated with the cluster:
180+
You can track the progress by examining the StatefulSet associated with the cluster:
185181

186-
```sh
187-
kubectl rollout status sts/my-rec
188-
```
182+
```sh
183+
kubectl rollout status sts/my-rec
184+
```
189185

190-
or by looking at the status of all of the resources in your namespace:
186+
or by looking at the status of all of the resources in your namespace:
191187

192-
```sh
193-
kubectl get all
194-
```
188+
```sh
189+
kubectl get all
190+
```
195191

196192
## Enable the admission controller
197193

@@ -250,15 +246,14 @@ The operator bundle includes a webhook file. The webhook will intercept requests
250246
EOF
251247
```
252248
253-
You should see your request was denied by the `admission webhook "redisenterprise.admission.redislabs"`.
249+
You should see your request was denied by the `admission webhook "redisenterprise.admission.redislabs"`.
254250
255-
```sh
256-
Error from server: error when creating "STDIN": admission webhook "redisenterprise.admission.redislabs" denied the request: eviction_policy: u'illegal' is not one of [u'volatile-lru', u'volatile-ttl', u'volatile-random', u'allkeys-lru', u'allkeys-random', u'noeviction', u'volatile-lfu', u'allkeys-lfu']
257-
```
251+
```sh
252+
Error from server: error when creating "STDIN": admission webhook "redisenterprise.admission.redislabs" denied the request: eviction_policy: u'illegal' is not one of [u'volatile-lru', u'volatile-ttl', u'volatile-random', u'allkeys-lru', u'allkeys-random', u'noeviction', u'volatile-lfu', u'allkeys-lfu']
253+
```
258254
259255
## Create a Redis Enterprise Database (REDB)
260256
261257
You can create multiple databases within the same namespace as your REC or in other namespaces.
262258
263259
See [manage Redis Enterprise databases for Kubernetes]({{< relref "/operate/kubernetes/re-databases/db-controller.md" >}}) to create a new REDB.
264-

0 commit comments

Comments
 (0)