Skip to content

Commit bed66f4

Browse files
1gtm1gtm
authored
[cherry-pick] Use restic 0.13.1 (#1151) (#1154)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 2c01868 commit bed66f4

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
@@ -43,7 +43,7 @@ else
4343
endif
4444
endif
4545

46-
RESTIC_VER := 0.13.0
46+
RESTIC_VER := 0.13.1
4747

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

‎go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ require (
88
gomodules.xyz/flags v0.1.3
99
gomodules.xyz/go-sh v0.1.0
1010
gomodules.xyz/logs v0.0.6
11+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 // indirect
1112
gomodules.xyz/x v0.0.13
1213
k8s.io/api v0.21.1
1314
k8s.io/apimachinery v0.21.1
1415
k8s.io/client-go v0.21.1
1516
k8s.io/klog/v2 v2.9.0
16-
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2
17+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5
1718
kmodules.xyz/custom-resources v0.0.0-20220317220154-7beb809b1f5e
1819
kmodules.xyz/offshoot-api v0.0.0-20220329041708-c076b2bcb0f8
1920
stash.appscode.dev/apimachinery v0.19.0

‎go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,8 +961,9 @@ gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY
961961
gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
962962
gomodules.xyz/logs v0.0.6 h1:8+9Wkud5yBPtIvkVszubyTeFxNII30lWODom0+GZD8U=
963963
gomodules.xyz/logs v0.0.6/go.mod h1:Q+fFtZFLEB5q86KmDehXCGuMP72Rv+Rwz0KuVxK+Gi4=
964-
gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d h1:i6r7bk2jF965W3xmORgz+KYhlH608oRvrAPpcNHorlo=
965964
gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM=
965+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402 h1:l67pCtMNx51TcCkBhGV1qSVnMrJ/eZPflxm02G6nhZQ=
966+
gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM=
966967
gomodules.xyz/password-generator v0.2.6/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
967968
gomodules.xyz/password-generator v0.2.7/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
968969
gomodules.xyz/pointer v0.0.0-20201105040656-991dd254b680/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo=
@@ -1096,8 +1097,9 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
10961097
kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b/go.mod h1:A6GAK6xP5zBuWK6A/vUkkjKzcuywkms7fIxRf5wblO4=
10971098
kmodules.xyz/client-go v0.0.0-20211107190155-5bb4090d2728/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I=
10981099
kmodules.xyz/client-go v0.0.0-20220215012708-9963581d69a7/go.mod h1:sOq5P3AkZdv6D/skvUPwEG15NDYy5olwBllH/JXfhGI=
1099-
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2 h1:s6MK8BVV6GHJhS6V4+5IJeV6W1GHcC4fqILencMdRkw=
11001100
kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2/go.mod h1:7pExIHGzUdu8ZGveYvAaXEhS4GdczoOy8z+hq6x6K9A=
1101+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5 h1:UkXLQ5SMS98RwnJffKAU0ANXVq9AHSLabQ9NKUhkCgA=
1102+
kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5/go.mod h1:7pExIHGzUdu8ZGveYvAaXEhS4GdczoOy8z+hq6x6K9A=
11011103
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
11021104
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
11031105
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
@@ -156,7 +156,8 @@ gomodules.xyz/jsonpatch/v2
156156
# gomodules.xyz/logs v0.0.6
157157
## explicit
158158
gomodules.xyz/logs
159-
# gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d
159+
# gomodules.xyz/mergo v0.3.13-0.20220214162359-48efe39fd402
160+
## explicit
160161
gomodules.xyz/mergo
161162
# gomodules.xyz/pointer v0.1.0
162163
gomodules.xyz/pointer
@@ -509,7 +510,7 @@ k8s.io/utils/buffer
509510
k8s.io/utils/integer
510511
k8s.io/utils/pointer
511512
k8s.io/utils/trace
512-
# kmodules.xyz/client-go v0.0.0-20220317213815-2a6d5a5784f2
513+
# kmodules.xyz/client-go v0.0.0-20220404224906-af7b092cfac5
513514
## explicit
514515
kmodules.xyz/client-go
515516
kmodules.xyz/client-go/api/v1

0 commit comments

Comments
 (0)