Skip to content

Commit e7ee0a8

Browse files
yuvallevy2yuvallevy2
authored
Merge pull request #208 from RedisLabs/6.2.8-11
promoting version 6.2.8-11
2 parents 704cecd + d5e52c0 commit e7ee0a8

26 files changed

+41910
-12592
lines changed

‎README.md

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ High level architecture and overview of the solution can be found [HERE](https:/
3232
The following are the images and tags for this release:
3333
| Component | k8s | Openshift |
3434
| --- | --- | --- |
35-
| Redis Enterprise | `redislabs/redis:6.2.8-41` | `redislabs/redis:6.2.8-41.rhel7-openshift` |
36-
| Operator | `redislabs/operator:6.2.8-2` | `redislabs/operator:6.2.8-2` |
37-
| Services Rigger | `redislabs/k8s-controller:6.2.8-2` | `redislabs/k8s-controller:6.2.8-2` |
35+
| Redis Enterprise | `redislabs/redis:6.2.8-53` | `redislabs/redis:6.2.8-53.rhel7-openshift` |
36+
| Operator | `redislabs/operator:6.2.8-11` | `redislabs/operator:6.2.8-11` |
37+
| Services Rigger | `redislabs/k8s-controller:6.2.8-11` | `redislabs/k8s-controller:6.2.8-11` |
3838
> * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>
3939
4040

@@ -136,9 +136,9 @@ This is the fastest way to get up and running with a new Redis Enterprise on Kub
136136
```shell script
137137
kubectl patch ValidatingWebhookConfiguration redb-admission --patch "$(cat modified-webhook.yaml)"
138138
```
139-
139+
140140
> **Note:** If you're not using multiple namespaces you may skip to ["Verify the installation"](#verify_admission_installation) step.
141-
141+
142142
* Limiting the webhook to the relevant namespaces:
143143
Unless limited, webhooks will intercept requests from all namespaces.<br>
144144
In case you have several REC objects on your K8S cluster you need to limit the webhook to the relevant namespace.
@@ -217,11 +217,13 @@ This is the fastest way to get up and running with a new Redis Enterprise on Kub
217217
218218
### Installation on OpenShift
219219
220-
The "OpenShift" installations deploys the operator from the current release with the RHEL image from DockerHub and default OpenShift settings.
220+
The "OpenShift" installation deploys the operator from the current release with the RHEL image from DockerHub and default OpenShift settings.
221221
This is the fastest way to get up and running with a new cluster on OpenShift 3.x.
222222
For OpenShift 4.x, you may choose to use OLM deployment from within your OpenShift cluster or follow the steps below.
223223
Other custom configurations are referenced in this repository.
224-
> Note: you will need to replace `<my-project>` with your project name
224+
If you are running on OpenShift 3.x, use the `bundle.yaml` file located under `openshift_3_x` folder (see comment in step 4).
225+
That folder also contains the custom resource definitions compatible with OpenShift 3.x.
226+
> Note: you will need to replace `<my-project>` with your project name.
225227
226228
1. Create a new project:
227229
@@ -252,6 +254,7 @@ Other custom configurations are referenced in this repository.
252254
```bash
253255
oc apply -f openshift.bundle.yaml
254256
```
257+
> Note: If you are running on OpenShift 3.x, use the `bundle.yaml` file located under `openshift_3_x` folder.
255258
256259
5. Redis Enterprise Cluster custom resource - `RedisEnterpriseCluster`
257260
@@ -270,7 +273,7 @@ Other custom configurations are referenced in this repository.
270273
admission-tls Opaque 2 2m43s
271274
```
272275
* Enable the Kubernetes webhook using the generated certificate
273-
276+
274277
```shell script
275278
# save cert
276279
CERT=`kubectl get secret admission-tls -o jsonpath='{.data.cert}'`
@@ -378,7 +381,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
378381
redisEnterpriseImageSpec:
379382
imagePullPolicy: IfNotPresent
380383
repository: redislabs/redis
381-
versionTag: 6.2.8-41
384+
versionTag: 6.2.8-53
382385
```
383386
384387
* Persistence
@@ -480,21 +483,21 @@ For example:
480483
redisEnterpriseImageSpec:
481484
imagePullPolicy: IfNotPresent
482485
repository: harbor.corp.local/redisenterprise/redis
483-
versionTag: 6.2.8-41
486+
versionTag: 6.2.8-53
484487
```
485488
486489
```yaml
487490
redisEnterpriseServicesRiggerImageSpec:
488491
imagePullPolicy: IfNotPresent
489492
repository: harbor.corp.local/redisenterprise/k8s-controller
490-
versionTag: 6.2.8-2
493+
versionTag: 6.2.8-11
491494
```
492495
493496
```yaml
494497
bootstrapperImageSpec:
495498
imagePullPolicy: IfNotPresent
496499
repository: harbor.corp.local/redisenterprise/operator
497-
versionTag: 6.2.8-2
500+
versionTag: 6.2.8-11
498501
```
499502
500503
In Operator Deployment spec (operator.yaml):
@@ -506,7 +509,7 @@ spec:
506509
spec:
507510
containers:
508511
- name: redis-enterprise-operator
509-
image: harbor.corp.local/redisenterprise/operator:6.2.8-2
512+
image: harbor.corp.local/redisenterprise/operator:6.2.8-11
510513
```
511514
512515
Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
@@ -629,7 +632,7 @@ Note: in the examples above the Redis Enterprise Cluster name is: 'rec' and the
629632
The Operator automates and simplifies the upgrade process.
630633
The Redis Enterprise Cluster Software, and the Redis Enterprise Operator for Kubernetes versions are tightly coupled and should be upgraded together.
631634
It is recommended to use the bundle.yaml to upgrade, as it loads all the relevant CRD documents for this version. If the updated CRDs are not loaded, the operator might fail.
632-
There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within the Redis Enterprise Cluster Spec to instruct the operator to automatically upgrade to the compatible version, or specify the correct Redis Enterprise image manually using the versionTag attribute. The Redis Enterprise Version compatible with this release is 6.2.8-41
635+
There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within the Redis Enterprise Cluster Spec to instruct the operator to automatically upgrade to the compatible version, or specify the correct Redis Enterprise image manually using the versionTag attribute. The Redis Enterprise Version compatible with this release is 6.2.8-53
633636
634637
```yaml
635638
autoUpgradeRedisEnterprise: true
@@ -638,7 +641,7 @@ There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within t
638641
Alternatively:
639642
```yaml
640643
RedisEnterpriseImageSpec:
641-
versionTag: redislabs/redis:6.2.8-41
644+
versionTag: redislabs/redis:6.2.8-53
642645
```
643646
644647
## Supported K8S Distributions
@@ -650,23 +653,25 @@ Supported versions (platforms/versions that are not listed are not supported):
650653
| OpenShift 4.6 (K8s 1.19) | supported |
651654
| OpenShift 4.7 (K8s 1.20) | supported |
652655
| OpenShift 4.8 (K8s 1.21) | supported |
656+
| OpenShift 4.9 (K8s 1.22) | supported |
653657
| KOPS vanilla 1.18 | supported |
654658
| KOPS vanilla 1.19 | supported |
655659
| KOPS vanilla 1.20 | supported |
656660
| KOPS vanilla 1.21 | supported |
661+
| KOPS vanilla 1.22 | supported |
657662
| GKE 1.19 | supported |
658663
| GKE 1.20 | supported |
659664
| GKE 1.21 | supported |
660-
| Rancher 2.4 (K8s 1.17) | deprecated |
661-
| Rancher 2.4 (K8s 1.18) | deprecated |
662-
| Rancher 2.5 (K8s 1.17) | supported |
665+
| GKE 1.22 | supported |
666+
| Rancher 2.5 (K8s 1.17) | deprecated |
663667
| Rancher 2.5 (K8s 1.18) | supported |
664668
| Rancher 2.5 (K8s 1.19) | supported |
665669
| Rancher 2.5 (K8s 1.20) | supported |
666670
| VMWare TKGIE** 1.10 (K8s 1.19) | supported |
667671
| AKS 1.19 | supported |
668672
| AKS 1.20 | supported |
669673
| AKS 1.21 | supported |
674+
| AKS 1.22 | supported |
670675
| EKS 1.18 | supported |
671676
| EKS 1.19 | supported |
672677
| EKS 1.20 | supported |

‎admission/gesher/crds/app.redislabs.com_namespacedvalidatingrule_crd.yaml

Lines changed: 137 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: apiextensions.k8s.io/v1beta1
1+
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
name: namespacedvalidatingrules.app.redislabs.com
@@ -14,5 +14,139 @@ spec:
1414
- name: v1alpha1
1515
served: true
1616
storage: true
17-
subresources:
18-
status: {}
17+
subresources:
18+
status: {}
19+
schema:
20+
openAPIV3Schema:
21+
properties:
22+
apiVersion:
23+
type: string
24+
kind:
25+
type: string
26+
metadata:
27+
type: object
28+
spec:
29+
properties:
30+
webhooks:
31+
items:
32+
properties:
33+
admissionReviewVersions:
34+
items:
35+
type: string
36+
type: array
37+
clientConfig:
38+
properties:
39+
caBundle:
40+
format: byte
41+
type: string
42+
service:
43+
properties:
44+
name:
45+
type: string
46+
namespace:
47+
type: string
48+
path:
49+
type: string
50+
port:
51+
format: int32
52+
type: integer
53+
required:
54+
- name
55+
- namespace
56+
type: object
57+
url:
58+
type: string
59+
type: object
60+
failurePolicy:
61+
type: string
62+
matchPolicy:
63+
type: string
64+
name:
65+
type: string
66+
namespaceSelector:
67+
properties:
68+
matchExpressions:
69+
items:
70+
properties:
71+
key:
72+
type: string
73+
operator:
74+
type: string
75+
values:
76+
items:
77+
type: string
78+
type: array
79+
required:
80+
- key
81+
- operator
82+
type: object
83+
type: array
84+
matchLabels:
85+
additionalProperties:
86+
type: string
87+
type: object
88+
type: object
89+
objectSelector:
90+
properties:
91+
matchExpressions:
92+
items:
93+
properties:
94+
key:
95+
type: string
96+
operator:
97+
type: string
98+
values:
99+
items:
100+
type: string
101+
type: array
102+
required:
103+
- key
104+
- operator
105+
type: object
106+
type: array
107+
matchLabels:
108+
additionalProperties:
109+
type: string
110+
type: object
111+
type: object
112+
rules:
113+
items:
114+
properties:
115+
apiGroups:
116+
items:
117+
type: string
118+
type: array
119+
apiVersions:
120+
items:
121+
type: string
122+
type: array
123+
operations:
124+
items:
125+
type: string
126+
type: array
127+
resources:
128+
items:
129+
type: string
130+
type: array
131+
scope:
132+
type: string
133+
type: object
134+
type: array
135+
sideEffects:
136+
type: string
137+
timeoutSeconds:
138+
format: int32
139+
type: integer
140+
required:
141+
- clientConfig
142+
- name
143+
type: object
144+
type: array
145+
type: object
146+
status:
147+
properties:
148+
observedGeneration:
149+
format: int64
150+
type: integer
151+
type: object
152+
type: object

‎admission/gesher/crds/app.redislabs.com_namespacedvalidatingtype_crd.yaml

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: apiextensions.k8s.io/v1beta1
1+
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
name: namespacedvalidatingtypes.app.redislabs.com
@@ -14,5 +14,47 @@ spec:
1414
- name: v1alpha1
1515
served: true
1616
storage: true
17-
subresources:
18-
status: {}
17+
subresources:
18+
status: {}
19+
schema:
20+
openAPIV3Schema:
21+
properties:
22+
apiVersion:
23+
type: string
24+
kind:
25+
type: string
26+
metadata:
27+
type: object
28+
spec:
29+
properties:
30+
types:
31+
items:
32+
properties:
33+
apiGroups:
34+
items:
35+
type: string
36+
type: array
37+
apiVersions:
38+
items:
39+
type: string
40+
type: array
41+
operations:
42+
items:
43+
type: string
44+
type: array
45+
resources:
46+
items:
47+
type: string
48+
type: array
49+
scope:
50+
type: string
51+
type: object
52+
type: array
53+
type: object
54+
status:
55+
properties:
56+
observedGeneration:
57+
format: int64
58+
type: integer
59+
type: object
60+
type: object

‎admission/gesher/operator.openshift.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
volumeMounts:
2323
- mountPath: /certs
2424
name: certs
25-
image: redislabs/gesher:0.4
25+
image: redislabs/gesher:0.6
2626
command:
2727
- "/manager"
2828
args:

‎admission/gesher/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
volumeMounts:
2727
- mountPath: /certs
2828
name: certs
29-
image: redislabs/gesher:0.4
29+
image: redislabs/gesher:0.6
3030
command:
3131
- "/manager"
3232
args:

‎admission/gesher/rule.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ metadata:
55
spec:
66
webhooks:
77
- name: "redb-admission"
8-
failurePolicy: "fail"
8+
failurePolicy: Fail
99
timeoutSeconds: 25
10+
matchPolicy: Exact
11+
sideEffects: None
1012
clientConfig:
1113
service:
1214
name: "admission"
@@ -18,4 +20,5 @@ spec:
1820
apiVersions: ["v1alpha1"]
1921
resources: ["redisenterprisedatabases"]
2022
operations: ["*"]
23+
admissionReviewVersions: ["v1"]
2124

0 commit comments

Comments
 (0)