Skip to content

Commit 27aa698

Browse files
1gtm1gtm
authored
[cherry-pick] Use restic 0.13.1 (#1499) (#1500)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 755b8c3 commit 27aa698

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ else
4242
endif
4343
endif
4444

45-
RESTIC_VER := 0.13.0
45+
RESTIC_VER := 0.13.1
4646

4747
###
4848
### These variables should not need tweaking.

‎go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ require (
99
gomodules.xyz/flags v0.1.3
1010
gomodules.xyz/go-sh v0.1.0
1111
gomodules.xyz/logs v0.0.6
12+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 // indirect
1213
gomodules.xyz/pointer v0.1.0
1314
gomodules.xyz/x v0.0.13
1415
k8s.io/api v0.21.1
1516
k8s.io/apimachinery v0.21.1
1617
k8s.io/client-go v0.21.1
1718
k8s.io/klog/v2 v2.9.0
18-
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2
19+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5
1920
kmodules.xyz/custom-resources v0.0.0-20220317220154-7beb809b1f5e
2021
kmodules.xyz/offshoot-api v0.0.0-20220329041708-c076b2bcb0f8
2122
kubedb.dev/apimachinery v0.23.0

‎go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,8 +1046,9 @@ gomodules.xyz/jsonpath v0.0.1/go.mod h1:du28vmLHrgEV48JqK/7rn92YHsVDoQuqrowb2w6Y
10461046
gomodules.xyz/logs v0.0.4/go.mod h1:GRwztZB2qW4vSV/9KZR2DKFhAwyn1w/S7s4bfnV1jqo=
10471047
gomodules.xyz/logs v0.0.6 h1:8+9Wkud5yBPtIvkVszubyTeFxNII30lWODom0+GZD8U=
10481048
gomodules.xyz/logs v0.0.6/go.mod h1:Q+fFtZFLEB5q86KmDehXCGuMP72Rv+Rwz0KuVxK+Gi4=
1049-
gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d h1:i6r7bk2jF965W3xmORgz+KYhlH608oRvrAPpcNHorlo=
10501049
gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM=
1050+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 h1:l67pCtMNx51TcCkBhGV1qSVnMrJ/eZPflxm02G6nhZQ=
1051+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM=
10511052
gomodules.xyz/password-generator v0.2.6/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
10521053
gomodules.xyz/password-generator v0.2.7/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
10531054
gomodules.xyz/pointer v0.0.0-20201105040656-991dd254b680/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo=
@@ -1206,8 +1207,9 @@ kmodules.xyz/client-go v0.0.0-20211013093146-1fbfd52e78c9/go.mod h1:0gkPeALtYjB2
12061207
kmodules.xyz/client-go v0.0.0-20211107190155-5bb4090d2728/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I=
12071208
kmodules.xyz/client-go v0.0.0-20211110065417-091bd089a92d/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I=
12081209
kmodules.xyz/client-go v0.0.0-20220215012708-9963581d69a7/go.mod h1:sOq5P3AkZdv6D/skvUPwEG15NDYy5olwBllH/JXfhGI=
1209-
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2 h1:s6MK8BVV6GHJhS6V4+5IJeV6W1GHcC4fqILencMdRkw=
12101210
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2/go.mod h1:7pExIHGzUdu8ZGveYvAaXEhS4GdczoOy8z+hq6x6K9A=
1211+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5 h1:UkXLQ5SMS98RwnJffKAU0ANXVq9AHSLabQ9NKUhkCgA=
1212+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5/go.mod h1:7pExIHGzUdu8ZGveYvAaXEhS4GdczoOy8z+hq6x6K9A=
12111213
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
12121214
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
12131215
kmodules.xyz/crd-schema-fuzz v0.0.0-20211025154117-6edb24ef11bc/go.mod h1:yLOBJKasPhnCodKSZGFZ6OGFFrp0tq3ALS9rDnYFjkg=

‎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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ gomodules.xyz/jsonpatch/v2
157157
# gomodules.xyz/logs v0.0.6
158158
## explicit
159159
gomodules.xyz/logs
160-
# gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d
160+
# gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402
161+
## explicit
161162
gomodules.xyz/mergo
162163
# gomodules.xyz/pointer v0.1.0
163164
## explicit
@@ -511,7 +512,7 @@ k8s.io/utils/buffer
511512
k8s.io/utils/integer
512513
k8s.io/utils/pointer
513514
k8s.io/utils/trace
514-
# kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2
515+
# kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5
515516
## explicit
516517
kmodules.xyz/client-go
517518
kmodules.xyz/client-go/api/v1

0 commit comments

Comments
 (0)