forked from hswaw/hscloud
rook: fix benji
This unforks benji back into upstream. The old fork didn't support a new authentication method on Ceph, and we don't have multiple clusters anymore (so we don't need the functionality of the fork). Change-Id: Ie79313b2321ca2e22ad2874b75a71385af95105f Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1321 Reviewed-by: informatic <informatic@hackerspace.pl>master
parent
8e439ed8e3
commit
437b0c335f
|
@ -987,10 +987,7 @@ local oa = kube.OpenAPI;
|
|||
serviceAccountName: cluster.benji.sa.metadata.name,
|
||||
containers_: {
|
||||
benji: kube.Container(cluster.name("benji")) {
|
||||
# TODO(q3k): switch back to upstream after pull/65 goes in.
|
||||
# Currently this is being built from github.com/q3k/benji.
|
||||
# https://github.com/elemental-lf/benji/pull/65
|
||||
image: "registry.k0.hswaw.net/q3k/benji-k8s:20191221-2336",
|
||||
image: "ghcr.io/elemental-lf/benji-k8s@sha256:8ab74b210bfdf6ebbf0017144b34fb840ad9ad225edf27dd3394fbd8332e649d",
|
||||
volumeMounts_: {
|
||||
extrabins: { mountPath: "/usr/local/extrabins" },
|
||||
monendpoints: { mountPath: "/etc/rook" },
|
||||
|
@ -1003,11 +1000,11 @@ local oa = kube.OpenAPI;
|
|||
command: [
|
||||
"bash", "-c", |||
|
||||
bash /usr/local/extrabins/get-rook-creds.sh
|
||||
benji-backup-pvc %s
|
||||
benji-backup-pvc
|
||||
benji-command enforce latest3,hours48,days7,months12
|
||||
benji-command cleanup
|
||||
bash /usr/local/extrabins/metabackup.sh
|
||||
||| % [std.join(" ", ["--pool-filter=%s" % [p] for p in cluster.spec.benji.pools])],
|
||||
|||
|
||||
],
|
||||
},
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue