Skip to content

Commit 65eba63

Browse files
yuvallevy2yuvallevy2
authored
Merge pull request #243 from RedisLabs/6.2.12-1
promoting version 6.2.12-1
2 parents 60f623f + d824530 commit 65eba63

15 files changed

+3252
-3558
lines changed

‎README.md

Lines changed: 18 additions & 577 deletions
Large diffs are not rendered by default.

‎bundle.yaml

Lines changed: 1507 additions & 1420 deletions
Large diffs are not rendered by default.

‎crds/rec_crd.yaml

Lines changed: 114 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -172,18 +172,23 @@ spec:
172172
bootstrapperImageSpec:
173173
description: Specification for Bootstrapper container image
174174
properties:
175+
digestHash:
176+
description: 'The digest hash of the container image to pull.
177+
When specified, the container image is pulled according to the
178+
digest hash instead of the image tag. The versionTag field must
179+
also be specified with the image tag matching this digest hash.
180+
Note: This field is only supported for OLM deployments.'
181+
type: string
175182
imagePullPolicy:
176-
description: PullPolicy describes a policy for if/when to pull a
177-
container image
183+
description: The image pull policy to be applied to the container
184+
image. One of Always, Never, IfNotPresent.
178185
type: string
179186
repository:
180-
description: Repository
187+
description: The repository (name) of the container image to be
188+
deployed.
181189
type: string
182190
versionTag:
183-
type: string
184-
digestHash:
185-
description: 'The digest hash of the image to pull. Version tag must be also specified with the corresponding version, will use the digest hash to pull the image if exists.
186-
Note: This is currently supported only for OLM.'
191+
description: The tag of the container image to be deployed.
187192
type: string
188193
type: object
189194
bootstrapperResources:
@@ -343,6 +348,17 @@ spec:
343348
- dbFqdnSuffix
344349
- method
345350
type: object
351+
services:
352+
description: Redis-Enterprise-Operator services specifications.
353+
properties:
354+
servicesAnnotations:
355+
additionalProperties:
356+
type: string
357+
description: Global additional annotations to set on service resources
358+
created by the operator.
359+
Note - The specified annotations will not override annotations that already exists and didn't originated from the operator.
360+
type: object
361+
type: object
346362
license:
347363
description: Redis Enterprise License
348364
type: string
@@ -556,7 +572,12 @@ spec:
556572
type: array
557573
type: object
558574
podSecurityPolicyName:
559-
description: Name of pod security policy to use on pods See https://kubernetes.io/docs/concepts/policy/pod-security-policy/
575+
description: "DEPRECATED PodSecurityPolicy support is removed in Kubernetes
576+
v1.25 and the use of this field is invalid for use when running
577+
on Kubernetes v1.25+. Future versions of the RedisEnterpriseCluster
578+
API will remove support for this field altogether. For migration
579+
instructions, see https://kubernetes.io/docs/tasks/configure-pod-container/migrate-from-psp/
580+
\n Name of pod security policy to use on pods"
560581
type: string
561582
podStartingPolicy:
562583
description: Mitigation setting for STS pods stuck in "ContainerCreating"
@@ -2999,18 +3020,23 @@ spec:
29993020
redisEnterpriseImageSpec:
30003021
description: Specification for Redis Enterprise container image
30013022
properties:
3023+
digestHash:
3024+
description: 'The digest hash of the container image to pull.
3025+
When specified, the container image is pulled according to the
3026+
digest hash instead of the image tag. The versionTag field must
3027+
also be specified with the image tag matching this digest hash.
3028+
Note: This field is only supported for OLM deployments.'
3029+
type: string
30023030
imagePullPolicy:
3003-
description: PullPolicy describes a policy for if/when to pull a
3004-
container image
3031+
description: The image pull policy to be applied to the container
3032+
image. One of Always, Never, IfNotPresent.
30053033
type: string
30063034
repository:
3007-
description: Repository
3035+
description: The repository (name) of the container image to be
3036+
deployed.
30083037
type: string
30093038
versionTag:
3010-
type: string
3011-
digestHash:
3012-
description: 'The digest hash of the image to pull. Version tag must be also specified with the corresponding version, will use the digest hash to pull the image if exists.
3013-
Note: This is currently supported only for OLM.'
3039+
description: The tag of the container image to be deployed.
30143040
type: string
30153041
type: object
30163042
redisEnterpriseNodeResources:
@@ -3124,14 +3150,23 @@ spec:
31243150
redisEnterpriseServicesRiggerImageSpec:
31253151
description: Specification for Services Rigger container image
31263152
properties:
3153+
digestHash:
3154+
description: 'The digest hash of the container image to pull.
3155+
When specified, the container image is pulled according to the
3156+
digest hash instead of the image tag. The versionTag field must
3157+
also be specified with the image tag matching this digest hash.
3158+
Note: This field is only supported for OLM deployments.'
3159+
type: string
31273160
imagePullPolicy:
3128-
description: PullPolicy describes a policy for if/when to pull a
3129-
container image
3161+
description: The image pull policy to be applied to the container
3162+
image. One of Always, Never, IfNotPresent.
31303163
type: string
31313164
repository:
3132-
description: Repository
3165+
description: The repository (name) of the container image to be
3166+
deployed.
31333167
type: string
31343168
versionTag:
3169+
description: The tag of the container image to be deployed.
31353170
type: string
31363171
type: object
31373172
redisEnterpriseServicesRiggerResources:
@@ -6258,7 +6293,10 @@ spec:
62586293
uiAnnotations:
62596294
additionalProperties:
62606295
type: string
6261-
description: Annotations for Redis Enterprise UI service
6296+
description: Annotations for Redis Enterprise UI service.
6297+
This annotations will override the overlapping global annotations set under spec.services.servicesAnnotations
6298+
Note - The specified annotations will not override annotations that already exists and didn't originated from the operator
6299+
except for the following reserved annotation name redis.io/last-keys.
62626300
type: object
62636301
uiServiceType:
62646302
description: Type of service used to expose Redis Enterprise UI (https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types)
@@ -7070,14 +7108,23 @@ spec:
70707108
bootstrapperImageSpec:
70717109
description: Specification for Bootstrapper container image
70727110
properties:
7111+
digestHash:
7112+
description: 'The digest hash of the container image to pull.
7113+
When specified, the container image is pulled according to the
7114+
digest hash instead of the image tag. The versionTag field must
7115+
also be specified with the image tag matching this digest hash.
7116+
Note: This field is only supported for OLM deployments.'
7117+
type: string
70737118
imagePullPolicy:
7074-
description: PullPolicy describes a policy for if/when to pull a
7075-
container image
7119+
description: The image pull policy to be applied to the container
7120+
image. One of Always, Never, IfNotPresent.
70767121
type: string
70777122
repository:
7078-
description: Repository
7123+
description: The repository (name) of the container image to be
7124+
deployed.
70797125
type: string
70807126
versionTag:
7127+
description: The tag of the container image to be deployed.
70817128
type: string
70827129
type: object
70837130
bootstrapperResources:
@@ -7236,6 +7283,17 @@ spec:
72367283
- dbFqdnSuffix
72377284
- method
72387285
type: object
7286+
services:
7287+
description: Redis-Enterprise-Operator services specifications.
7288+
properties:
7289+
servicesAnnotations:
7290+
additionalProperties:
7291+
type: string
7292+
description: Global additional annotations to set on service resources
7293+
created by the operator.
7294+
Note - The specified annotations will not override annotations that already exists and didn't originated from the operator.
7295+
type: object
7296+
type: object
72397297
license:
72407298
description: Redis Enterprise License
72417299
type: string
@@ -7449,7 +7507,12 @@ spec:
74497507
type: array
74507508
type: object
74517509
podSecurityPolicyName:
7452-
description: Name of pod security policy to use on pods See https://kubernetes.io/docs/concepts/policy/pod-security-policy/
7510+
description: "DEPRECATED PodSecurityPolicy support is removed in Kubernetes
7511+
v1.25 and the use of this field is invalid for use when running
7512+
on Kubernetes v1.25+. Future versions of the RedisEnterpriseCluster
7513+
API will remove support for this field altogether. For migration
7514+
instructions, see https://kubernetes.io/docs/tasks/configure-pod-container/migrate-from-psp/
7515+
\n Name of pod security policy to use on pods"
74537516
type: string
74547517
podStartingPolicy:
74557518
description: Mitigation setting for STS pods stuck in "ContainerCreating"
@@ -9893,18 +9956,23 @@ spec:
98939956
redisEnterpriseImageSpec:
98949957
description: Specification for Redis Enterprise container image
98959958
properties:
9959+
digestHash:
9960+
description: 'The digest hash of the container image to pull.
9961+
When specified, the container image is pulled according to the
9962+
digest hash instead of the image tag. The versionTag field must
9963+
also be specified with the image tag matching this digest hash.
9964+
Note: This field is only supported for OLM deployments.'
9965+
type: string
98969966
imagePullPolicy:
9897-
description: PullPolicy describes a policy for if/when to pull a
9898-
container image
9967+
description: The image pull policy to be applied to the container
9968+
image. One of Always, Never, IfNotPresent.
98999969
type: string
99009970
repository:
9901-
description: Repository
9971+
description: The repository (name) of the container image to be
9972+
deployed.
99029973
type: string
99039974
versionTag:
9904-
type: string
9905-
digestHash:
9906-
description: 'The digest hash of the image to pull. Version tag must be also specified with the corresponding version, will use the digest hash to pull the image if exists.
9907-
Note: This is currently supported only for OLM.'
9975+
description: The tag of the container image to be deployed.
99089976
type: string
99099977
type: object
99109978
redisEnterpriseNodeResources:
@@ -10018,18 +10086,23 @@ spec:
1001810086
redisEnterpriseServicesRiggerImageSpec:
1001910087
description: Specification for Services Rigger container image
1002010088
properties:
10089+
digestHash:
10090+
description: 'The digest hash of the container image to pull.
10091+
When specified, the container image is pulled according to the
10092+
digest hash instead of the image tag. The versionTag field must
10093+
also be specified with the image tag matching this digest hash.
10094+
Note: This field is only supported for OLM deployments.'
10095+
type: string
1002110096
imagePullPolicy:
10022-
description: PullPolicy describes a policy for if/when to pull a
10023-
container image
10097+
description: The image pull policy to be applied to the container
10098+
image. One of Always, Never, IfNotPresent.
1002410099
type: string
1002510100
repository:
10026-
description: Repository
10101+
description: The repository (name) of the container image to be
10102+
deployed.
1002710103
type: string
1002810104
versionTag:
10029-
type: string
10030-
digestHash:
10031-
description: 'The digest hash of the image to pull. Version tag must be also specified with the corresponding version, will use the digest hash to pull the image if exists.
10032-
Note: This is currently supported only for OLM.'
10105+
description: The tag of the container image to be deployed.
1003310106
type: string
1003410107
type: object
1003510108
redisEnterpriseServicesRiggerResources:
@@ -13156,7 +13229,10 @@ spec:
1315613229
uiAnnotations:
1315713230
additionalProperties:
1315813231
type: string
13159-
description: Annotations for Redis Enterprise UI service
13232+
description: Annotations for Redis Enterprise UI service.
13233+
This annotations will override the overlapping global annotations set under spec.services.servicesAnnotations
13234+
Note - The specified annotations will not override annotations that already exists and didn't originated from the operator
13235+
except for the following reserved annotation name redis.io/last-keys.
1316013236
type: object
1316113237
uiServiceType:
1316213238
description: Type of service used to expose Redis Enterprise UI (https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types)

