Skip to content

Commit 2e328b9

Browse files
1gtm1gtm
authored
Use restic 0.13.1 (#1438)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent a0c445d commit 2e328b9

File tree

6 files changed

+26
-15
lines changed

6 files changed

+26
-15
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ else
4646
endif
4747
endif
4848

49-
RESTIC_VER := 0.13.0
49+
RESTIC_VER := 0.13.1
5050

5151
###
5252
### These variables should not need tweaking.

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
k8s.io/klog/v2 v2.9.0
3434
k8s.io/kube-aggregator v0.21.1
3535
k8s.io/kubernetes v1.21.1
36-
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2
36+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5
3737
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278
3838
kmodules.xyz/custom-resources v0.0.0-20220317220154-7beb809b1f5e
3939
kmodules.xyz/objectstore-api v0.0.0-20220317220441-f1d593d0a778
@@ -148,7 +148,7 @@ require (
148148
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
149149
gomodules.xyz/go-sh v0.1.0 // indirect
150150
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
151-
gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d // indirect
151+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 // indirect
152152
gomodules.xyz/password-generator v0.2.7 // indirect
153153
gomodules.xyz/sets v0.2.1 // indirect
154154
gomodules.xyz/sync v0.1.0 // indirect
@@ -167,7 +167,7 @@ require (
167167
k8s.io/component-base v0.21.1 // indirect
168168
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
169169
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
170-
kmodules.xyz/resource-metadata v0.10.12 // indirect
170+
kmodules.xyz/resource-metadata v0.10.15 // indirect
171171
kmodules.xyz/resource-metrics v0.0.8 // indirect
172172
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15 // indirect
173173
sigs.k8s.io/cli-utils v0.26.1 // indirect

‎go.sum

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,9 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
206206
github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
207207
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
208208
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
209-
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
210209
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
210+
github.com/dustin/go-humanize v1.0.1-0.20220316001817-d5090ed65664 h1:sVcJ9NcFWMaLxylVWc5iOhkLUkh84wHfOFGzaahu9fc=
211+
github.com/dustin/go-humanize v1.0.1-0.20220316001817-d5090ed65664/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
211212
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
212213
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
213214
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
@@ -1115,8 +1116,9 @@ gomodules.xyz/jsonpath v0.0.1/go.mod h1:du28vmLHrgEV48JqK/7rn92YHsVDoQuqrowb2w6Y
11151116
gomodules.xyz/jsonpath v0.0.2/go.mod h1:du28vmLHrgEV48JqK/7rn92YHsVDoQuqrowb2w6YZmE=
11161117
gomodules.xyz/logs v0.0.6 h1:8+9Wkud5yBPtIvkVszubyTeFxNII30lWODom0+GZD8U=
11171118
gomodules.xyz/logs v0.0.6/go.mod h1:Q+fFtZFLEB5q86KmDehXCGuMP72Rv+Rwz0KuVxK+Gi4=
1118-
gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d h1:i6r7bk2jF965W3xmORgz+KYhlH608oRvrAPpcNHorlo=
11191119
gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM=
1120+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 h1:l67pCtMNx51TcCkBhGV1qSVnMrJ/eZPflxm02G6nhZQ=
1121+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM=
11201122
gomodules.xyz/password-generator v0.2.6/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
11211123
gomodules.xyz/password-generator v0.2.7 h1:xUCiIKji8JYOkyTsvi/2nArbVevsHMOnoJVMaShbzqI=
11221124
gomodules.xyz/password-generator v0.2.7/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
@@ -1271,8 +1273,9 @@ kmodules.xyz/client-go v0.0.0-20211107190155-5bb4090d2728/go.mod h1:ENUu8pPK19xz
12711273
kmodules.xyz/client-go v0.0.0-20220104114408-2a3a05dbe89f/go.mod h1:xxl1ve1Obe4xaW+XjXsNHyLTni4QPIvHn9TfnYEoQRo=
12721274
kmodules.xyz/client-go v0.0.0-20220203031013-1de48437aaf3/go.mod h1:aOwnhdxO0uh54ds1wQYRlKVtYlzLyakaesmMQeupVek=
12731275
kmodules.xyz/client-go v0.0.0-20220215012708-9963581d69a7/go.mod h1:sOq5P3AkZdv6D/skvUPwEG15NDYy5olwBllH/JXfhGI=
1274-
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2 h1:s6MK8BVV6GHJhS6V4+5IJeV6W1GHcC4fqILencMdRkw=
12751276
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2/go.mod h1:7pExIHGzUdu8ZGveYvAaXEhS4GdczoOy8z+hq6x6K9A=
1277+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5 h1:UkXLQ5SMS98RwnJffKAU0ANXVq9AHSLabQ9NKUhkCgA=
1278+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5/go.mod h1:7pExIHGzUdu8ZGveYvAaXEhS4GdczoOy8z+hq6x6K9A=
12761279
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278 h1:sFmqh4EaiZ4K2FkkGvrDFddstq8GSf6ogH24IAsuKew=
12771280
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
12781281
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
@@ -1290,8 +1293,8 @@ kmodules.xyz/openshift v0.0.0-20210618001443-f2507caa512f/go.mod h1:8E5ckbd1KMNm
12901293
kmodules.xyz/prober v0.0.0-20220317043828-5ae0114adcad h1:bMfimFOEgmaKCN/gnSxLIRvQbWg4dqBgcWrMnHWQgyc=
12911294
kmodules.xyz/prober v0.0.0-20220317043828-5ae0114adcad/go.mod h1:QC3O1p+sU/8NnpLKI0VCAO3IQwPlwuimf9l6+Qp3Vt8=
12921295
kmodules.xyz/resource-metadata v0.9.4/go.mod h1:GsaythrHLBLKhEy8/l+ioJC0mFmJmZR0FRXpkyxztt8=
1293-
kmodules.xyz/resource-metadata v0.10.12 h1:3/5bVeaM1T/szPRRgzjObUT/zwQUi5Z5ZfYtyg2N/Mk=
1294-
kmodules.xyz/resource-metadata v0.10.12/go.mod h1:+BIGFETn0Ppo6Dlntl+43Dv43sWFAQrzPdXbMzUZ3JA=
1296+
kmodules.xyz/resource-metadata v0.10.15 h1:Go4nh6s4a+z+VQU7yildqRCN849EnZyQA1pvFG/Bj3o=
1297+
kmodules.xyz/resource-metadata v0.10.15/go.mod h1:yBc0KXQlFY7+6Yh9714E+w0TMh7ytSQ7yo8tblUIWBg=
12951298
kmodules.xyz/resource-metrics v0.0.6/go.mod h1:M7rWuo2qh3BpHhogiEVPnvGY9Xx4Pfygqn1Rex8YbgM=
12961299
kmodules.xyz/resource-metrics v0.0.8 h1:4WHV7vKGfoxpZquu/Jowq4pgoMEithyMjFfJIg68Nq8=
12971300
kmodules.xyz/resource-metrics v0.0.8/go.mod h1:M7rWuo2qh3BpHhogiEVPnvGY9Xx4Pfygqn1Rex8YbgM=

‎vendor/kmodules.xyz/client-go/api/v1/timeofday.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,16 @@ func (t *TimeOfDay) DeepCopyInto(out *TimeOfDay) {
4343

4444
// NewTime returns a wrapped instance of the provided time
4545
func NewTime(t time.Time) TimeOfDay {
46-
utc := t.UTC()
47-
return TimeOfDay{time.Date(0, 0, 0, utc.Hour(), utc.Minute(), utc.Second(), 0, time.UTC)}
46+
return TimeOfDay{time.Date(0, 0, 0, t.Hour(), t.Minute(), t.Second(), 0, time.UTC)}
47+
}
48+
49+
// NewTimeInLocation returns a wrapped instance of the provided time according to location
50+
func NewTimeInLocation(t time.Time, loc *time.Location) TimeOfDay {
51+
if loc == nil {
52+
loc = time.UTC
53+
}
54+
t = t.In(loc)
55+
return TimeOfDay{time.Date(0, 0, 0, t.Hour(), t.Minute(), t.Second(), 0, loc)}
4856
}
4957

5058
// Date returns the TimeOfDay corresponding to the supplied parameters

‎vendor/kmodules.xyz/client-go/meta/incluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func Namespace() string {
3636
return ns
3737
}
3838

39-
if ns := os.Getenv("MY_POD_NAMESPACE"); ns != "" {
39+
if ns := os.Getenv("POD_NAMESPACE"); ns != "" {
4040
return ns
4141
}
4242

‎vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ gomodules.xyz/jsonpatch/v2
618618
# gomodules.xyz/logs v0.0.6
619619
## explicit; go 1.16
620620
gomodules.xyz/logs
621-
# gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d
621+
# gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402
622622
## explicit; go 1.13
623623
gomodules.xyz/mergo
624624
# gomodules.xyz/password-generator v0.2.7
@@ -1370,7 +1370,7 @@ k8s.io/utils/net
13701370
k8s.io/utils/path
13711371
k8s.io/utils/pointer
13721372
k8s.io/utils/trace
1373-
# kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2
1373+
# kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5
13741374
## explicit; go 1.17
13751375
kmodules.xyz/client-go
13761376
kmodules.xyz/client-go/admissionregistration
@@ -1447,7 +1447,7 @@ kmodules.xyz/prober/probe
14471447
kmodules.xyz/prober/probe/exec
14481448
kmodules.xyz/prober/probe/http
14491449
kmodules.xyz/prober/probe/tcp
1450-
# kmodules.xyz/resource-metadata v0.10.12
1450+
# kmodules.xyz/resource-metadata v0.10.15
14511451
## explicit; go 1.17
14521452
kmodules.xyz/resource-metadata/apis/core/v1alpha1
14531453
# kmodules.xyz/resource-metrics v0.0.8

0 commit comments

Comments
 (0)