Merge pull request #272 from RedisLabs/7.4.2-2

promoting version 7.4.2-2
RedisLabs · Feb 15, 2024 · 93049bb · 93049bb
2 parents 86513c1 + 605e8a2
commit 93049bb
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 20 deletions.
diff --git a/bundle.yaml b/bundle.yaml
@@ -3759,6 +3759,12 @@ spec:
                   - major
                   - latest
                 type: string
+              resp3Default:
+                description: Whether databases will turn on RESP3 compatibility upon
+                  database upgrade. Note - Deleting this property after explicitly
+                  setting its value shall have no effect. Please view the corresponding
+                  field in RS doc for more info.
+                type: boolean
               serviceAccountName:
                 description: Name of the service account to use
                 type: string
@@ -11014,6 +11020,8 @@ spec:
                   - major
                   - latest
                 type: string
+              resp3Default:
+                type: boolean
               serviceAccountName:
                 type: string
               servicesRiggerSpec:
@@ -15396,6 +15404,12 @@ spec:
                   - type
                   type: object
                 type: array
+              shardingEnabled:
+                description: Toggles database sharding for REAADBs (Active Active
+                  databases) and enabled by default. This field is blocked for REDB
+                  (non-Active Active databases) and sharding is toggled via the shardCount
+                  field - when shardCount is 1 this is disabled otherwise enabled.
+                type: boolean
               shardCount:
                 description: Number of database server-side shards
                 type: integer
@@ -15473,6 +15487,11 @@ spec:
                   For password, use ''password'' as the key and the actual password as the value.
                   Note that connections are not encrypted.'
                 type: string
+              resp3:
+                description: Whether this database supports RESP3 protocol.
+                  Note - Deleting this property after explicitly setting its value shall have no effect.
+                  Please view the corresponding field in RS doc for more info.
+                type: boolean
             type: object
           status:
             description: RedisEnterpriseDatabaseStatus defines the observed state of
@@ -16393,6 +16412,11 @@ spec:
                         will have replica shard for every master - leading to higher
                         availability.
                       type: boolean
+                    resp3:
+                      description: Whether this database supports RESP3 protocol.
+                        Note - Deleting this property after explicitly setting its value shall have no effect.
+                        Please view the corresponding field in RS doc for more info.
+                      type: boolean
                     rofRamSize:
                       description: The size of the RAM portion of an RoF database. Similarly
                         to "memorySize" use formats like 100MB, 0.1GB It must be at
@@ -16424,6 +16448,12 @@ spec:
                         - type
                         type: object
                       type: array
+                    shardingEnabled:
+                      description: Toggles database sharding for REAADBs (Active Active
+                        databases) and enabled by default. This field is blocked for REDB
+                        (non-Active Active databases) and sharding is toggled via the shardCount
+                        field - when shardCount is 1 this is disabled otherwise enabled.
+                      type: boolean
                     shardCount:
                       description: Number of database server-side shards
                       type: integer
@@ -16481,7 +16511,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:7.2.4-12
+          image: redislabs/operator:7.4.2-2
           command:
           - operator-root
           - operator
@@ -16531,7 +16561,7 @@ spec:
               drop:
               - ALL
         - name: admission
-          image: redislabs/operator:7.2.4-12
+          image: redislabs/operator:7.4.2-2
           command:
           - operator-root
           - admission

diff --git a/crds/reaadb_crd.yaml b/crds/reaadb_crd.yaml
@@ -684,6 +684,11 @@ spec:
                         will have replica shard for every master - leading to higher
                         availability.
                       type: boolean
+                    resp3:
+                      description: Whether this database supports RESP3 protocol.
+                        Note - Deleting this property after explicitly setting its value shall have no effect.
+                        Please view the corresponding field in RS doc for more info.
+                      type: boolean
                     rofRamSize:
                       description: The size of the RAM portion of an RoF database. Similarly
                         to "memorySize" use formats like 100MB, 0.1GB It must be at
@@ -715,6 +720,12 @@ spec:
                         - type
                         type: object
                       type: array
+                    shardingEnabled:
+                      description: Toggles database sharding for REAADBs (Active Active
+                        databases) and enabled by default. This field is blocked for REDB
+                        (non-Active Active databases) and sharding is toggled via the shardCount
+                        field - when shardCount is 1 this is disabled otherwise enabled.
+                      type: boolean
                     shardCount:
                       description: Number of database server-side shards
                       type: integer

