Skip to content

Commit b5febcf

Browse files
johscheuerjohscheuer
authored
Update the operator example deployments to reflect current supported FDB versions (#2275)
1 parent 5da2adb commit b5febcf

File tree

4 files changed

+48
-41
lines changed

4 files changed

+48
-41
lines changed

‎charts/fdb-operator/templates/manager/deployment.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ spec:
5454
- "--copy-binary"
5555
- "fdbrestore"
5656
- "--output-dir"
57-
- "/var/output-files/{{ regexFind "^[0-9.]+" $params.image.tag }}"
58-
- "--init-mode"
57+
- "/var/output-files"
58+
- "--mode"
59+
- "init"
5960
volumeMounts:
6061
- name: fdb-binaries
6162
mountPath: /var/output-files

‎charts/fdb-operator/values.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ image:
44
tag: v2.4.0
55
pullPolicy: IfNotPresent
66
initContainers:
7-
6.2:
7+
7.1:
88
image:
9-
repository: foundationdb/foundationdb-kubernetes-sidecar
10-
tag: 6.2.30-1
9+
repository: foundationdb/fdb-kubernetes-monitor
10+
tag: 7.1.67
1111
pullPolicy: IfNotPresent
12-
6.3:
12+
7.3:
1313
image:
14-
repository: foundationdb/foundationdb-kubernetes-sidecar
15-
tag: 6.3.23-1
14+
repository: foundationdb/fdb-kubernetes-monitor
15+
tag: 7.3.63
1616
pullPolicy: IfNotPresent
17-
7.1:
17+
7.4:
1818
image:
19-
repository: foundationdb/foundationdb-kubernetes-sidecar
20-
tag: 7.1.15-1
19+
repository: foundationdb/fdb-kubernetes-monitor
20+
tag: 7.4.1
2121
pullPolicy: IfNotPresent
2222
globalMode:
2323
enabled: false

‎config/deployment/manager.yaml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,54 +29,57 @@ spec:
2929
emptyDir: {}
3030
serviceAccountName: fdb-kubernetes-operator-controller-manager
3131
initContainers:
32-
- name: foundationdb-kubernetes-init-6-2
33-
image: foundationdb/foundationdb-kubernetes-sidecar:6.2.30-1
32+
- name: foundationdb-kubernetes-init-7-1
33+
image: foundationdb/fdb-kubernetes-monitor:7.1.67
3434
args:
3535
- "--copy-library"
36-
- "6.2"
36+
- "7.1"
3737
- "--copy-binary"
3838
- "fdbcli"
3939
- "--copy-binary"
4040
- "fdbbackup"
4141
- "--copy-binary"
4242
- "fdbrestore"
4343
- "--output-dir"
44-
- "/var/output-files/6.2.30"
45-
- "--init-mode"
44+
- "/var/output-files"
45+
- "--mode"
46+
- "init"
4647
volumeMounts:
4748
- name: fdb-binaries
4849
mountPath: /var/output-files
49-
- name: foundationdb-kubernetes-init-6-3
50-
image: foundationdb/foundationdb-kubernetes-sidecar:6.3.24-1
50+
- name: foundationdb-kubernetes-init-7-3
51+
image: foundationdb/fdb-kubernetes-monitor:7.3.63
5152
args:
5253
- "--copy-library"
53-
- "6.3"
54+
- "7.3"
5455
- "--copy-binary"
5556
- "fdbcli"
5657
- "--copy-binary"
5758
- "fdbbackup"
5859
- "--copy-binary"
5960
- "fdbrestore"
6061
- "--output-dir"
61-
- "/var/output-files/6.3.24"
62-
- "--init-mode"
62+
- "/var/output-files"
63+
- "--mode"
64+
- "init"
6365
volumeMounts:
6466
- name: fdb-binaries
6567
mountPath: /var/output-files
66-
- name: foundationdb-kubernetes-init-7-1
67-
image: foundationdb/foundationdb-kubernetes-sidecar:7.1.26-1
68+
- name: foundationdb-kubernetes-init-7-4
69+
image: foundationdb/fdb-kubernetes-monitor:7.4.1
6870
args:
6971
- "--copy-library"
70-
- "7.1"
72+
- "7.4"
7173
- "--copy-binary"
7274
- "fdbcli"
7375
- "--copy-binary"
7476
- "fdbbackup"
7577
- "--copy-binary"
7678
- "fdbrestore"
7779
- "--output-dir"
78-
- "/var/output-files/7.1.26"
79-
- "--init-mode"
80+
- "/var/output-files"
81+
- "--mode"
82+
- "init"
8083
volumeMounts:
8184
- name: fdb-binaries
8285
mountPath: /var/output-files

‎config/samples/deployment.yaml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,52 +204,55 @@ spec:
204204
initContainers:
205205
- args:
206206
- --copy-library
207-
- "6.2"
207+
- "7.1"
208208
- --copy-binary
209209
- fdbcli
210210
- --copy-binary
211211
- fdbbackup
212212
- --copy-binary
213213
- fdbrestore
214214
- --output-dir
215-
- /var/output-files/6.2.30
216-
- --init-mode
217-
image: foundationdb/foundationdb-kubernetes-sidecar:6.2.30-1
218-
name: foundationdb-kubernetes-init-6-2
215+
- /var/output-files
216+
- --mode
217+
- init
218+
image: foundationdb/fdb-kubernetes-monitor:7.1.67
219+
name: foundationdb-kubernetes-init-7-1
219220
volumeMounts:
220221
- mountPath: /var/output-files
221222
name: fdb-binaries
222223
- args:
223224
- --copy-library
224-
- "6.3"
225+
- "7.3"
225226
- --copy-binary
226227
- fdbcli
227228
- --copy-binary
228229
- fdbbackup
229230
- --copy-binary
230231
- fdbrestore
231232
- --output-dir
232-
- /var/output-files/6.3.24
233-
- --init-mode
234-
image: foundationdb/foundationdb-kubernetes-sidecar:6.3.24-1
235-
name: foundationdb-kubernetes-init-6-3
233+
- /var/output-files
234+
- --mode
235+
- init
236+
image: foundationdb/fdb-kubernetes-monitor:7.3.63
237+
name: foundationdb-kubernetes-init-7-3
236238
volumeMounts:
237239
- mountPath: /var/output-files
238240
name: fdb-binaries
239241
- args:
240242
- --copy-library
241-
- "7.1"
243+
- "7.4"
242244
- --copy-binary
243245
- fdbcli
244246
- --copy-binary
245247
- fdbbackup
246248
- --copy-binary
247249
- fdbrestore
248250
- --output-dir
249-
- /var/output-files/7.1.26
250-
- --init-mode
251-
image: foundationdb/foundationdb-kubernetes-sidecar:7.1.26-1
252-
name: foundationdb-kubernetes-init-7-1
251+
- /var/output-files
252+
- --mode
253+
- init
254+
image: foundationdb/fdb-kubernetes-monitor:7.4.1
255+
name: foundationdb-kubernetes-init-7-4
253256
volumeMounts:
254257
- mountPath: /var/output-files
255258
name: fdb-binaries

0 commit comments

Comments
 (0)