Skip to content

Commit c15daba

Browse files
horshors
authored
Merge branch 'main' into K8SPSMDB-1211
2 parents d4d89df + bd071b9 commit c15daba

32 files changed

+1280
-543
lines changed

‎.e2eignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ operator.png
99
kubernetes.svg
1010
release_versions
1111
.github/**
12+
.snyk
13+
.e2eignore

‎.snyk‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#SNYK - percona/percona-server-mongodb-operator
2+
3+
exclude:
4+
global:
5+
- e2e-tests/**
6+
7+
version: v1.25.0
8+
ignore: {}
9+
patch: {}

‎config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,35 @@ spec:
109109
required:
110110
- path
111111
type: object
112+
gcs:
113+
properties:
114+
bucket:
115+
type: string
116+
chunkSize:
117+
type: integer
118+
credentialsSecret:
119+
type: string
120+
prefix:
121+
type: string
122+
retryer:
123+
properties:
124+
backoffInitial:
125+
format: int64
126+
type: integer
127+
backoffMax:
128+
format: int64
129+
type: integer
130+
backoffMultiplier:
131+
type: number
132+
required:
133+
- backoffInitial
134+
- backoffMax
135+
- backoffMultiplier
136+
type: object
137+
required:
138+
- bucket
139+
- credentialsSecret
140+
type: object
112141
lastTransition:
113142
format: date-time
114143
type: string
@@ -145,6 +174,7 @@ spec:
145174
insecureSkipTLSVerify:
146175
type: boolean
147176
maxUploadParts:
177+
format: int32
148178
type: integer
149179
prefix:
150180
type: string

‎config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,35 @@ spec:
7272
required:
7373
- path
7474
type: object
75+
gcs:
76+
properties:
77+
bucket:
78+
type: string
79+
chunkSize:
80+
type: integer
81+
credentialsSecret:
82+
type: string
83+
prefix:
84+
type: string
85+
retryer:
86+
properties:
87+
backoffInitial:
88+
format: int64
89+
type: integer
90+
backoffMax:
91+
format: int64
92+
type: integer
93+
backoffMultiplier:
94+
type: number
95+
required:
96+
- backoffInitial
97+
- backoffMax
98+
- backoffMultiplier
99+
type: object
100+
required:
101+
- bucket
102+
- credentialsSecret
103+
type: object
75104
lastTransition:
76105
format: date-time
77106
type: string
@@ -108,6 +137,7 @@ spec:
108137
insecureSkipTLSVerify:
109138
type: boolean
110139
maxUploadParts:
140+
format: int32
111141
type: integer
112142
prefix:
113143
type: string

‎config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,35 @@ spec:
324324
required:
325325
- path
326326
type: object
327+
gcs:
328+
properties:
329+
bucket:
330+
type: string
331+
chunkSize:
332+
type: integer
333+
credentialsSecret:
334+
type: string
335+
prefix:
336+
type: string
337+
retryer:
338+
properties:
339+
backoffInitial:
340+
format: int64
341+
type: integer
342+
backoffMax:
343+
format: int64
344+
type: integer
345+
backoffMultiplier:
346+
type: number
347+
required:
348+
- backoffInitial
349+
- backoffMax
350+
- backoffMultiplier
351+
type: object
352+
required:
353+
- bucket
354+
- credentialsSecret
355+
type: object
327356
main:
328357
type: boolean
329358
s3:
@@ -341,6 +370,7 @@ spec:
341370
insecureSkipTLSVerify:
342371
type: boolean
343372
maxUploadParts:
373+
format: int32
344374
type: integer
345375
prefix:
346376
type: string

‎deploy/bundle.yaml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,35 @@ spec:
113113
required:
114114
- path
115115
type: object
116+
gcs:
117+
properties:
118+
bucket:
119+
type: string
120+
chunkSize:
121+
type: integer
122+
credentialsSecret:
123+
type: string
124+
prefix:
125+
type: string
126+
retryer:
127+
properties:
128+
backoffInitial:
129+
format: int64
130+
type: integer
131+
backoffMax:
132+
format: int64
133+
type: integer
134+
backoffMultiplier:
135+
type: number
136+
required:
137+
- backoffInitial
138+
- backoffMax
139+
- backoffMultiplier
140+
type: object
141+
required:
142+
- bucket
143+
- credentialsSecret
144+
type: object
116145
lastTransition:
117146
format: date-time
118147
type: string
@@ -149,6 +178,7 @@ spec:
149178
insecureSkipTLSVerify:
150179
type: boolean
151180
maxUploadParts:
181+
format: int32
152182
type: integer
153183
prefix:
154184
type: string
@@ -277,6 +307,35 @@ spec:
277307
required:
278308
- path
279309
type: object
310+
gcs:
311+
properties:
312+
bucket:
313+
type: string
314+
chunkSize:
315+
type: integer
316+
credentialsSecret:
317+
type: string
318+
prefix:
319+
type: string
320+
retryer:
321+
properties:
322+
backoffInitial:
323+
format: int64
324+
type: integer
325+
backoffMax:
326+
format: int64
327+
type: integer
328+
backoffMultiplier:
329+
type: number
330+
required:
331+
- backoffInitial
332+
- backoffMax
333+
- backoffMultiplier
334+
type: object
335+
required:
336+
- bucket
337+
- credentialsSecret
338+
type: object
280339
lastTransition:
281340
format: date-time
282341
type: string
@@ -313,6 +372,7 @@ spec:
313372
insecureSkipTLSVerify:
314373
type: boolean
315374
maxUploadParts:
375+
format: int32
316376
type: integer
317377
prefix:
318378
type: string
@@ -1052,6 +1112,35 @@ spec:
10521112
required:
10531113
- path
10541114
type: object
1115+
gcs:
1116+
properties:
1117+
bucket:
1118+
type: string
1119+
chunkSize:
1120+
type: integer
1121+
credentialsSecret:
1122+
type: string
1123+
prefix:
1124+
type: string
1125+
retryer:
1126+
properties:
1127+
backoffInitial:
1128+
format: int64
1129+
type: integer
1130+
backoffMax:
1131+
format: int64
1132+
type: integer
1133+
backoffMultiplier:
1134+
type: number
1135+
required:
1136+
- backoffInitial
1137+
- backoffMax
1138+
- backoffMultiplier
1139+
type: object
1140+
required:
1141+
- bucket
1142+
- credentialsSecret
1143+
type: object
10551144
main:
10561145
type: boolean
10571146
s3:
@@ -1069,6 +1158,7 @@ spec:
10691158
insecureSkipTLSVerify:
10701159
type: boolean
10711160
maxUploadParts:
1161+
format: int32
10721162
type: integer
10731163
prefix:
10741164
type: string

‎deploy/cr.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,13 @@ spec:
719719
# maxUploadParts: 10000
720720
# storageClass: STANDARD
721721
# insecureSkipTLSVerify: false
722+
# gcs:
723+
# type: gcs
724+
# s3:
725+
# bucket: GCS-BACKUP-BUCKET-NAME-HERE
726+
# prefix: ""
727+
# credentialsSecret: my-cluster-name-backup-gcs
728+
# chunkSize: 10485760
722729
# minio:
723730
# type: s3
724731
# s3:

0 commit comments

Comments
 (0)