Skip to content

Commit aae2e69

Browse files
zcahanazcahana
authored
Merge pull request #236 from RedisLabs/6.2.10-45
promoting version 6.2.10-45
2 parents 91cbadc + d25b3cf commit aae2e69

14 files changed

+587
-260
lines changed

‎README.md

+22-29
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.10-107` | `redislabs/redis:6.2.10-107.rhel8-openshift` |
36-
| Operator | `redislabs/operator:6.2.10-34` | `redislabs/operator:6.2.10-34` |
37-
| Services Rigger | `redislabs/k8s-controller:6.2.10-34` | `redislabs/k8s-controller:6.2.10-34` |
35+
| Redis Enterprise | `redislabs/redis:6.2.10-129` | `redislabs/redis:6.2.10-129.rhel8-openshift` |
36+
| Operator | `redislabs/operator:6.2.10-45` | `redislabs/operator:6.2.10-45` |
37+
| Services Rigger | `redislabs/k8s-controller:6.2.10-45` | `redislabs/k8s-controller:6.2.10-45` |
3838
> * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>
3939
4040

@@ -220,8 +220,6 @@ The "OpenShift" installation deploys the operator from the current release with
220220
This is the fastest way to get up and running with a new cluster on OpenShift 3.x.
221221
For OpenShift 4.x, you may choose to use OLM deployment from within your OpenShift cluster or follow the steps below.
222222
Other custom configurations are referenced in this repository.
223-
If you are running on OpenShift 3.x, use the `bundle.yaml` file located under `openshift_3_x` folder (see comment in step 4).
224-
That folder also contains the custom resource definitions compatible with OpenShift 3.x.
225223
> Note: you will need to replace `<my-project>` with your project name.
226224
227225
1. Create a new project:
@@ -252,7 +250,6 @@ That folder also contains the custom resource definitions compatible with OpenSh
252250
```bash
253251
oc apply -f openshift.bundle.yaml
254252
```
255-
> Note: If you are running on OpenShift 3.x, use the `bundle.yaml` file located under `openshift_3_x` folder.
256253
257254
5. Redis Enterprise Cluster custom resource - `RedisEnterpriseCluster`
258255
> Note: Define a `storageClassName` setting in `openshift/rec_rhel.yaml` as required (it's set to `gp2` by default).
@@ -379,7 +376,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
379376
redisEnterpriseImageSpec:
380377
imagePullPolicy: IfNotPresent
381378
repository: redislabs/redis
382-
versionTag: 6.2.10-107
379+
versionTag: 6.2.10-129
383380
```
384381
385382
* Persistence
@@ -481,21 +478,21 @@ For example:
481478
redisEnterpriseImageSpec:
482479
imagePullPolicy: IfNotPresent
483480
repository: harbor.corp.local/redisenterprise/redis
484-
versionTag: 6.2.10-107
481+
versionTag: 6.2.10-129
485482
```
486483
487484
```yaml
488485
redisEnterpriseServicesRiggerImageSpec:
489486
imagePullPolicy: IfNotPresent
490487
repository: harbor.corp.local/redisenterprise/k8s-controller
491-
versionTag: 6.2.10-34
488+
versionTag: 6.2.10-45
492489
```
493490
494491
```yaml
495492
bootstrapperImageSpec:
496493
imagePullPolicy: IfNotPresent
497494
repository: harbor.corp.local/redisenterprise/operator
498-
versionTag: 6.2.10-34
495+
versionTag: 6.2.10-45
499496
```
500497
501498
In Operator Deployment spec (operator.yaml):
@@ -507,7 +504,7 @@ spec:
507504
spec:
508505
containers:
509506
- name: redis-enterprise-operator
510-
image: harbor.corp.local/redisenterprise/operator:6.2.10-34
507+
image: harbor.corp.local/redisenterprise/operator:6.2.10-45
511508
```
512509
513510
Image specification follow the [K8s Container schema](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#container-v1-core).
@@ -630,7 +627,7 @@ Note: in the examples above the Redis Enterprise Cluster name is: 'rec' and the
630627
The Operator automates and simplifies the upgrade process.
631628
The Redis Enterprise Cluster Software, and the Redis Enterprise Operator for Kubernetes versions are tightly coupled and should be upgraded together.
632629
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.
633-
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.10-107
630+
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.10-129
634631
635632
```yaml
636633
autoUpgradeRedisEnterprise: true
@@ -639,41 +636,37 @@ There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within t
639636
Alternatively:
640637
```yaml
641638
RedisEnterpriseImageSpec:
642-
versionTag: redislabs/redis:6.2.10-107
639+
versionTag: redislabs/redis:6.2.10-129
643640
```
644641
645642
## Supported K8S Distributions
646643
Each release of the Redis Enterprise Operator deployment is thoroughly tested against a set of Kubernetes distributions. The table below lists these, along with the current release's support status. "Supported", as well as "deprecated" support status indicates the current release has been tested in this environment and supported by RedisLabs. "Deprecated" also indicates that support will be dropped in a coming future release. "No longer supported" indicates that support has been dropped for this distribution. Any distribution that isn't explicitly listed is not supported for production workloads by RedisLabs.
647644
Supported versions (platforms/versions that are not listed are not supported):
648645
| Distribution | Support Status |
649646
|---------------------------------|----------------|
650-
| OpenShift 4.6 (K8s 1.19) | deprecated |
651-
| OpenShift 4.7 (K8s 1.20) | supported |
652-
| OpenShift 4.8 (K8s 1.21) | supported |
647+
| OpenShift 4.7 (K8s 1.20) | deprecated |
648+
| OpenShift 4.8 (K8s 1.21) | deprecated |
653649
| OpenShift 4.9 (K8s 1.22) | supported |
654650
| OpenShift 4.10 (K8s 1.23) | supported |
655-
| KOPS vanilla 1.18 | deprecated |
656-
| KOPS vanilla 1.19 | deprecated |
657-
| KOPS vanilla 1.20 | supported |
651+
| KOPS vanilla 1.20 | deprecated |
658652
| KOPS vanilla 1.21 | supported |
659653
| KOPS vanilla 1.22 | supported |
660654
| KOPS vanilla 1.23 | supported |
661-
| GKE 1.19 | deprecated |
655+
| KOPS vanilla 1.24 | supported |
662656
| GKE 1.20 | supported |
663657
| GKE 1.21 | supported |
664658
| GKE 1.22 | supported |
665-
| Rancher 2.6 (K8s 1.18) | deprecated |
666-
| Rancher 2.6 (K8s 1.19) | supported |
667-
| Rancher 2.6 (K8s 1.20) | supported |
659+
| GKE 1.23 | supported |
660+
| Rancher 2.6 (K8s 1.19) | deprecated |
661+
| Rancher 2.6 (K8s 1.20) | deprecated |
668662
| Rancher 2.6 (K8s 1.21) | supported |
669-
| VMWare TKGIE** 1.10 (K8s 1.19) | supported |
670-
| VMWare TKGIE 1.11 (K8s 1.20) | supported |
671-
| AKS 1.20 | deprecated |
672-
| AKS 1.21 | deprecated |
663+
| Rancher 2.6 (K8s 1.22) | supported |
664+
| VMWare TKGIE** 1.10 (K8s 1.19) | deprecated |
665+
| VMWare TKGIE** 1.11 (K8s 1.20) | deprecated |
666+
| VMWare TKGIE** 1.12 (K8s 1.21) | supported |
667+
| VMWare TKGIE** 1.13 (K8s 1.22) | supported |
673668
| AKS 1.22 | supported |
674669
| AKS 1.23 | supported |
675-
| EKS 1.18 | deprecated |
676-
| EKS 1.19 | deprecated |
677670
| EKS 1.20 | supported |
678671
| EKS 1.21 | supported |
679672
| EKS 1.22 | supported |

‎bundle.yaml

+106-19
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ rules:
88
resources: ["roles", "serviceaccounts", "rolebindings"]
99
verbs: ["bind", "escalate", "impersonate", "userextras", "create", "get",
1010
"list", "watch", "update", "patch", "delete", "deletecollection"]
11-
- apiGroups:
12-
- app.redislabs.com
11+
- apiGroups: ["app.redislabs.com"]
1312
resources: ["redisenterpriseclusters", "redisenterpriseclusters/status", "redisenterpriseclusters/finalizers",
14-
"redisenterprisedatabases", "redisenterprisedatabases/status", "redisenterprisedatabases/finalizers"]
13+
"redisenterprisedatabases", "redisenterprisedatabases/status", "redisenterprisedatabases/finalizers",
14+
"redisenterpriseremoteclusters", "redisenterpriseremoteclusters/status",
15+
"redisenterpriseremoteclusters/finalizers"]
1516
verbs: ["delete", "deletecollection", "get", "list", "patch", "create", "update", "watch"]
1617
- apiGroups: [""]
1718
resources: ["secrets"]
@@ -35,8 +36,6 @@ rules:
3536
- apiGroups: [""]
3637
resources: ["persistentvolumeclaims"]
3738
verbs: ["create", "delete", "get" , "update", "list", "watch"]
38-
39-
# needed rbac rules for services controller
4039
- apiGroups: [""]
4140
resources: ["pods"]
4241
verbs: ["get", "watch", "list", "update", "patch", "delete"]
@@ -45,18 +44,15 @@ rules:
4544
verbs: ["get", "watch", "list", "update", "patch", "create", "delete"]
4645
- apiGroups: ["policy"]
4746
resources: ["podsecuritypolicies"]
48-
resourceNames:
49-
- redis-enterprise-psp
50-
verbs:
51-
- use
52-
- apiGroups: ["extensions"]
53-
resources: ["ingresses"]
54-
verbs: ["create", "patch", "replace", "delete", "deletecollection", "read", "list", "listallnamespaces",
55-
"watch", "watchlist", "watchlistallnamespaces", "patchstatus", "readstatus", "replacestatus", "update"]
47+
resourceNames: ["redis-enterprise-psp"]
48+
verbs: ["use"]
5649
- apiGroups: ["networking.k8s.io"]
5750
resources: ["ingresses"]
5851
verbs: ["create", "patch", "replace", "delete", "deletecollection", "read", "list", "listallnamespaces",
5952
"watch", "watchlist", "watchlistallnamespaces", "patchstatus", "readstatus", "replacestatus", "update"]
53+
- apiGroups: ["networking.istio.io"]
54+
resources: ["gateways", "virtualservices"]
55+
verbs: ["get", "watch", "list", "update", "patch", "create", "delete"]
6056
---
6157
kind: RoleBinding
6258
apiVersion: rbac.authorization.k8s.io/v1
@@ -762,8 +758,6 @@ spec:
762758
lastBackupTime:
763759
description: Time of last successful backup
764760
type: string
765-
required:
766-
- backupHistory
767761
type: object
768762
specStatus:
769763
description: Whether the desired specification is valid
@@ -816,7 +810,7 @@ spec:
816810
serviceAccountName: redis-enterprise-operator
817811
containers:
818812
- name: redis-enterprise-operator
819-
image: redislabs/operator:6.2.10-34
813+
image: redislabs/operator:6.2.10-45
820814
command:
821815
- redis-enterprise-operator
822816
imagePullPolicy: Always
@@ -858,7 +852,7 @@ spec:
858852
port: 8080
859853
scheme: HTTP
860854
- name: admission
861-
image: redislabs/operator:6.2.10-34
855+
image: redislabs/operator:6.2.10-45
862856
command:
863857
- /usr/local/bin/admission
864858
imagePullPolicy: Always
@@ -1035,7 +1029,9 @@ spec:
10351029
description: RedisEnterpriseClusterSpec defines the desired state of RedisEnterpriseCluster
10361030
properties:
10371031
activeActive:
1038-
description: Specification for ActiveActive setup
1032+
description: Specification for ActiveActive setup. At most one of
1033+
ingressOrRouteSpec or activeActive fields can be set at the same
1034+
time.
10391035
properties:
10401036
apiIngressUrl:
10411037
description: RS API URL
@@ -1081,6 +1077,10 @@ spec:
10811077
type: string
10821078
versionTag:
10831079
type: string
1080+
digestHash:
1081+
description: 'The digest hash of the image to pull. Version tag must be also specified with the corresponding version, will use the digest hash to pull the image if exists.
1082+
Note: This is currently supported only for OLM.'
1083+
type: string
10841084
type: object
10851085
bootstrapperResources:
10861086
description: Compute resource requirements for bootstrapper containers
@@ -1203,6 +1203,42 @@ spec:
12031203
type: string
12041204
type: object
12051205
type: array
1206+
ingressOrRouteSpec:
1207+
description: Access configurations for the Redis Enterprise Cluster
1208+
and Databases. Note - this feature is currently in preview. For
1209+
this feature to take effect, set a boolean environment variable
1210+
with the name "ENABLE_ALPHA_FEATURES" to True. This variable can
1211+
be set via the redis-enterprise-operator pod spec, or through the
1212+
operator-environment-config Config Map. At most one of ingressOrRouteSpec
1213+
or activeActive fields can be set at the same time.
1214+
properties:
1215+
apiFqdnUrl:
1216+
description: RS API URL
1217+
type: string
1218+
dbFqdnSuffix:
1219+
description: DB ENDPOINT SUFFIX - will be used to set the db host
1220+
ingress <db name><db fqdn suffix>. Creates a host name so it
1221+
should be unique if more than one db is created on the cluster
1222+
with the same name
1223+
type: string
1224+
ingressAnnotations:
1225+
additionalProperties:
1226+
type: string
1227+
description: Additional annotations to set on ingress resources
1228+
created by the operator
1229+
type: object
1230+
method:
1231+
description: Used to distinguish between different platforms implementation.
1232+
enum:
1233+
- openShiftRoute
1234+
- ingress
1235+
- istio
1236+
type: string
1237+
required:
1238+
- apiFqdnUrl
1239+
- dbFqdnSuffix
1240+
- method
1241+
type: object
12061242
license:
12071243
description: Redis Enterprise License
12081244
type: string
@@ -3868,6 +3904,10 @@ spec:
38683904
type: string
38693905
versionTag:
38703906
type: string
3907+
digestHash:
3908+
description: 'The digest hash of the image to pull. Version tag must be also specified with the corresponding version, will use the digest hash to pull the image if exists.
3909+
Note: This is currently supported only for OLM.'
3910+
type: string
38713911
type: object
38723912
redisEnterpriseNodeResources:
38733913
description: Compute resource requirements for Redis Enterprise containers
@@ -7886,7 +7926,9 @@ spec:
78867926
description: RedisEnterpriseClusterSpec defines the desired state of RedisEnterpriseCluster
78877927
properties:
78887928
activeActive:
7889-
description: Specification for ActiveActive setup
7929+
description: Specification for ActiveActive setup. At most one of
7930+
ingressOrRouteSpec or activeActive fields can be set at the same
7931+
time.
78907932
properties:
78917933
apiIngressUrl:
78927934
description: RS API URL
@@ -7908,6 +7950,7 @@ spec:
79087950
enum:
79097951
- openShiftRoute
79107952
- ingress
7953+
- istio
79117954
type: string
79127955
required:
79137956
- apiIngressUrl
@@ -8053,6 +8096,42 @@ spec:
80538096
type: string
80548097
type: object
80558098
type: array
8099+
ingressOrRouteSpec:
8100+
description: Access configurations for the Redis Enterprise Cluster
8101+
and Databases. Note - this feature is currently in preview. For
8102+
this feature to take effect, set a boolean environment variable
8103+
with the name "ENABLE_ALPHA_FEATURES" to True. This variable can
8104+
be set via the redis-enterprise-operator pod spec, or through the
8105+
operator-environment-config Config Map. At most one of ingressOrRouteSpec
8106+
or activeActive fields can be set at the same time.
8107+
properties:
8108+
apiFqdnUrl:
8109+
description: RS API URL
8110+
type: string
8111+
dbFqdnSuffix:
8112+
description: DB ENDPOINT SUFFIX - will be used to set the db host
8113+
ingress <db name><db fqdn suffix>. Creates a host name so it
8114+
should be unique if more than one db is created on the cluster
8115+
with the same name
8116+
type: string
8117+
ingressAnnotations:
8118+
additionalProperties:
8119+
type: string
8120+
description: Additional annotations to set on ingress resources
8121+
created by the operator
8122+
type: object
8123+
method:
8124+
description: Used to distinguish between different platforms implementation.
8125+
enum:
8126+
- openShiftRoute
8127+
- ingress
8128+
- istio
8129+
type: string
8130+
required:
8131+
- apiFqdnUrl
8132+
- dbFqdnSuffix
8133+
- method
8134+
type: object
80568135
license:
80578136
description: Redis Enterprise License
80588137
type: string
@@ -10719,6 +10798,10 @@ spec:
1071910798
type: string
1072010799
versionTag:
1072110800
type: string
10801+
digestHash:
10802+
description: 'The digest hash of the image to pull. Version tag must be also specified with the corresponding version, will use the digest hash to pull the image if exists.
10803+
Note: This is currently supported only for OLM.'
10804+
type: string
1072210805
type: object
1072310806
redisEnterpriseNodeResources:
1072410807
description: Compute resource requirements for Redis Enterprise containers
@@ -10840,6 +10923,10 @@ spec:
1084010923
type: string
1084110924
versionTag:
1084210925
type: string
10926+
digestHash:
10927+
description: 'The digest hash of the image to pull. Version tag must be also specified with the corresponding version, will use the digest hash to pull the image if exists.
10928+
Note: This is currently supported only for OLM.'
10929+
type: string
1084310930
type: object
1084410931
redisEnterpriseServicesRiggerResources:
1084510932
description: Compute resource requirements for Services Rigger pod

0 commit comments

Comments
 (0)