From c1e37507214d6a125fdcea64cbff7f55fb662127 Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Tue, 21 Sep 2021 17:42:15 +0600 Subject: [PATCH 1/2] Set RESTIC_PROGRESS_FPS in restic wrapper shell Signed-off-by: Emruz Hossain --- pkg/restic/setup.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/restic/setup.go b/pkg/restic/setup.go index 863a2e094..95f3112db 100644 --- a/pkg/restic/setup.go +++ b/pkg/restic/setup.go @@ -27,9 +27,10 @@ import ( ) const ( - RESTIC_REPOSITORY = "RESTIC_REPOSITORY" - RESTIC_PASSWORD = "RESTIC_PASSWORD" - TMPDIR = "TMPDIR" + RESTIC_REPOSITORY = "RESTIC_REPOSITORY" + RESTIC_PASSWORD = "RESTIC_PASSWORD" + RESTIC_PROGRESS_FPS = "RESTIC_PROGRESS_FPS" + TMPDIR = "TMPDIR" AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID" AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY" @@ -81,6 +82,10 @@ const ( ) func (w *ResticWrapper) setupEnv() error { + // Set progress report frequency. + // 0.016666 is for one report per minute. + // ref: https://restic.readthedocs.io/en/stable/manual_rest.html + w.sh.SetEnv(RESTIC_PROGRESS_FPS, "0.016666") if v, err := ioutil.ReadFile(filepath.Join(w.config.SecretDir, RESTIC_PASSWORD)); err != nil { return err From 72b735236039fdbe7f138b2ae6c6fd9544818172 Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Tue, 21 Sep 2021 08:39:50 -0700 Subject: [PATCH 2/2] Log warning if Community License is used with non-demo namespace (#119) /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index f49c45e3a..a901917aa 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( k8s.io/klog/v2 v2.8.0 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 k8s.io/kubernetes v1.21.1 - kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063 + kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32 kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4 kmodules.xyz/custom-resources v0.0.0-20210829135624-c63be82e13c0 kmodules.xyz/objectstore-api v0.0.0-20210829122106-d39859fc2d56 diff --git a/go.sum b/go.sum index 2da0f04e7..091332d35 100644 --- a/go.sum +++ b/go.sum @@ -1021,8 +1021,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b/go.mod h1:A6GAK6xP5zBuWK6A/vUkkjKzcuywkms7fIxRf5wblO4= kmodules.xyz/client-go v0.0.0-20210715065708-d4f0cc74ead1/go.mod h1:E/vGngai00UtVwP8R4PWpPUBF/EZa6Ub9WS5+tVcs4M= -kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063 h1:u+/fmk4N1LsxeCU7q7vnNgaADK73UeyNWKzNtjFe3Bs= -kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= +kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32 h1:ZXVJStHHjppRoaUw5JQ5KzMjK+EiY1GkcPigPHfkvSg= +kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4 h1:vg6VZCnkHu3kJKdUe/oswi7MhjUVcZpyP/aXYhKFZ7M= kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA= diff --git a/vendor/modules.txt b/vendor/modules.txt index e0d23b829..0f87324ae 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -799,7 +799,7 @@ k8s.io/utils/net k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace -# kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063 +# kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32 ## explicit kmodules.xyz/client-go kmodules.xyz/client-go/api/v1