Skip to content

Commit 2094768

Browse files
yuvallevy2yuvallevy2
authored
Merge pull request #277 from RedisLabs/7.4.6-2
7.4.6-2
2 parents a4b98af + daf2175 commit 2094768

File tree

13 files changed

+149
-149
lines changed

13 files changed

+149
-149
lines changed

‎bundle.yaml

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ rules:
1515
- serviceaccounts
1616
- rolebindings
1717
verbs:
18-
- bind
19-
- escalate
20-
- impersonate
21-
- userextras
2218
- create
2319
- get
24-
- list
25-
- watch
2620
- update
2721
- patch
2822
- delete
29-
- deletecollection
3023
- apiGroups:
3124
- app.redislabs.com
3225
resources:
@@ -44,7 +37,6 @@ rules:
4437
- redisenterpriseactiveactivedatabases/finalizers
4538
verbs:
4639
- delete
47-
- deletecollection
4840
- get
4941
- list
5042
- patch
@@ -58,17 +50,11 @@ rules:
5850
verbs:
5951
- update
6052
- get
61-
- read
62-
- list
63-
- listallnamespaces
64-
- watch
65-
- watchlist
66-
- watchlistallnamespaces
6753
- create
6854
- patch
69-
- replace
7055
- delete
71-
- deletecollection
56+
- list
57+
- watch
7258
- apiGroups:
7359
- ""
7460
resources:
@@ -93,11 +79,10 @@ rules:
9379
verbs:
9480
- create
9581
- delete
96-
- deletecollection
9782
- get
98-
- list
9983
- patch
10084
- update
85+
- list
10186
- watch
10287
- apiGroups:
10388
- policy
@@ -118,8 +103,8 @@ rules:
118103
- delete
119104
- get
120105
- update
121-
- list
122106
- watch
107+
- list
123108
- apiGroups:
124109
- ""
125110
resources:
@@ -137,23 +122,23 @@ rules:
137122
- pods
138123
verbs:
139124
- get
140-
- watch
141125
- list
142126
- update
143127
- patch
144128
- delete
129+
- watch
145130
- apiGroups:
146131
- ""
147132
resources:
148133
- services
149134
verbs:
150135
- get
151-
- watch
152136
- list
153137
- update
154138
- patch
155139
- create
156140
- delete
141+
- watch
157142
- apiGroups:
158143
- policy
159144
resourceNames:
@@ -169,32 +154,24 @@ rules:
169154
verbs:
170155
- create
171156
- patch
172-
- replace
173157
- delete
174-
- deletecollection
175-
- read
176158
- list
177-
- listallnamespaces
178-
- watch
179-
- watchlist
180-
- watchlistallnamespaces
181-
- patchstatus
182-
- readstatus
183-
- replacestatus
184159
- update
160+
- get
161+
- watch
185162
- apiGroups:
186163
- networking.istio.io
187164
resources:
188165
- gateways
189166
- virtualservices
190167
verbs:
191168
- get
192-
- watch
193169
- list
194170
- update
195171
- patch
196172
- create
197173
- delete
174+
- watch
198175
---
199176
---
200177
apiVersion: rbac.authorization.k8s.io/v1
@@ -3930,6 +3907,21 @@ spec:
39303907
setting its value shall have no effect. Please view the corresponding
39313908
field in RS doc for more info.
39323909
type: boolean
3910+
backup:
3911+
description: Cluster-wide backup configurations
3912+
properties:
3913+
s3:
3914+
description: Configurations for backups to s3 and s3-compatible
3915+
storage
3916+
properties:
3917+
caCertificateSecretName:
3918+
description: Secret name that holds the S3 CA certificate, which contains the TLS certificate mapped to the key in the secret 'cert'
3919+
type: string
3920+
url:
3921+
description: Specifies the URL for S3 export and import
3922+
type: string
3923+
type: object
3924+
type: object
39333925
serviceAccountName:
39343926
description: Name of the service account to use
39353927
type: string
@@ -11196,6 +11188,16 @@ spec:
1119611188
type: string
1119711189
resp3Default:
1119811190
type: boolean
11191+
backup:
11192+
properties:
11193+
s3:
11194+
properties:
11195+
caCertificateSecretName:
11196+
type: string
11197+
url:
11198+
type: string
11199+
type: object
11200+
type: object
1119911201
serviceAccountName:
1120011202
type: string
1120111203
servicesRiggerSpec:
@@ -16530,7 +16532,7 @@ spec:
1653016532
- name
1653116533
type: object
1653216534
redisVersion:
16533-
description: Redis OSS version.
16535+
description: Redis OSS version.
1653416536
Version can be specified via <major.minor> prefix,
1653516537
or via channels - for existing databases - Upgrade
1653616538
Redis OSS version. For new databases - the version which the
@@ -16719,7 +16721,7 @@ spec:
1671916721
- configMapRef:
1672016722
name: "operator-environment-config"
1672116723
optional: true
16722-
image: redislabs/operator:7.4.2-12
16724+
image: redislabs/operator:7.4.6-2
1672316725
imagePullPolicy: Always
1672416726
livenessProbe:
1672516727
failureThreshold: 3
@@ -16767,7 +16769,7 @@ spec:
1676716769
- configMapRef:
1676816770
name: "operator-environment-config"
1676916771
optional: true
16770-
image: redislabs/operator:7.4.2-12
16772+
image: redislabs/operator:7.4.6-2
1677116773
imagePullPolicy: Always
1677216774
livenessProbe:
1677316775
failureThreshold: 3

‎crds/reaadb_crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ spec:
619619
- name
620620
type: object
621621
redisVersion:
622-
description: Redis OSS version.
622+
description: Redis OSS version.
623623
Version can be specified via <major.minor> prefix,
624624
or via channels - for existing databases - Upgrade
625625
Redis OSS version. For new databases - the version which the

‎crds/rec_crd.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3694,6 +3694,21 @@ spec:
36943694
setting its value shall have no effect. Please view the corresponding
36953695
field in RS doc for more info.
36963696
type: boolean
3697+
backup:
3698+
description: Cluster-wide backup configurations
3699+
properties:
3700+
s3:
3701+
description: Configurations for backups to s3 and s3-compatible
3702+
storage
3703+
properties:
3704+
caCertificateSecretName:
3705+
description: Secret name that holds the S3 CA certificate, which contains the TLS certificate mapped to the key in the secret 'cert'
3706+
type: string
3707+
url:
3708+
description: Specifies the URL for S3 export and import
3709+
type: string
3710+
type: object
3711+
type: object
36973712
serviceAccountName:
36983713
description: Name of the service account to use
36993714
type: string
@@ -10960,6 +10975,16 @@ spec:
1096010975
type: string
1096110976
resp3Default:
1096210977
type: boolean
10978+
backup:
10979+
properties:
10980+
s3:
10981+
properties:
10982+
caCertificateSecretName:
10983+
type: string
10984+
url:
10985+
type: string
10986+
type: object
10987+
type: object
1096310988
serviceAccountName:
1096410989
type: string
1096510990
servicesRiggerSpec:

‎log_collector/log_collector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
logger.setLevel(logging.INFO)
3838
LOGGER_FORMAT = '%(asctime)s - %(levelname)s - %(message)s'
3939
logging.basicConfig(format=LOGGER_FORMAT)
40-
VERSION_LOG_COLLECTOR = "7.4.2-12"
40+
VERSION_LOG_COLLECTOR = "7.4.6-2"
4141

4242
TIME_FORMAT = time.strftime("%Y%m%d-%H%M%S")
4343

‎multi-namespace-redb/operator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
- configMapRef:
4242
name: "operator-environment-config"
4343
optional: true
44-
image: redislabs/operator:7.4.2-12
44+
image: redislabs/operator:7.4.6-2
4545
imagePullPolicy: Always
4646
livenessProbe:
4747
failureThreshold: 3
@@ -89,7 +89,7 @@ spec:
8989
- configMapRef:
9090
name: "operator-environment-config"
9191
optional: true
92-
image: redislabs/operator:7.4.2-12
92+
image: redislabs/operator:7.4.6-2
9393
imagePullPolicy: Always
9494
livenessProbe:
9595
failureThreshold: 3

‎multi-namespace-redb/role.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ rules:
88
- apiGroups:
99
- app.redislabs.com
1010
resources: ["redisenterprisedatabases", "redisenterprisedatabases/status", "redisenterprisedatabases/finalizers"]
11-
verbs: ["delete", "deletecollection", "get", "list", "patch", "create", "update", "watch"]
11+
verbs: ["delete", "get", "list", "patch", "create", "update", "watch"]
1212
- apiGroups: [""]
1313
resources: ["secrets"]
14-
verbs: ["update", "get", "read", "list", "listallnamespaces", "watch", "watchlist",
15-
"watchlistallnamespaces", "create","patch","replace","delete","deletecollection"]
14+
verbs: ["update", "get", "watch", "create", "patch", "list"]
1615
- apiGroups: [""]
1716
resources: ["endpoints"]
1817
verbs: ["get", "list", "watch"]
@@ -21,4 +20,4 @@ rules:
2120
verbs: ["create"]
2221
- apiGroups: [""]
2322
resources: ["services"]
24-
verbs: ["get", "watch", "list", "update", "patch", "create", "delete"]
23+
verbs: ["get", "list", "update", "patch", "create", "delete", "watch"]

0 commit comments

Comments
 (0)