diff --git a/crds/rec_crd.yaml b/crds/rec_crd.yaml
@@ -3664,6 +3664,12 @@ spec:
                   - major
                   - latest
                 type: string
+              resp3Default:
+                description: Whether databases will turn on RESP3 compatibility upon
+                  database upgrade. Note - Deleting this property after explicitly
+                  setting its value shall have no effect. Please view the corresponding
+                  field in RS doc for more info.
+                type: boolean
               serviceAccountName:
                 description: Name of the service account to use
                 type: string
@@ -10919,6 +10925,8 @@ spec:
                   - major
                   - latest
                 type: string
+              resp3Default:
+                type: boolean
               serviceAccountName:
                 type: string
               servicesRiggerSpec:

diff --git a/crds/redb_crd.yaml b/crds/redb_crd.yaml
@@ -527,6 +527,12 @@ spec:
                   - type
                   type: object
                 type: array
+              shardingEnabled:
+                description: Toggles database sharding for REAADBs (Active Active
+                  databases) and enabled by default. This field is blocked for REDB
+                  (non-Active Active databases) and sharding is toggled via the shardCount
+                  field - when shardCount is 1 this is disabled otherwise enabled.
+                type: boolean
               shardCount:
                 description: Number of database server-side shards
                 type: integer
@@ -604,6 +610,11 @@ spec:
                   For password, use ''password'' as the key and the actual password as the value.
                   Note that connections are not encrypted.'
                 type: string
+              resp3:
+                description: Whether this database supports RESP3 protocol.
+                  Note - Deleting this property after explicitly setting its value shall have no effect.
+                  Please view the corresponding field in RS doc for more info.
+                type: boolean
             type: object
           status:
             description: RedisEnterpriseDatabaseStatus defines the observed state of

diff --git a/log_collector/log_collector.py b/log_collector/log_collector.py
@@ -37,7 +37,7 @@
 logger.setLevel(logging.INFO)
 LOGGER_FORMAT = '%(asctime)s - %(levelname)s - %(message)s'
 logging.basicConfig(format=LOGGER_FORMAT)
-VERSION_LOG_COLLECTOR = "7.2.4-12"
+VERSION_LOG_COLLECTOR = "7.4.2-2"
 
 TIME_FORMAT = time.strftime("%Y%m%d-%H%M%S")
 
