From 8d0e205679e1061226c1249c94d0690bf4ce7bd5 Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Mon, 11 Apr 2022 01:56:00 -0700 Subject: [PATCH] Use restic 0.13.1 (#165) /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> --- Makefile | 2 +- go.mod | 6 ++++-- go.sum | 10 ++++++---- vendor/kmodules.xyz/client-go/api/v1/timeofday.go | 12 ++++++++++-- vendor/kmodules.xyz/client-go/meta/incluster.go | 2 +- vendor/modules.txt | 6 ++++-- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 27657d3bc..61b79df02 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ else endif endif -RESTIC_VER := 0.13.0 +RESTIC_VER := 0.13.1 ### ### These variables should not need tweaking. diff --git a/go.mod b/go.mod index 2f36aa13f..29c182384 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( k8s.io/klog/v2 v2.9.0 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/kubernetes v1.21.1 - kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2 + kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5 kmodules.xyz/crd-schema-fuzz v0.0.0-20211025154117-6edb24ef11bc kmodules.xyz/custom-resources v0.0.0-20220317220154-7beb809b1f5e kmodules.xyz/objectstore-api v0.0.0-20220317220441-f1d593d0a778 @@ -32,6 +32,8 @@ require ( sigs.k8s.io/yaml v1.3.0 ) +require github.com/dustin/go-humanize v1.0.1-0.20220316001817-d5090ed65664 // indirect + require ( github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect @@ -91,7 +93,7 @@ require ( golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect - gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d // indirect + gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect google.golang.org/grpc v1.38.0 // indirect diff --git a/go.sum b/go.sum index ae6bd6007..f8f36b2a5 100644 --- a/go.sum +++ b/go.sum @@ -162,8 +162,9 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1-0.20220316001817-d5090ed65664 h1:sVcJ9NcFWMaLxylVWc5iOhkLUkh84wHfOFGzaahu9fc= +github.com/dustin/go-humanize v1.0.1-0.20220316001817-d5090ed65664/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= @@ -964,8 +965,9 @@ gomodules.xyz/homedir v0.1.0/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9era gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= -gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d h1:i6r7bk2jF965W3xmORgz+KYhlH608oRvrAPpcNHorlo= gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM= +gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 h1:l67pCtMNx51TcCkBhGV1qSVnMrJ/eZPflxm02G6nhZQ= +gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM= gomodules.xyz/password-generator v0.2.6/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg= gomodules.xyz/password-generator v0.2.7/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg= gomodules.xyz/pointer v0.0.0-20201105040656-991dd254b680/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo= @@ -1098,8 +1100,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-20220215012708-9963581d69a7/go.mod h1:sOq5P3AkZdv6D/skvUPwEG15NDYy5olwBllH/JXfhGI= -kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2 h1:s6MK8BVV6GHJhS6V4+5IJeV6W1GHcC4fqILencMdRkw= -kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2/go.mod h1:7pExIHGzUdu8ZGveYvAaXEhS4GdczoOy8z+hq6x6K9A= +kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5 h1:UkXLQ5SMS98RwnJffKAU0ANXVq9AHSLabQ9NKUhkCgA= +kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5/go.mod h1:7pExIHGzUdu8ZGveYvAaXEhS4GdczoOy8z+hq6x6K9A= kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA= kmodules.xyz/crd-schema-fuzz v0.0.0-20211025154117-6edb24ef11bc h1:ot/XqJCnfQXF3jawygywjPNNDbjo3d/QiG6Aoz2yjaA= diff --git a/vendor/kmodules.xyz/client-go/api/v1/timeofday.go b/vendor/kmodules.xyz/client-go/api/v1/timeofday.go index b071abee7..88ea1a8ba 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/timeofday.go +++ b/vendor/kmodules.xyz/client-go/api/v1/timeofday.go @@ -43,8 +43,16 @@ func (t *TimeOfDay) DeepCopyInto(out *TimeOfDay) { // NewTime returns a wrapped instance of the provided time func NewTime(t time.Time) TimeOfDay { - utc := t.UTC() - return TimeOfDay{time.Date(0, 0, 0, utc.Hour(), utc.Minute(), utc.Second(), 0, time.UTC)} + return TimeOfDay{time.Date(0, 0, 0, t.Hour(), t.Minute(), t.Second(), 0, time.UTC)} +} + +// NewTimeInLocation returns a wrapped instance of the provided time according to location +func NewTimeInLocation(t time.Time, loc *time.Location) TimeOfDay { + if loc == nil { + loc = time.UTC + } + t = t.In(loc) + return TimeOfDay{time.Date(0, 0, 0, t.Hour(), t.Minute(), t.Second(), 0, loc)} } // Date returns the TimeOfDay corresponding to the supplied parameters diff --git a/vendor/kmodules.xyz/client-go/meta/incluster.go b/vendor/kmodules.xyz/client-go/meta/incluster.go index 3bdfc4ffc..f5df04dd5 100644 --- a/vendor/kmodules.xyz/client-go/meta/incluster.go +++ b/vendor/kmodules.xyz/client-go/meta/incluster.go @@ -36,7 +36,7 @@ func Namespace() string { return ns } - if ns := os.Getenv("MY_POD_NAMESPACE"); ns != "" { + if ns := os.Getenv("POD_NAMESPACE"); ns != "" { return ns } diff --git a/vendor/modules.txt b/vendor/modules.txt index bd166d68a..30618276a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -35,6 +35,8 @@ github.com/coreos/pkg/capnslog # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew +# github.com/dustin/go-humanize v1.0.1-0.20220316001817-d5090ed65664 +## explicit; go 1.16 # github.com/emicklei/go-restful v2.9.5+incompatible ## explicit github.com/emicklei/go-restful @@ -278,7 +280,7 @@ gomodules.xyz/go-sh # gomodules.xyz/jsonpatch/v2 v2.2.0 ## explicit; go 1.12 gomodules.xyz/jsonpatch/v2 -# gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d +# gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 ## explicit; go 1.13 gomodules.xyz/mergo # gomodules.xyz/pointer v0.1.0 @@ -887,7 +889,7 @@ k8s.io/utils/net k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace -# kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2 +# kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5 ## explicit; go 1.17 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1