Skip to content

Commit

Permalink
promoting version 6.4.2-6 (#263)
Browse files Browse the repository at this point in the history 
* promoting version 6.4.2-6

* Add note regarding modules with AA DB.

---------

Co-authored-by: Ubuntu <[email protected]>
  • Loading branch information
@alon-zada
alon-zada and Ubuntu authored Jun 22, 2023
1 parent 2fad9a7 commit b4cf59d
Show file tree
Hide file tree
Showing 26 changed files with 2,639 additions and 229 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.idea
*bundle.yaml
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
Some examples [have moved](https://docs.redis.com/latest/kubernetes/reference/cluster-options/) to the Redis Enterprise doc site, [docs.redis.com](https://docs.redis.com/latest/kubernetes/).


* Cluster username (Default is demo@redislabs.com)
* Cluster username (Default is demo@redis.com)
```yaml
username: "[email protected]"
```
Expand Down
192 changes: 123 additions & 69 deletions active_active_database_readme.md
View file

Large diffs are not rendered by default.

1,032 changes: 1,012 additions & 20 deletions bundle.yaml
View file

Large diffs are not rendered by default.

22 changes: 21 additions & 1 deletion crds/reaadb_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ spec:
- jsonPath: .status.linkedRedbs[*]
name: Linked REDBs
type: string
- jsonPath: .status.replicationStatus
name: Replication Status
type: string
subresources:
status: {}
schema:
Expand Down Expand Up @@ -69,6 +72,12 @@ spec:
description: The corresponding ID of the instance in the active-active database.
format: int64
type: integer
replicationStatus:
description: The replication status of the participating cluster
enum:
- up
- down
type: string
required:
- name
type: object
Expand All @@ -83,6 +92,12 @@ spec:
description: The Redis Enterprise Cluster Object this Resource is associated
with
type: string
replicationStatus:
description: The overall replication status
enum:
- up
- down
type: string
secretsStatus:
description: The status of the secrets
items:
Expand Down Expand Up @@ -541,7 +556,12 @@ spec:
not be below 1GB.
type: string
modulesList:
description: List of modules associated with database
description: List of modules associated with database.
Note - For Active-Active databases this feature is currently in preview. For
this feature to take effect 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.
items:
description: 'Redis Enterprise Module: https://redislabs.com/redis-enterprise/modules/'
properties:
Expand Down
179 changes: 164 additions & 15 deletions crds/rec_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,16 @@ spec:
containerTimezone:
description: Container timezone configuration. While the default timezone
on all containers is UTC, this setting can be used to set the timezone
on services rigger/bootstrapper/RS containers. Currently the only
supported value is to propagate the host timezone to all containers.
on services rigger/bootstrapper/RS containers. You can either propagate
the hosts timezone to RS pods or set it manually via timezoneName.
properties:
propagateHost:
description: Identifies that container timezone should be in sync with the host.
description: Identifies that container timezone should be in sync with the host, this
option mounts a hostPath volume onto RS pods that could be restricted in some systems.
type: object
timezoneName:
description: POSIX-style timezone name as a string to be passed as EnvVar to RE pods, e.g. "Europe/London".
type: string
type: object
createServiceAccount:
description: Whether to create service account
Expand Down Expand Up @@ -320,12 +324,75 @@ spec:
enforceIPv4:
description: Sets ENFORCE_IPV4 environment variable
type: boolean
extraEnvVars:
description: 'ADVANCED USAGE: use carefully. Add environment variables
to RS StatefulSet''s containers.'
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
required:
- name
type: object
type: array
extraLabels:
additionalProperties:
type: string
description: Labels that the user defines for their convenience
type: object
hostAliases:
description: Adds hostAliases entries to the Redis Enterprise pods
items:
description: HostAlias holds the mapping between IP and hostnames
that will be injected as an entry in the pod's hosts file.
Expand All @@ -342,11 +409,7 @@ spec:
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
and Databases. At most one of ingressOrRouteSpec
or activeActive fields can be set at the same time.
properties:
apiFqdnUrl:
Expand Down Expand Up @@ -502,16 +565,13 @@ spec:
the protocol is LDAPS or STARTTLS.
type: string
cacheTTLSeconds:
default: 300
description: The maximum TTL of cached entries.
type: integer
enabledForControlPlane:
default: false
description: Whether to enable LDAP for control plane access.
Disabled by default.
type: boolean
enabledForDataPlane:
default: false
description: Whether to enable LDAP for data plane access. Disabled
by default.
type: boolean
Expand Down Expand Up @@ -620,7 +680,12 @@ spec:
podAnnotations:
additionalProperties:
type: string
description: pod annotations
description: annotations for the service rigger and redis enterprise pods
type: object
redisEnterprisePodAnnotations:
additionalProperties:
type: string
description: annotations for redis enterprise pod
type: object
podAntiAffinity:
description: 'Override for the default anti-affinity rules of the Redis
Expand Down Expand Up @@ -3685,6 +3750,9 @@ spec:
type: object
type: array
serviceNaming:
description: Used to determine how to name the services created automatically when a database is created.
When bdb_name is used, the database name will be also used for the service name.
When redis-port is used, the service will be named redis-<port>.
enum:
- bdb_name
- redis-port
Expand Down Expand Up @@ -6220,6 +6288,11 @@ spec:
type: object
type: array
type: object
podAnnotations:
additionalProperties:
type: string
description: annotations for the service rigger pod
type: object
type: object
sideContainersSpec:
items:
Expand Down Expand Up @@ -7671,6 +7744,8 @@ spec:
properties:
propagateHost:
type: object
timezoneName:
type: string
type: object
createServiceAccount:
type: boolean
Expand All @@ -7695,11 +7770,74 @@ spec:
type: object
enforceIPv4:
type: boolean
extraEnvVars:
description: 'ADVANCED USAGE: use carefully. Add environment variables
to RS StatefulSet''s containers.'
items:
properties:
name:
type: string
value:
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
fieldRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
required:
- fieldPath
type: object
resourceFieldRef:
properties:
containerName:
type: string
divisor:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
type: string
required:
- resource
type: object
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
required:
- name
type: object
type: array
extraLabels:
additionalProperties:
type: string
type: object
hostAliases:
description: Adds hostAliases entries to the Redis Enterprise pods
items:
properties:
hostnames:
Expand Down Expand Up @@ -7798,13 +7936,10 @@ spec:
caCertificateSecretName:
type: string
cacheTTLSeconds:
default: 300
type: integer
enabledForControlPlane:
default: false
type: boolean
enabledForDataPlane:
default: false
type: boolean
protocol:
enum:
Expand Down Expand Up @@ -7870,6 +8005,12 @@ spec:
podAnnotations:
additionalProperties:
type: string
description: annotations for the service rigger and redis enterprise pods
type: object
redisEnterprisePodAnnotations:
additionalProperties:
type: string
description: annotations for redis enterprise pod
type: object
podAntiAffinity:
properties:
Expand Down Expand Up @@ -10815,6 +10956,9 @@ spec:
type: object
type: array
serviceNaming:
description: Used to determine how to name the services created automatically when a database is created.
When bdb_name is used, the database name will be also used for the service name.
When redis-port is used, the service will be named redis-<port>.
enum:
- bdb_name
- redis-port
Expand Down Expand Up @@ -13343,6 +13487,11 @@ spec:
type: object
type: array
type: object
podAnnotations:
additionalProperties:
type: string
description: annotations for the service rigger pod
type: object
type: object
sideContainersSpec:
items:
Expand Down
7 changes: 6 additions & 1 deletion crds/redb_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,12 @@ spec:
and it must not be below 1GB.
type: string
modulesList:
description: List of modules associated with database
description: List of modules associated with database.
Note - For Active-Active databases this feature is currently in preview. For
this feature to take effect 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.
items:
description: 'Redis Enterprise Module: https://redislabs.com/redis-enterprise/modules/'
properties:
Expand Down
11 changes: 4 additions & 7 deletions examples/v1alpha1/reaadb.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ metadata:
labels:
app: redis-enterprise
spec:
# The Redis Enterprise Cluster Object this Resource is associated with
redisEnterpriseCluster:
name: rec1
participatingClusters:
# Participating cluster with RERC named 'rerc1' in 'ns1' namespace.
- name: rerc1.ns1
# Participating cluster with RERC named 'rerc2' in 'ns2' namespace.
- name: rerc2.ns2
# Participating cluster pointing to RERC named: 'new-york-1'.
- name: new-york-1
# Participating cluster pointing to RERC named: 'boston-1'.
- name: boston-1
3 changes: 0 additions & 3 deletions examples/v1alpha1/redb.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@ metadata:
name: redis-enterprise-database
labels:
app: redis-enterprise
spec:
redisEnterpriseCluster:
name: redis-enterprise
Loading

0 comments on commit b4cf59d

Please sign in to comment.