Skip to content

Commit b4cf59d

Browse files
alon-zadaUbuntu
alon-zada
and
Ubuntu
authored
promoting version 6.4.2-6 (#263)
* promoting version 6.4.2-6 * Add note regarding modules with AA DB. --------- Co-authored-by: Ubuntu <[email protected]>
1 parent 2fad9a7 commit b4cf59d

26 files changed

+2639
-229
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.idea
1+
*bundle.yaml

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The operator deploys a `RedisEnterpriseCluster` with default configurations valu
3838
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/).
3939

4040

41-
* Cluster username (Default is demo@redislabs.com)
41+
* Cluster username (Default is demo@redis.com)
4242
```yaml
4343
username: "[email protected]"
4444
```

‎active_active_database_readme.md

Lines changed: 123 additions & 69 deletions
Large diffs are not rendered by default.

‎bundle.yaml

Lines changed: 1012 additions & 20 deletions
Large diffs are not rendered by default.

‎crds/reaadb_crd.yaml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
- jsonPath: .status.linkedRedbs[*]
3030
name: Linked REDBs
3131
type: string
32+
- jsonPath: .status.replicationStatus
33+
name: Replication Status
34+
type: string
3235
subresources:
3336
status: {}
3437
schema:
@@ -69,6 +72,12 @@ spec:
6972
description: The corresponding ID of the instance in the active-active database.
7073
format: int64
7174
type: integer
75+
replicationStatus:
76+
description: The replication status of the participating cluster
77+
enum:
78+
- up
79+
- down
80+
type: string
7281
required:
7382
- name
7483
type: object
@@ -83,6 +92,12 @@ spec:
8392
description: The Redis Enterprise Cluster Object this Resource is associated
8493
with
8594
type: string
95+
replicationStatus:
96+
description: The overall replication status
97+
enum:
98+
- up
99+
- down
100+
type: string
86101
secretsStatus:
87102
description: The status of the secrets
88103
items:
@@ -541,7 +556,12 @@ spec:
541556
not be below 1GB.
542557
type: string
543558
modulesList:
544-
description: List of modules associated with database
559+
description: List of modules associated with database.
560+
Note - For Active-Active databases this feature is currently in preview. For
561+
this feature to take effect for Active-Active databases, set a boolean environment variable
562+
with the name "ENABLE_ALPHA_FEATURES" to True. This variable can
563+
be set via the redis-enterprise-operator pod spec, or through the
564+
operator-environment-config Config Map.
545565
items:
546566
description: 'Redis Enterprise Module: https://redislabs.com/redis-enterprise/modules/'
547567
properties:

‎crds/rec_crd.yaml

