Merge pull request #265 from RedisLabs/6.4.2-8

yuvallevy2 · web-flow · commit a4def4ab1154 · 2023-07-27T10:15:50.000+03:00
promoting version 6.4.2-8
diff --git a/active_active_database_readme.md b/active_active_database_readme.md
@@ -722,7 +722,7 @@ Note - Modules are currently in preview for Active-Active databases.
 To use modules with Active-Active databases enable the alpha feature flag on all participating clusters:  
 To enable modules for Active-Active databases, 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.
 
-Importent note:
+Important note:
 upgrading modules with Active-Active databases is currently not supported via the operator, to upgrade please use the RS APIs directly and after the module has successfully upgraded update the module version on the REAADB custom resource.
 
 ## Test your Active-Active database
@@ -754,7 +754,6 @@ From the output fetch the redis 'targetPort':
 
 ## Limitations
 
-
 ### No migration from the previous AA method
 migrating Active-Active database with non-operator managed Active-Active database is currently not supported.
 
diff --git a/bundle.yaml b/bundle.yaml
@@ -15207,8 +15207,16 @@ spec:
                   changed after creation
                 type: integer
               databaseSecretName:
-                description: The name of the K8s secret that holds the password to the
-                  database.
+                description: The name of the secret that holds the password
+                  to the database (redis databases only).
+                  If secret does not exist, it will be created.
+                  To define the password, create an opaque secret and set the name in the spec.
+                  The password will be taken from the value of the 'password' key.
+                  Use an empty string as value within the secret to disable authentication for the database.
+                  Notes - For Active-Active databases this secret will not be automatically created,
+                  and also, memcached databases must not be set with a value,
+                  and a secret/password will not be automatically created for them.
+                  Use the memcachedSaslSecretName field to set authentication parameters for memcached databases.
                 type: string
               defaultUser:
                 description: Is connecting with a default user allowed?
@@ -16182,16 +16190,16 @@ spec:
                         not be changed after creation
                       type: integer
                     databaseSecretName:
-                      description: The name of the secret that holds the password to
-                        the database (redis databases only). If secret does not exist,
-                        it will be created. To define the password, create an opaque
-                        secret and set the name in the spec. The password will be taken
-                        from the value of the 'password' key. Use an empty string as
-                        value within the secret to disable authentication for the database.
-                        Note - memcached databases must not be set with a value, and
-                        a secret/password will not be automatically created for them.
-                        Use the memcachedSaslSecretName field to set authentication
-                        parameters for memcached databases.
+                      description: The name of the secret that holds the password
+                        to the database (redis databases only).
+                        If secret does not exist, it will be created.
+                        To define the password, create an opaque secret and set the name in the spec.
+                        The password will be taken from the value of the 'password' key.
+                        Use an empty string as value within the secret to disable authentication for the database.
+                        Notes - For Active-Active databases this secret will not be automatically created,
+                        and also, memcached databases must not be set with a value,
+                        and a secret/password will not be automatically created for them.
+                        Use the memcachedSaslSecretName field to set authentication parameters for memcached databases.
                       type: string
                     defaultUser:
                       description: Is connecting with a default user allowed?  If disabled,
@@ -16433,7 +16441,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.4.2-6
+          image: redislabs/operator:6.4.2-8
           command:
           - operator-root
           - operator
@@ -16476,7 +16484,7 @@ spec:
               port: 8080
               scheme: HTTP
         - name: admission
-          image: redislabs/operator:6.4.2-6
+          image: redislabs/operator:6.4.2-8
           command:
           - operator-root
           - admission
diff --git a/crds/reaadb_crd.yaml b/crds/reaadb_crd.yaml
@@ -517,16 +517,16 @@ spec:
                         not be changed after creation
                       type: integer
                     databaseSecretName:
-                      description: The name of the secret that holds the password to
-                        the database (redis databases only). If secret does not exist,
-                        it will be created. To define the password, create an opaque
-                        secret and set the name in the spec. The password will be taken
-                        from the value of the 'password' key. Use an empty string as
-                        value within the secret to disable authentication for the database.
-                        Note - memcached databases must not be set with a value, and
-                        a secret/password will not be automatically created for them.
-                        Use the memcachedSaslSecretName field to set authentication
-                        parameters for memcached databases.
+                      description: The name of the secret that holds the password
+                        to the database (redis databases only).
+                        If secret does not exist, it will be created.
+                        To define the password, create an opaque secret and set the name in the spec.
+                        The password will be taken from the value of the 'password' key.
+                        Use an empty string as value within the secret to disable authentication for the database.
+                        Notes - For Active-Active databases this secret will not be automatically created,
+                        and also, memcached databases must not be set with a value,
+                        and a secret/password will not be automatically created for them.
+                        Use the memcachedSaslSecretName field to set authentication parameters for memcached databases.
                       type: string
                     defaultUser:
                       description: Is connecting with a default user allowed?  If disabled,
diff --git a/crds/redb_crd.yaml b/crds/redb_crd.yaml
@@ -372,8 +372,16 @@ spec:
                   changed after creation
                 type: integer
               databaseSecretName:
-                description: The name of the K8s secret that holds the password to the
-                  database.
+                description: The name of the secret that holds the password
+                  to the database (redis databases only).
+                  If secret does not exist, it will be created.
+                  To define the password, create an opaque secret and set the name in the spec.
+                  The password will be taken from the value of the 'password' key.
+                  Use an empty string as value within the secret to disable authentication for the database.
+                  Notes - For Active-Active databases this secret will not be automatically created,
+                  and also, memcached databases must not be set with a value,
+                  and a secret/password will not be automatically created for them.
+                  Use the memcachedSaslSecretName field to set authentication parameters for memcached databases.
                 type: string
               defaultUser:
                 description: Is connecting with a default user allowed?
diff --git a/log_collector/log_collector.py b/log_collector/log_collector.py
@@ -36,7 +36,7 @@
 logger.setLevel(logging.INFO)
 LOGGER_FORMAT = '%(asctime)s - %(levelname)s - %(message)s'
 logging.basicConfig(format=LOGGER_FORMAT)
-VERSION_LOG_COLLECTOR = "6.4.2-6"
+VERSION_LOG_COLLECTOR = "6.4.2-8"
 
 TIME_FORMAT = time.strftime("%Y%m%d-%H%M%S")
 
diff --git a/multi-namespace-redb/operator.yaml b/multi-namespace-redb/operator.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.4.2-6
+          image: redislabs/operator:6.4.2-8
           command:
           - operator-root
           - operator
@@ -63,7 +63,7 @@ spec:
               port: 8080
               scheme: HTTP
         - name: admission
-          image: redislabs/operator:6.4.2-6
+          image: redislabs/operator:6.4.2-8
           command:
           - operator-root
           - admission
diff --git a/openshift.bundle.yaml b/openshift.bundle.yaml
@@ -15249,8 +15249,16 @@ spec:
                   changed after creation
                 type: integer
               databaseSecretName:
-                description: The name of the K8s secret that holds the password to the
-                  database.
+                description: The name of the secret that holds the password
+                  to the database (redis databases only).
+                  If secret does not exist, it will be created.
+                  To define the password, create an opaque secret and set the name in the spec.
+                  The password will be taken from the value of the 'password' key.
+                  Use an empty string as value within the secret to disable authentication for the database.
+                  Notes - For Active-Active databases this secret will not be automatically created,
+                  and also, memcached databases must not be set with a value,
+                  and a secret/password will not be automatically created for them.
+                  Use the memcachedSaslSecretName field to set authentication parameters for memcached databases.
                 type: string
               defaultUser:
                 description: Is connecting with a default user allowed?
@@ -16224,16 +16232,16 @@ spec:
                         not be changed after creation
                       type: integer
                     databaseSecretName:
-                      description: The name of the secret that holds the password to
-                        the database (redis databases only). If secret does not exist,
-                        it will be created. To define the password, create an opaque
-                        secret and set the name in the spec. The password will be taken
-                        from the value of the 'password' key. Use an empty string as
-                        value within the secret to disable authentication for the database.
-                        Note - memcached databases must not be set with a value, and
-                        a secret/password will not be automatically created for them.
-                        Use the memcachedSaslSecretName field to set authentication
-                        parameters for memcached databases.
+                      description: The name of the secret that holds the password
+                        to the database (redis databases only).
+                        If secret does not exist, it will be created.
+                        To define the password, create an opaque secret and set the name in the spec.
+                        The password will be taken from the value of the 'password' key.
+                        Use an empty string as value within the secret to disable authentication for the database.
+                        Notes - For Active-Active databases this secret will not be automatically created,
+                        and also, memcached databases must not be set with a value,
+                        and a secret/password will not be automatically created for them.
+                        Use the memcachedSaslSecretName field to set authentication parameters for memcached databases.
                       type: string
                     defaultUser:
                       description: Is connecting with a default user allowed?  If disabled,
@@ -16475,7 +16483,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.4.2-6
+          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.4.2-8
           securityContext:
             runAsUser: 1001
           command:
@@ -16522,7 +16530,7 @@ spec:
               port: 8080
               scheme: HTTP
         - name: admission
-          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.4.2-6
+          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.4.2-8
           command:
           - operator-root
           - admission
diff --git a/openshift/operator_rhel.yaml b/openshift/operator_rhel.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.4.2-6
+          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.4.2-8
           securityContext:
             runAsUser: 1001
           command:
@@ -67,7 +67,7 @@ spec:
               port: 8080
               scheme: HTTP
         - name: admission
-          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.4.2-6
+          image: registry.connect.redhat.com/redislabs/redis-enterprise-operator:6.4.2-8
           command:
           - operator-root
           - admission
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: 6.4.2-81.rhel8-openshift
+    versionTag: 6.4.2-94.rhel8-openshift
   redisEnterpriseServicesRiggerImageSpec:
     repository: registry.connect.redhat.com/redislabs/services-manager
   bootstrapperImageSpec:
diff --git a/operator.yaml b/operator.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: redis-enterprise-operator
       containers:
         - name: redis-enterprise-operator
-          image: redislabs/operator:6.4.2-6
+          image: redislabs/operator:6.4.2-8
           command:
           - operator-root
           - operator
@@ -63,7 +63,7 @@ spec:
               port: 8080
               scheme: HTTP
         - name: admission
-          image: redislabs/operator:6.4.2-6
+          image: redislabs/operator:6.4.2-8
           command:
           - operator-root
           - admission
diff --git a/redis_enterprise_database_api.md b/redis_enterprise_database_api.md
@@ -194,7 +194,7 @@ RedisEnterpriseDatabaseSpec defines the desired state of RedisEnterpriseDatabase
 | shardCount | Number of database server-side shards | uint16 | 1 | false |
 | replication | In-memory database replication. When enabled, database will have replica shard for every master - leading to higher availability. | *bool | false | false |
 | persistence | Database on-disk persistence policy | *[DatabasePersistence](#databasepersistence) | disabled | false |
-| databaseSecretName | The name of the secret that holds the password to the database (redis databases only). If secret does not exist, it will be created. To define the password, create an opaque secret and set the name in the spec. The password will be taken from the value of the 'password' key. Use an empty string as value within the secret to disable authentication for the database. Note - memcached databases must not be set with a value, and a secret/password will not be automatically created for them. Use the memcachedSaslSecretName field to set authentication parameters for memcached databases. | string |  | false |
+| databaseSecretName | The name of the secret that holds the password to the database (redis databases only). If secret does not exist, it will be created. To define the password, create an opaque secret and set the name in the spec. The password will be taken from the value of the 'password' key. Use an empty string as value within the secret to disable authentication for the database. Notes - For Active-Active databases this secret will not be automatically created, and also, memcached databases must not be set with a value, and a secret/password will not be automatically created for them. Use the memcachedSaslSecretName field to set authentication parameters for memcached databases. | string |  | false |
 | evictionPolicy | Database eviction policy. see more https://docs.redislabs.com/latest/rs/administering/database-operations/eviction-policy/ | string | volatile-lru | false |
 | tlsMode | Require SSL authenticated and encrypted connections to the database. enabled - all incoming connections to the Database must use SSL. disabled - no incoming connection to the Database should use SSL. replica_ssl - databases that replicate from this one need to use SSL. | string | disabled | false |
 | clientAuthenticationCertificates | The Secrets containing TLS Client Certificate to use for Authentication | []string |  | false |