‎crds/redb_crd.yaml

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -449,30 +449,39 @@ spec:
449449
items:
450450
properties:
451451
clientKeySecret:
452-
description: Secret that defines what client key to use. The
453-
secret needs 2 keys in it's map, "cert" that is the PEM encoded
454-
certificate and "key" that is the PEM encoded private key
452+
description: 'Secret that defines the client certificate and
453+
key used by the syncer in the target database cluster. The
454+
secret must have 2 keys in its map: "cert" which is the PEM
455+
encoded certificate, and "key" which is the PEM encoded private
456+
key.'
455457
type: string
456458
compression:
457-
description: GZIP Compression level (0-9) to use for replication
459+
description: GZIP compression level (0-6) to use for replication.
458460
type: integer
459461
replicaSourceName:
460-
description: Kubernetes resource name of type ReplicaSourceType
462+
description: The name of the resource from which the source
463+
database URI is derived. The type of resource must match the
464+
type specified in the ReplicaSourceType field.
461465
type: string
462466
replicaSourceType:
463-
description: Determines what Kuberetes resource ReplicaSourceName
464-
refers to SECRET - Get URI from secret named in ReplicaSourceName. The
465-
secret will have a uri key that defines the complete, redis://
466-
URI REDB - Determine URI from Kubernetes REDB resource named
467-
in ReplicaSourceName
467+
description: The type of resource from which the source database
468+
URI is derived. If set to 'SECRET', the source database URI
469+
is derived from the secret named in the ReplicaSourceName
470+
field. The secret must have a key named 'uri' that defines
471+
the URI of the source database in the form of 'redis://...'.
472+
The type of secret (kubernetes, vault, ...) is determined
473+
by the secret mechanism used by the underlying REC object.
474+
If set to 'REDB', the source database URI is derived from
475+
the RedisEnterpriseDatabase resource named in the ReplicaSourceName
476+
field.
468477
type: string
469478
serverCertSecret:
470-
description: Secret that defines the Server's certificate. The
471-
secret needs 1 key in it's map, "cert" that is the PEM encoded
472-
certificate
479+
description: 'Secret that defines the server certificate used
480+
by the proxy in the source database cluster. The secret must
481+
have 1 key in its map: "cert" which is the PEM encoded certificate.'
473482
type: string
474483
tlsSniName:
475-
description: TLS SNI Name to use
484+
description: TLS SNI name to use for the replication link.
476485
type: string
477486
required:
478487
- replicaSourceName

‎log_collector/log_collector.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"RedisEnterpriseCluster",
4040
"RedisEnterpriseDatabase",
4141
"RedisEnterpriseRemoteCluster",
42+
"RedisEnterpriseActiveActivePeering",
4243
"StatefulSet",
4344
"Deployment",
4445
"Service",
@@ -451,6 +452,11 @@ def collect_events(namespace, output_dir, k8s_cli):
451452
collect_helper(output_dir, cmd=cmd,
452453
file_name="events", resource_name="events", namespace=namespace)
453454

455+
# We get the events in YAML format as well since in YAML format they are a bit more informative.
456+
output = run_get_resource_yaml(namespace, "Event", k8s_cli)
457+
with open(os.path.join(output_dir, "Event.yaml"), "w+") as file_handle:
458+
file_handle.write(output)
459+
454460

455461
def collect_api_resources(namespace, output_dir, k8s_cli):
456462
"""

0 commit comments

Comments
 (0)