Lines changed: 164 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,16 @@ spec:
268268
containerTimezone:
269269
description: Container timezone configuration. While the default timezone
270270
on all containers is UTC, this setting can be used to set the timezone
271-
on services rigger/bootstrapper/RS containers. Currently the only
272-
supported value is to propagate the host timezone to all containers.
271+
on services rigger/bootstrapper/RS containers. You can either propagate
272+
the hosts timezone to RS pods or set it manually via timezoneName.
273273
properties:
274274
propagateHost:
275-
description: Identifies that container timezone should be in sync with the host.
275+
description: Identifies that container timezone should be in sync with the host, this
276+
option mounts a hostPath volume onto RS pods that could be restricted in some systems.
276277
type: object
278+
timezoneName:
279+
description: POSIX-style timezone name as a string to be passed as EnvVar to RE pods, e.g. "Europe/London".
280+
type: string
277281
type: object
278282
createServiceAccount:
279283
description: Whether to create service account
@@ -320,12 +324,75 @@ spec:
320324
enforceIPv4:
321325
description: Sets ENFORCE_IPV4 environment variable
322326
type: boolean
327+
extraEnvVars:
328+
description: 'ADVANCED USAGE: use carefully. Add environment variables
329+
to RS StatefulSet''s containers.'
330+
items:
331+
properties:
332+
name:
333+
type: string
334+
value:
335+
type: string
336+
valueFrom:
337+
properties:
338+
configMapKeyRef:
339+
properties:
340+
key:
341+
type: string
342+
name:
343+
type: string
344+
optional:
345+
type: boolean
346+
required:
347+
- key
348+
type: object
349+
fieldRef:
350+
properties:
351+
apiVersion:
352+
type: string
353+
fieldPath:
354+
type: string
355+
required:
356+
- fieldPath
357+
type: object
358+
resourceFieldRef:
359+
properties:
360+
containerName:
361+
type: string
362+
divisor:
363+
anyOf:
364+
- type: integer
365+
- type: string
366+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
367+
x-kubernetes-int-or-string: true
368+
resource:
369+
type: string
370+
required:
371+
- resource
372+
type: object
373+
secretKeyRef:
374+
properties:
375+
key:
376+
type: string
377+
name:
378+
type: string
379+
optional:
380+
type: boolean
381+
required:
382+
- key
383+
type: object
384+
type: object
385+
required:
386+
- name
387+
type: object
388+
type: array
323389
extraLabels:
324390
additionalProperties:
325391
type: string
326392
description: Labels that the user defines for their convenience
327393
type: object
328394
hostAliases:
395+
description: Adds hostAliases entries to the Redis Enterprise pods
329396
items:
330397
description: HostAlias holds the mapping between IP and hostnames
331398
that will be injected as an entry in the pod's hosts file.
@@ -342,11 +409,7 @@ spec:
342409
type: array
343410
ingressOrRouteSpec:
344411
description: Access configurations for the Redis Enterprise Cluster
345-
and Databases. Note - this feature is currently in preview. For
346-
this feature to take effect, set a boolean environment variable
347-
with the name "ENABLE_ALPHA_FEATURES" to True. This variable can
348-
be set via the redis-enterprise-operator pod spec, or through the
349-
operator-environment-config Config Map. At most one of ingressOrRouteSpec
412+
and Databases. At most one of ingressOrRouteSpec
350413
or activeActive fields can be set at the same time.
351414
properties:
352415
apiFqdnUrl:
@@ -502,16 +565,13 @@ spec:
502565
the protocol is LDAPS or STARTTLS.
503566
type: string
504567
cacheTTLSeconds:
505-
default: 300
506568
description: The maximum TTL of cached entries.
507569
type: integer
508570
enabledForControlPlane:
509-
default: false
510571
description: Whether to enable LDAP for control plane access.
511572
Disabled by default.
512573
type: boolean
513574
enabledForDataPlane:
514-
default: false
515575
description: Whether to enable LDAP for data plane access. Disabled
516576
by default.
517577
type: boolean
@@ -620,7 +680,12 @@ spec:
620680
podAnnotations:
621681
additionalProperties:
622682
type: string
623-
description: pod annotations
683+
description: annotations for the service rigger and redis enterprise pods
684+
type: object
685+
redisEnterprisePodAnnotations:
686+
additionalProperties:
687+
type: string
688+
description: annotations for redis enterprise pod
624689
type: object
625690
podAntiAffinity:
626691
description: 'Override for the default anti-affinity rules of the Redis
@@ -3685,6 +3750,9 @@ spec:
36853750
type: object
36863751
type: array
36873752
serviceNaming:
3753+
description: Used to determine how to name the services created automatically when a database is created.
3754+
When bdb_name is used, the database name will be also used for the service name.
3755+
When redis-port is used, the service will be named redis-<port>.
36883756
enum:
36893757
- bdb_name
36903758
- redis-port
@@ -6220,6 +6288,11 @@ spec:
62206288
type: object
62216289
type: array
62226290
type: object
6291+
podAnnotations:
6292+
additionalProperties:
6293+
type: string
6294+
description: annotations for the service rigger pod
6295+
type: object
62236296
type: object
62246297
sideContainersSpec:
62256298
items:
@@ -7671,6 +7744,8 @@ spec:
76717744
properties:
76727745
propagateHost:
76737746
type: object
7747+
timezoneName:
7748+
type: string
76747749
type: object
76757750
createServiceAccount:
76767751
type: boolean
@@ -7695,11 +7770,74 @@ spec:
76957770
type: object
76967771
enforceIPv4:
76977772
type: boolean
7773+
extraEnvVars:
7774+
description: 'ADVANCED USAGE: use carefully. Add environment variables
7775+
to RS StatefulSet''s containers.'
7776+
items:
7777+
properties:
7778+
name:
7779+
type: string
7780+
value:
7781+
type: string
7782+
valueFrom:
7783+
properties:
7784+
configMapKeyRef:
7785+
properties:
7786+
key:
7787+
type: string
7788+
name:
7789+
type: string
7790+
optional:
7791+
type: boolean
7792+
required:
7793+
- key
7794+
type: object
7795+
fieldRef:
7796+
properties:
7797+
apiVersion:
7798+
type: string
7799+
fieldPath:
7800+
type: string
7801+
required:
7802+
- fieldPath
7803+
type: object
7804+
resourceFieldRef:
7805+
properties:
7806+
containerName:
7807+
type: string
7808+
divisor:
7809+
anyOf:
7810+
- type: integer
7811+
- type: string
7812+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
7813+
x-kubernetes-int-or-string: true
7814+
resource:
7815+
type: string
7816+
required:
7817+
- resource
7818+
type: object
7819+
secretKeyRef:
7820+
properties:
7821+
key:
7822+
type: string
7823+
name:
7824+
type: string
7825+
optional:
7826+
type: boolean
7827+
required:
7828+
- key
7829+
type: object
7830+
type: object
7831+
required:
7832+
- name
7833+
type: object
7834+
type: array
76987835
extraLabels:
76997836
additionalProperties:
77007837
type: string
77017838
type: object
77027839
hostAliases:
7840+
description: Adds hostAliases entries to the Redis Enterprise pods
77037841
items:
77047842
properties:
77057843
hostnames:
@@ -7798,13 +7936,10 @@ spec:
77987936
caCertificateSecretName:
77997937
type: string
78007938
cacheTTLSeconds:
7801-
default: 300
78027939
type: integer
78037940
enabledForControlPlane:
7804-
default: false
78057941
type: boolean
78067942
enabledForDataPlane:
7807-
default: false
78087943
type: boolean
78097944
protocol:
78107945
enum:
@@ -7870,6 +8005,12 @@ spec:
78708005
podAnnotations:
78718006
additionalProperties:
78728007
type: string
8008+
description: annotations for the service rigger and redis enterprise pods
8009+
type: object
8010+
redisEnterprisePodAnnotations:
8011+
additionalProperties:
8012+
type: string
8013+
description: annotations for redis enterprise pod
78738014
type: object
78748015
podAntiAffinity:
78758016
properties:
@@ -10815,6 +10956,9 @@ spec:
1081510956
type: object
1081610957
type: array
1081710958
serviceNaming:
10959+
description: Used to determine how to name the services created automatically when a database is created.
10960+
When bdb_name is used, the database name will be also used for the service name.
10961+
When redis-port is used, the service will be named redis-<port>.
1081810962
enum:
1081910963
- bdb_name
1082010964
- redis-port
@@ -13343,6 +13487,11 @@ spec:
1334313487
type: object
1334413488
type: array
1334513489
type: object
13490+
podAnnotations:
13491+
additionalProperties:
13492+
type: string
13493+
description: annotations for the service rigger pod
13494+
type: object
1334613495
type: object
1334713496
sideContainersSpec:
1334813497
items:

