promoting version 6.2.10-45

.gitignore

@@ -1 +1 @@
-.idea
+*bundle.yaml

README.md

@@ -32,9 +32,9 @@ High level architecture and overview of the solution can be found [HERE](https:/
 The following are the images and tags for this release:
 | Component | k8s | Openshift |
 | --- | --- | --- |
-| Redis Enterprise | `redislabs/redis:6.2.10-107` | `redislabs/redis:6.2.10-107.rhel8-openshift` |
-| Operator | `redislabs/operator:6.2.10-34` | `redislabs/operator:6.2.10-34` |
-| Services Rigger | `redislabs/k8s-controller:6.2.10-34` | `redislabs/k8s-controller:6.2.10-34` |
+| Redis Enterprise | `redislabs/redis:6.2.10-129` | `redislabs/redis:6.2.10-129.rhel8-openshift` |
+| Operator | `redislabs/operator:6.2.10-45` | `redislabs/operator:6.2.10-45` |
+| Services Rigger | `redislabs/k8s-controller:6.2.10-45` | `redislabs/k8s-controller:6.2.10-45` |
 > * RedHat certified images are available on [Redhat Catalog](https://access.redhat.com/containers/#/product/71f6d1bb3408bd0d) </br>
 
 
@@ -220,8 +220,6 @@ The "OpenShift" installation deploys the operator from the current release with
 This is the fastest way to get up and running with a new cluster on OpenShift 3.x.
 For OpenShift 4.x, you may choose to use OLM deployment from within your OpenShift cluster or follow the steps below.
 Other custom configurations are referenced in this repository.
-If you are running on OpenShift 3.x, use the `bundle.yaml` file located under `openshift_3_x` folder (see comment in step 4).
-That folder also contains the custom resource definitions compatible with OpenShift 3.x.
 > Note: you will need to replace `<my-project>` with your project name.
 
 1. Create a new project:
@@ -252,7 +250,6 @@ That folder also contains the custom resource definitions compatible with OpenSh
     ```bash
     oc apply -f openshift.bundle.yaml
     ``` 
-    > Note: If you are running on OpenShift 3.x, use the `bundle.yaml` file located under `openshift_3_x` folder.
 
 5. Redis Enterprise Cluster custom resource - `RedisEnterpriseCluster`
     > 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
     redisEnterpriseImageSpec:
       imagePullPolicy:  IfNotPresent
       repository:       redislabs/redis
-      versionTag:       6.2.10-107
+      versionTag:       6.2.10-129
   ```
 
 * Persistence
@@ -481,21 +478,21 @@ For example:
   redisEnterpriseImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/redis
-    versionTag:       6.2.10-107
+    versionTag:       6.2.10-129
 ```
 
 ```yaml
   redisEnterpriseServicesRiggerImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/k8s-controller
-    versionTag:       6.2.10-34
+    versionTag:       6.2.10-45
 ```
 
 ```yaml
   bootstrapperImageSpec:
     imagePullPolicy:  IfNotPresent
     repository:       harbor.corp.local/redisenterprise/operator
-    versionTag:       6.2.10-34
+    versionTag:       6.2.10-45
 ```
 
 In Operator Deployment spec (operator.yaml):
@@ -507,7 +504,7 @@ spec:
     spec:
       containers:
         - name: redis-enterprise-operator
-          image: harbor.corp.local/redisenterprise/operator:6.2.10-34
+          image: harbor.corp.local/redisenterprise/operator:6.2.10-45
 ```
 
 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
 The Operator automates and simplifies the upgrade process.  
 The Redis Enterprise Cluster Software, and the Redis Enterprise Operator for Kubernetes versions are tightly coupled and should be upgraded together.  
 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.
-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
+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
 
 ```yaml
   autoUpgradeRedisEnterprise: true
@@ -639,41 +636,37 @@ There are two ways to upgrade - either set 'autoUpgradeRedisEnterprise' within t
 Alternatively:
 ```yaml
   RedisEnterpriseImageSpec:
-    versionTag: redislabs/redis:6.2.10-107
+    versionTag: redislabs/redis:6.2.10-129
 ```
 
 ## Supported K8S Distributions
 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.
 Supported versions (platforms/versions that are not listed are not supported): 
 | Distribution                    | Support Status |
 |---------------------------------|----------------|
-| OpenShift 4.6  (K8s 1.19)       | deprecated     |
-| OpenShift 4.7  (K8s 1.20)       | supported      |
-| OpenShift 4.8  (K8s 1.21)       | supported      |
+| OpenShift 4.7  (K8s 1.20)       | deprecated     |
+| OpenShift 4.8  (K8s 1.21)       | deprecated     |
 | OpenShift 4.9  (K8s 1.22)       | supported      |
 | OpenShift 4.10  (K8s 1.23)      | supported      |
-| KOPS vanilla 1.18               | deprecated     |
-| KOPS vanilla 1.19               | deprecated     |
-| KOPS vanilla 1.20               | supported      |
+| KOPS vanilla 1.20               | deprecated     |
 | KOPS vanilla 1.21               | supported      |
 | KOPS vanilla 1.22               | supported      |
 | KOPS vanilla 1.23               | supported      |
-| GKE 1.19                        | deprecated     |
+| KOPS vanilla 1.24               | supported      |
 | GKE 1.20                        | supported      |
 | GKE 1.21                        | supported      |
 | GKE 1.22                        | supported      |
-| Rancher 2.6 (K8s 1.18)          | deprecated     |
-| Rancher 2.6 (K8s 1.19)          | supported      |
-| Rancher 2.6 (K8s 1.20)          | supported      |
+| GKE 1.23                        | supported      |
+| Rancher 2.6 (K8s 1.19)          | deprecated     |
+| Rancher 2.6 (K8s 1.20)          | deprecated     |
 | Rancher 2.6 (K8s 1.21)          | supported      |
-| VMWare TKGIE** 1.10 (K8s 1.19)  | supported      |
-| VMWare TKGIE 1.11 (K8s 1.20)    | supported      |
-| AKS 1.20                        | deprecated     |
-| AKS 1.21                        | deprecated     |
+| Rancher 2.6 (K8s 1.22)          | supported      |
+| VMWare TKGIE** 1.10 (K8s 1.19)  | deprecated     |
+| VMWare TKGIE** 1.11 (K8s 1.20)  | deprecated     |
+| VMWare TKGIE** 1.12 (K8s 1.21)  | supported      |
+| VMWare TKGIE** 1.13 (K8s 1.22)  | supported      |
 | AKS 1.22                        | supported      |
 | AKS 1.23                        | supported      |
-| EKS 1.18                        | deprecated     |
-| EKS 1.19                        | deprecated     |
 | EKS 1.20                        | supported      |
 | EKS 1.21                        | supported      |
 | EKS 1.22                        | supported      |

bundle.yaml

@@ -8,10 +8,11 @@ rules:
     resources: ["roles", "serviceaccounts", "rolebindings"]
     verbs: ["bind", "escalate", "impersonate", "userextras", "create", "get",
             "list", "watch", "update", "patch", "delete", "deletecollection"]
-  - apiGroups:
-      - app.redislabs.com
+  - apiGroups: ["app.redislabs.com"]
     resources: ["redisenterpriseclusters", "redisenterpriseclusters/status", "redisenterpriseclusters/finalizers",
-                "redisenterprisedatabases", "redisenterprisedatabases/status", "redisenterprisedatabases/finalizers"]
+                "redisenterprisedatabases", "redisenterprisedatabases/status", "redisenterprisedatabases/finalizers",
+                "redisenterpriseremoteclusters", "redisenterpriseremoteclusters/status",
+                "redisenterpriseremoteclusters/finalizers"]
     verbs: ["delete", "deletecollection", "get", "list", "patch", "create", "update", "watch"]
   - apiGroups: [""]
     resources: ["secrets"]
@@ -35,8 +36,6 @@ rules:
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["create", "delete", "get" , "update", "list", "watch"]
-
-  # needed rbac rules for services controller
   - apiGroups: [""]
     resources: ["pods"]
     verbs: ["get", "watch", "list", "update", "patch", "delete"]
@@ -45,18 +44,15 @@ rules:
     verbs: ["get", "watch", "list", "update", "patch", "create", "delete"]
   - apiGroups: ["policy"]
     resources: ["podsecuritypolicies"]
-    resourceNames:
-      - redis-enterprise-psp
-    verbs:
-      - use
-  - apiGroups: ["extensions"]
-    resources: ["ingresses"]
-    verbs: ["create", "patch", "replace", "delete", "deletecollection", "read", "list", "listallnamespaces",
-            "watch", "watchlist", "watchlistallnamespaces", "patchstatus", "readstatus", "replacestatus", "update"]
+    resourceNames: ["redis-enterprise-psp"]
+    verbs: ["use"]
   - apiGroups: ["networking.k8s.io"]
     resources: ["ingresses"]
     verbs: ["create", "patch", "replace", "delete", "deletecollection", "read", "list", "listallnamespaces",
             "watch", "watchlist", "watchlistallnamespaces", "patchstatus", "readstatus", "replacestatus", "update"]
+  - apiGroups: ["networking.istio.io"]
+    resources: ["gateways", "virtualservices"]
+    verbs: ["get", "watch", "list", "update", "patch", "create", "delete"]
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -762,8 +758,6 @@ spec:
                   lastBackupTime:
                     description: Time of last successful backup
                     type: string
-                required:
-                - backupHistory
                 type: object
               specStatus:
                 description: Whether the desired specification is valid
@@ -816,7 +810,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.2.10-34
+          image: redislabs/operator:6.2.10-45
           command:
           - redis-enterprise-operator
           imagePullPolicy: Always
@@ -858,7 +852,7 @@ spec:
               port: 8080
               scheme: HTTP
         - name: admission
-          image: redislabs/operator:6.2.10-34
+          image: redislabs/operator:6.2.10-45
           command:
             - /usr/local/bin/admission
           imagePullPolicy: Always
@@ -1035,7 +1029,9 @@ spec:
             description: RedisEnterpriseClusterSpec defines the desired state of RedisEnterpriseCluster
             properties:
               activeActive:
-                description: Specification for ActiveActive setup
+                description: Specification for ActiveActive setup. At most one of
+                  ingressOrRouteSpec or activeActive fields can be set at the same
+                  time.
                 properties:
                   apiIngressUrl:
                     description: RS API URL
@@ -1081,6 +1077,10 @@ spec:
                     type: string
                   versionTag:
                     type: string
+                  digestHash:
+                    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.
+                      Note: This is currently supported only for OLM.'
+                    type: string
                 type: object
               bootstrapperResources:
                 description: Compute resource requirements for bootstrapper containers
@@ -1203,6 +1203,42 @@ spec:
                       type: string
                   type: object
                 type: array
+              ingressOrRouteSpec:
+                description: Access configurations for the Redis Enterprise Cluster
+                  and Databases. Note - this feature is currently in preview. For
+                  this feature to take effect, set a boolean environment variable
+                  with the name "ENABLE_ALPHA_FEATURES" to True. This variable can
+                  be set via the redis-enterprise-operator pod spec, or through the
+                  operator-environment-config Config Map. At most one of ingressOrRouteSpec
+                  or activeActive fields can be set at the same time.
+                properties:
+                  apiFqdnUrl:
+                    description: RS API URL
+                    type: string
+                  dbFqdnSuffix:
+                    description: DB ENDPOINT SUFFIX - will be used to set the db host
+                      ingress <db name><db fqdn suffix>. Creates a host name so it
+                      should be unique if more than one db is created on the cluster
+                      with the same name
+                    type: string
+                  ingressAnnotations:
+                    additionalProperties:
+                      type: string
+                    description: Additional annotations to set on ingress resources
+                      created by the operator
+                    type: object
+                  method:
+                    description: Used to distinguish between different platforms implementation.
+                    enum:
+                    - openShiftRoute
+                    - ingress
+                    - istio
+                    type: string
+                required:
+                - apiFqdnUrl
+                - dbFqdnSuffix
+                - method
+                type: object
               license:
                 description: Redis Enterprise License
                 type: string
@@ -3868,6 +3904,10 @@ spec:
                     type: string
                   versionTag:
                     type: string
+                  digestHash:
+                    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.
+                      Note: This is currently supported only for OLM.'
+                    type: string
                 type: object
               redisEnterpriseNodeResources:
                 description: Compute resource requirements for Redis Enterprise containers
@@ -7886,7 +7926,9 @@ spec:
             description: RedisEnterpriseClusterSpec defines the desired state of RedisEnterpriseCluster
             properties:
               activeActive:
-                description: Specification for ActiveActive setup
+                description: Specification for ActiveActive setup. At most one of
+                  ingressOrRouteSpec or activeActive fields can be set at the same
+                  time.
                 properties:
                   apiIngressUrl:
                     description: RS API URL
@@ -7908,6 +7950,7 @@ spec:
                     enum:
                     - openShiftRoute
                     - ingress
+                    - istio
                     type: string
                 required:
                 - apiIngressUrl
@@ -8053,6 +8096,42 @@ spec:
                       type: string
                   type: object
                 type: array
+              ingressOrRouteSpec:
+                description: Access configurations for the Redis Enterprise Cluster
+                  and Databases. Note - this feature is currently in preview. For
+                  this feature to take effect, set a boolean environment variable
+                  with the name "ENABLE_ALPHA_FEATURES" to True. This variable can
+                  be set via the redis-enterprise-operator pod spec, or through the
+                  operator-environment-config Config Map. At most one of ingressOrRouteSpec
+                  or activeActive fields can be set at the same time.
+                properties:
+                  apiFqdnUrl:
+                    description: RS API URL
+                    type: string
+                  dbFqdnSuffix:
+                    description: DB ENDPOINT SUFFIX - will be used to set the db host
+                      ingress <db name><db fqdn suffix>. Creates a host name so it
+                      should be unique if more than one db is created on the cluster
+                      with the same name
+                    type: string
+                  ingressAnnotations:
+                    additionalProperties:
+                      type: string
+                    description: Additional annotations to set on ingress resources
+                      created by the operator
+                    type: object
+                  method:
+                    description: Used to distinguish between different platforms implementation.
+                    enum:
+                    - openShiftRoute
+                    - ingress
+                    - istio
+                    type: string
+                required:
+                - apiFqdnUrl
+                - dbFqdnSuffix
+                - method
+                type: object
               license:
                 description: Redis Enterprise License
                 type: string
@@ -10719,6 +10798,10 @@ spec:
                     type: string
                   versionTag:
                     type: string
+                  digestHash:
+                    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.
+                      Note: This is currently supported only for OLM.'
+                    type: string
                 type: object
               redisEnterpriseNodeResources:
                 description: Compute resource requirements for Redis Enterprise containers
@@ -10840,6 +10923,10 @@ spec:
                     type: string
                   versionTag:
                     type: string
+                  digestHash:
+                    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.
+                      Note: This is currently supported only for OLM.'
+                    type: string
                 type: object
               redisEnterpriseServicesRiggerResources:
                 description: Compute resource requirements for Services Rigger pod