Skip to content

Commit

Permalink
Merge pull request #265 from RedisLabs/6.4.2-8
Browse files Browse the repository at this point in the history
promoting version 6.4.2-8
  • Loading branch information
yuvallevy2 authored Jul 27, 2023
2 parents 25d6f03 + 64068cb commit a4def4a
Show file tree
Hide file tree
Showing 11 changed files with 74 additions and 51 deletions.
3 changes: 1 addition & 2 deletions active_active_database_readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down
36 changes: 22 additions & 14 deletions bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions crds/reaadb_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 10 additions & 2 deletions crds/redb_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion log_collector/log_collector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions multi-namespace-redb/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
36 changes: 22 additions & 14 deletions openshift.bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions openshift/operator_rhel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion openshift/rec_rhel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion redis_enterprise_database_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down

0 comments on commit a4def4a

Please sign in to comment.