‎crds/redb_crd.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,12 @@ spec:
391391
and it must not be below 1GB.
392392
type: string
393393
modulesList:
394-
description: List of modules associated with database
394+
description: List of modules associated with database.
395+
Note - For Active-Active databases this feature is currently in preview. For
396+
this feature to take effect for Active-Active databases, set a boolean environment variable
397+
with the name "ENABLE_ALPHA_FEATURES" to True. This variable can
398+
be set via the redis-enterprise-operator pod spec, or through the
399+
operator-environment-config Config Map.
395400
items:
396401
description: 'Redis Enterprise Module: https://redislabs.com/redis-enterprise/modules/'
397402
properties:

‎examples/v1alpha1/reaadb.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ metadata:
55
labels:
66
app: redis-enterprise
77
spec:
8-
# The Redis Enterprise Cluster Object this Resource is associated with
9-
redisEnterpriseCluster:
10-
name: rec1
118
participatingClusters:
12-
# Participating cluster with RERC named 'rerc1' in 'ns1' namespace.
13-
- name: rerc1.ns1
14-
# Participating cluster with RERC named 'rerc2' in 'ns2' namespace.
15-
- name: rerc2.ns2
9+
# Participating cluster pointing to RERC named: 'new-york-1'.
10+
- name: new-york-1
11+
# Participating cluster pointing to RERC named: 'boston-1'.
12+
- name: boston-1

‎examples/v1alpha1/redb.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@ metadata:
44
name: redis-enterprise-database
55
labels:
66
app: redis-enterprise
7-
spec:
8-
redisEnterpriseCluster:
9-
name: redis-enterprise

0 commit comments

Comments
 (0)