@@ -60,6 +60,7 @@
 
 NON_LABELED_RESOURCES = OPERATOR_CUSTOM_RESOURCES + [
     "VolumeAttachment",
+    "NetworkPolicy",
 ]
 
 RESTRICTED_MODE_API_RESOURCES = NON_LABELED_RESOURCES + [
@@ -97,7 +98,6 @@
 ALL_ONLY_API_RESOURCES = [
     "Node",
     "ResourceQuota",
-    "NetworkPolicy",
     "CertificateSigningRequest",
     "ClusterServiceVersion",
     "Subscription",

diff --git a/multi-namespace-redb/operator.yaml b/multi-namespace-redb/operator.yaml
@@ -24,7 +24,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:7.2.4-12
+          image: redislabs/operator:7.4.2-2
           command:
           - operator-root
           - operator
@@ -74,7 +74,7 @@ spec:
               drop:
               - ALL
         - name: admission
-          image: redislabs/operator:7.2.4-12
+          image: redislabs/operator:7.4.2-2
           command:
           - operator-root
           - admission

diff --git a/multi-namespace-redb/role.yaml b/multi-namespace-redb/role.yaml
@@ -7,12 +7,7 @@ metadata:
 rules:
   - apiGroups:
       - app.redislabs.com
-    resources: ["redisenterpriseclusters", "redisenterpriseclusters/status", "redisenterpriseclusters/finalizers",
-                "redisenterprisedatabases", "redisenterprisedatabases/status", "redisenterprisedatabases/finalizers",
-                "redisenterpriseremoteclusters", "redisenterpriseremoteclusters/status",
-                "redisenterpriseremoteclusters/finalizers",
-                "redisenterpriseactiveactivedatabases", "redisenterpriseactiveactivedatabases/status",
-                "redisenterpriseactiveactivedatabases/finalizers"]
+    resources: ["redisenterprisedatabases", "redisenterprisedatabases/status", "redisenterprisedatabases/finalizers"]
     verbs: ["delete", "deletecollection", "get", "list", "patch", "create", "update", "watch"]
   - apiGroups: [""]
     resources: ["secrets"]

diff --git a/openshift.bundle.yaml b/openshift.bundle.yaml
@@ -3801,6 +3801,12 @@ spec:
                   - major
                   - latest
                 type: string
+              resp3Default:
+                description: Whether databases will turn on RESP3 compatibility upon
+                  database upgrade. Note - Deleting this property after explicitly
+                  setting its value shall have no effect. Please view the corresponding
+                  field in RS doc for more info.
+                type: boolean
               serviceAccountName:
                 description: Name of the service account to use
                 type: string
@@ -11056,6 +11062,8 @@ spec:
                   - major
                   - latest
                 type: string
+              resp3Default:
+                type: boolean
               serviceAccountName:
                 type: string
               servicesRiggerSpec:
@@ -15438,6 +15446,12 @@ spec:
                   - type
                   type: object
                 type: array
+              shardingEnabled:
+                description: Toggles database sharding for REAADBs (Active Active
+                  databases) and enabled by default. This field is blocked for REDB
+                  (non-Active Active databases) and sharding is toggled via the shardCount
+                  field - when shardCount is 1 this is disabled otherwise enabled.
+                type: boolean
               shardCount:
                 description: Number of database server-side shards
                 type: integer
@@ -15515,6 +15529,11 @@ spec:
                   For password, use ''password'' as the key and the actual password as the value.
                   Note that connections are not encrypted.'
                 type: string
+              resp3:
+                description: Whether this database supports RESP3 protocol.
+                  Note - Deleting this property after explicitly setting its value shall have no effect.
+                  Please view the corresponding field in RS doc for more info.
+                type: boolean
             type: object
           status:
             description: RedisEnterpriseDatabaseStatus defines the observed state of
@@ -16435,6 +16454,11 @@ spec:
                         will have replica shard for every master - leading to higher
                         availability.
                       type: boolean
+                    resp3:
+                      description: Whether this database supports RESP3 protocol.
+                        Note - Deleting this property after explicitly setting its value shall have no effect.
+                        Please view the corresponding field in RS doc for more info.
+                      type: boolean
                     rofRamSize:
                       description: The size of the RAM portion of an RoF database. Similarly
                         to "memorySize" use formats like 100MB, 0.1GB It must be at
@@ -16466,6 +16490,12 @@ spec:
                         - type
                         type: object
                       type: array
+                    shardingEnabled:
+                      description: Toggles database sharding for REAADBs (Active Active
+                        databases) and enabled by default. This field is blocked for REDB
+                        (non-Active Active databases) and sharding is toggled via the shardCount
+                        field - when shardCount is 1 this is disabled otherwise enabled.
+                      type: boolean
                     shardCount:
                       description: Number of database server-side shards
                       type: integer
@@ -16521,7 +16551,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:7.2.4-12
+          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:7.4.2-2
           securityContext:
             privileged: false
             readOnlyRootFilesystem: true
@@ -16573,7 +16603,7 @@ spec:
               port: 8080
               scheme: HTTP
         - name: admission
-          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:7.2.4-12
+          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:7.4.2-2
           securityContext:
             privileged: false
             readOnlyRootFilesystem: true

diff --git a/openshift/operator_rhel.yaml b/openshift/operator_rhel.yaml
@@ -22,7 +22,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:7.2.4-12
+          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:7.4.2-2
           securityContext:
             privileged: false
             readOnlyRootFilesystem: true
@@ -74,7 +74,7 @@ spec:
               port: 8080
               scheme: HTTP
         - name: admission
-          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:7.2.4-12
+          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:7.4.2-2
           securityContext:
             privileged: false
             readOnlyRootFilesystem: true

diff --git a/openshift/rec_rhel.yaml b/openshift/rec_rhel.yaml
@@ -9,7 +9,7 @@ spec:
   nodes: 3
   redisEnterpriseImageSpec:
     repository: registry.connect.redhat.com/redislabs/redis-enterprise
-    versionTag: 7.2.4-92.rhel8-openshift
+    versionTag: 7.4.2-54.rhel8-openshift
   redisEnterpriseServicesRiggerImageSpec:
     repository: registry.connect.redhat.com/redislabs/services-manager
   bootstrapperImageSpec:

diff --git a/operator.yaml b/operator.yaml
@@ -24,7 +24,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:7.2.4-12
+          image: redislabs/operator:7.4.2-2
           command:
           - operator-root
           - operator
@@ -74,7 +74,7 @@ spec:
               drop:
               - ALL
         - name: admission
-          image: redislabs/operator:7.2.4-12
+          image: redislabs/operator:7.4.2-2
           command:
           - operator-root
           - admission

diff --git a/redis_enterprise_cluster_api.md b/redis_enterprise_cluster_api.md
@@ -389,6 +389,7 @@ RedisEnterpriseClusterSpec defines the desired state of RedisEnterpriseCluster
 | services | Customization options for operator-managed service resources created for Redis Enterprise clusters and databases | *[Services](#services) |  | false |
 | ldap | Cluster-level LDAP configuration, such as server addresses, protocol, authentication and query settings. | *[LDAPSpec](#ldapspec) |  | false |
 | extraEnvVars | ADVANCED USAGE: use carefully. Add environment variables to RS StatefulSet's containers. | []v1.EnvVar |  | false |
+| resp3Default | Whether databases will turn on RESP3 compatibility upon database upgrade. Note - Deleting this property after explicitly setting its value shall have no effect. Please view the corresponding field in RS doc for more info. | *bool |  | false |
 [Back to Table of Contents](#table-of-contents)
 
 ### RedisEnterpriseClusterStatus

diff --git a/redis_enterprise_database_api.md b/redis_enterprise_database_api.md
@@ -215,6 +215,8 @@ RedisEnterpriseDatabaseSpec defines the desired state of RedisEnterpriseDatabase
 | memcachedSaslSecretName | Credentials used for binary authentication in memcached databases. The credentials should be saved as an opaque secret and the name of that secret should be configured using this field. For username, use 'username' as the key and the actual username as the value. For password, use 'password' as the key and the actual password as the value. Note that connections are not encrypted. | string |  | false |
 | redisVersion | Redis OSS version. For existing databases - Upgrade Redis OSS version. For new databases - the version which the database will be created with. If set to 'major' - will always upgrade to the most recent major Redis version. If set to 'latest' - will always upgrade to the most recent Redis version. Depends on 'redisUpgradePolicy' - if you want to set the value to 'latest' for some databases, you must set redisUpgradePolicy on the cluster before. Possible values are 'major' or 'latest' When using upgrade - make sure to backup the database before. This value is used only for database type 'redis' | string |  | false |
 | activeActive | Connection/ association to the Active-Active database. | *[ActiveActiveInfo](#activeactiveinfo) |  | false |
+| resp3 | Whether this database supports RESP3 protocol. Note - Deleting this property after explicitly setting its value shall have no effect. Please view the corresponding field in RS doc for more info. | *bool |  | false |
+| shardingEnabled | Toggles database sharding for REAADBs (Active Active databases) and enabled by default. This field is blocked for REDB (non-Active Active databases) and sharding is toggled via the shardCount field - when shardCount is 1 this is disabled otherwise enabled. | *bool |  | false |
 [Back to Table of Contents](#table-of-contents)
 
 ### RedisEnterpriseDatabaseStatus

diff --git a/vault/README.md b/vault/README.md
@@ -26,7 +26,7 @@ How to use Hashicorp Vault as a source for secrets:
 > Note: when using Openshift it might be recommended to use oc instead of kubectl 
 <a name="prerequisites"></a>
 ## Prerequisites
-* Deploy a Hashicorp Vault instance and make sure there is network access to it from the Kubernetes cluster. The solution has been tested with Hashicorp Vault v1.6.2. The Hashicorp Vault instance must be using TLS.
+* Deploy a Hashicorp Vault instance and make sure there is network access to it from the Kubernetes cluster. The solution has been tested with Hashicorp Vault v1.15.2. The Hashicorp Vault instance must be using TLS.
 * Configure the Hashicorp Vault Kubernetes authentication for the Kubernetes cluster the operator is being deployed. Refer to the Hashicorp Vault documentation for details.
 * Deploy the Hashicorp Vault agent sidecar controller on the Kubernetes cluster (https://learn.hashicorp.com/tutorials/vault/kubernetes-sidecar)
 * Note that Hashicorp offers a Vault Enterprise product. The Vault Enterprise product supports namespaces. Those namespaces should not be confused with Kubernetes namespaces. This document assumes that the Hashicorp Vault instance used is the Enterprise product, and a Vault namespace is used. The namespace is referred to as the <VAULT_NAMESPACE> below.