Skip to content

Commit 70ec71b

Browse files
1gtmtamalsaha
1gtm
and
tamalsaha
authored
[cherry-pick] Use restic 0.10.0 (#290) (#316)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent f0353c4 commit 70ec71b

File tree

17 files changed

+221
-197
lines changed

17 files changed

+221
-197
lines changed

‎Dockerfile.dbg

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,10 @@ RUN set -x \
2121
&& apt-get update \
2222
&& apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl bzip2
2323

24-
RUN set -x \
25-
&& curl -fsSL -o restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \
26-
&& bzip2 -d restic.bz2 \
27-
&& chmod 755 restic \
28-
&& curl -fsSL -o restic_{NEW_RESTIC_VER}.bz2 https://github.com/restic/restic/releases/download/v{NEW_RESTIC_VER}/restic_{NEW_RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \
29-
&& bzip2 -d restic_{NEW_RESTIC_VER}.bz2 \
30-
&& chmod 755 restic_{NEW_RESTIC_VER}
24+
RUN set -x \
25+
&& curl -fsSL -o restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \
26+
&& bzip2 -d restic.bz2 \
27+
&& chmod 755 restic
3128

3229

3330

@@ -49,7 +46,7 @@ ENV TZ :/etc/localtime
4946
ENV LANG en_US.utf8
5047
ENV LC_ALL en_US.UTF-8
5148

52-
COPY --from=0 restic_{NEW_RESTIC_VER} /bin/restic_{NEW_RESTIC_VER}
49+
COPY --from=0 restic /bin/restic
5350
COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
5451

5552
ENTRYPOINT ["/{ARG_BIN}"]

‎Dockerfile.in

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,10 @@ RUN set -x \
2121
&& apt-get update \
2222
&& apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl bzip2
2323

24-
RUN set -x \
25-
&& curl -fsSL -o restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \
26-
&& bzip2 -d restic.bz2 \
27-
&& chmod 755 restic \
28-
&& curl -fsSL -o restic_{NEW_RESTIC_VER}.bz2 https://github.com/restic/restic/releases/download/v{NEW_RESTIC_VER}/restic_{NEW_RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \
29-
&& bzip2 -d restic_{NEW_RESTIC_VER}.bz2 \
30-
&& chmod 755 restic_{NEW_RESTIC_VER}
24+
RUN set -x \
25+
&& curl -fsSL -o restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \
26+
&& bzip2 -d restic.bz2 \
27+
&& chmod 755 restic
3128

3229

3330

@@ -42,7 +39,7 @@ RUN set -x \
4239
ENV TZ :/etc/localtime
4340
ENV LANG en_US.utf8
4441

45-
COPY --from=0 /restic_{NEW_RESTIC_VER} /bin/restic_{NEW_RESTIC_VER}
42+
COPY --from=0 /restic /bin/restic
4643
COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
4744

4845
USER nobody:nobody

‎Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ else
4848
endif
4949
endif
5050

51-
RESTIC_VER := 0.8.3
52-
# also update in restic wrapper library
53-
NEW_RESTIC_VER := 0.9.6
51+
RESTIC_VER := 0.10.0
5452

5553
###
5654
### These variables should not need tweaking.
@@ -397,7 +395,6 @@ bin/.container-$(DOTFILE_IMAGE)-%: bin/$(OS)_$(ARCH)/$(BIN) $(DOCKERFILE_%)
397395
-e 's|{ARG_OS}|$(OS)|g' \
398396
-e 's|{ARG_FROM}|$(BASEIMAGE_$*)|g' \
399397
-e 's|{RESTIC_VER}|$(RESTIC_VER)|g' \
400-
-e 's|{NEW_RESTIC_VER}|$(NEW_RESTIC_VER)|g' \
401398
$(DOCKERFILE_$*) > bin/.dockerfile-$*-$(OS)_$(ARCH)
402399
@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform $(OS)/$(ARCH) --load --pull -t $(IMAGE):$(TAG_$*) -f bin/.dockerfile-$*-$(OS)_$(ARCH) .
403400
@docker images -q $(IMAGE):$(TAG_$*) > $@

‎go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@ require (
1717
k8s.io/apimachinery v0.18.9
1818
k8s.io/client-go v12.0.0+incompatible
1919
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
20-
k8s.io/kubernetes v1.18.9 // indirect
21-
kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5
20+
kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845
2221
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
2322
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4
24-
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 // indirect
2523
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab
26-
kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e // indirect
2724
sigs.k8s.io/yaml v1.2.0
28-
stash.appscode.dev/apimachinery v0.11.0
25+
stash.appscode.dev/apimachinery v0.11.3-0.20201012035827-8f31689080d6
2926
)
3027

3128
// release-1.18

‎go.sum

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI
162162
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
163163
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
164164
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
165-
github.com/gabriel-vasile/mimetype v1.1.0/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To=
166165
github.com/gabriel-vasile/mimetype v1.1.1/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To=
167166
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
168167
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -216,8 +215,6 @@ github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsd
216215
github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
217216
github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc=
218217
github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
219-
github.com/go-openapi/spec v0.19.7 h1:0xWSeMd35y5avQAThZR2PkEuqSosoS5t6gDH4L8n11M=
220-
github.com/go-openapi/spec v0.19.7/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
221218
github.com/go-openapi/spec v0.19.8 h1:qAdZLh1r6QF/hI/gTq+TJTvsQUodZsM7KLqkAJdiJNg=
222219
github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
223220
github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
@@ -947,35 +944,20 @@ k8s.io/sample-apiserver v0.18.9/go.mod h1:BqskggZvQv6thkecZe2iAoPeNTN7WRu6e5bfDz
947944
k8s.io/system-validators v1.0.4/go.mod h1:HgSgTg4NAGNoYYjKsUyk52gdNi2PVDswQ9Iyn66R7NI=
948945
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
949946
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
950-
kmodules.xyz/client-go v0.0.0-20200521005126-35ce6bd4ed46/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
951947
kmodules.xyz/client-go v0.0.0-20200521065424-173e32c78a20/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
952-
kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371 h1:PPawDOMyDHGeDPN8j1epNozaIB/Z7MlJsXpwm/r4jgk=
953-
kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
954948
kmodules.xyz/client-go v0.0.0-20200818143024-600fef263e03/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
955-
kmodules.xyz/client-go v0.0.0-20200915091229-7df16c29f4e8 h1:C6+M9aTLhPCmsJ8dmhPvkr7Qe2MN+iiY3kZvbonhS9E=
956-
kmodules.xyz/client-go v0.0.0-20200915091229-7df16c29f4e8/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
957949
kmodules.xyz/client-go v0.0.0-20200922200830-63d86b6e5b63/go.mod h1:JZN34jqk6ZlR+QOnBPpnUVBab4rmfamqxfSvLaulBMY=
958-
kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5 h1:mGySTT2dC8u2FQDUFbDLcOt7GM+IkXqlH2xzATyddKg=
959-
kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM=
950+
kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845 h1:7ytqOvrfdq5Ul5SicCyy0s1YnnBSGu33hSZaBEcTbXs=
951+
kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM=
960952
kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
961-
kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95 h1:v0S/+ftzL6Xrs9XevgchAOJyPKlRQXPiZf87xotj3X4=
962-
kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95/go.mod h1:jpu8xFsDKd6kAWUAKk8oTu/GQGBWqhrcaDeOJdaCJnk=
963953
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZT9hIk1+BbgQtIytNOoCU4g4vqUmh3M=
964954
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=
965-
kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9 h1:W+k1qhU0W1rptia2PWPOb7IWUvWnf31EMnatXt7MW6w=
966-
kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9/go.mod h1:bu1V7HdnuHc1hgvbqAdcwTViQ0TfZwF3Nu/SjB4vai4=
967955
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 h1:eftT0CrrAYK1uniwsVhheYao4mwGk+eFT9eftRX9BMo=
968956
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4/go.mod h1:+YU32jSWaGGE4etTr/iCF88tLAeDNq1lhptVymjUbjg=
969-
kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d h1:ud3XDScnBdD5q6nLQI/tHLSbuuSwIFaav6IhcQAz2qA=
970-
kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d/go.mod h1:k6sbzLWYBLRGDNmCj/NwLgj1cniRXCl9ux/P6+7Xd+A=
971957
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 h1:BsCSSPoY0uRGylfPTUzzQ28h2axuXremPGPzwpmxvYI=
972958
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41/go.mod h1:XAWxC/b1ICoufU6XDV0AOHNQY+y+4/B3Z5uyLnW1B6s=
973-
kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226 h1:RZ7H0gl1z/9jLI74YOlGEtNeAknxTEKeAeYH0jakUcM=
974-
kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226/go.mod h1:IbK+hCI23UfTDMzG7hos9sERCase2xsFK+XC0Ns3OCg=
975959
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab h1:d/4AFAN0TfKgwhjbQYzwXXHT/5/vTP7SAAvS4uJX+wQ=
976960
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab/go.mod h1:Wy3/mWK2lWQOviKVpBtiCEYtLaYIaSiym8leZNKBUd4=
977-
kmodules.xyz/prober v0.0.0-20200521101241-adf06150535c h1:aV6O9NbDpnFVra/D8c7b7TjI05w/CyI5CYJ8IBg6lg8=
978-
kmodules.xyz/prober v0.0.0-20200521101241-adf06150535c/go.mod h1:XYWZkfQquD09Mn+O7piHS+SEPq9oFV1Wy2WZ9DA+oeA=
979961
kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e h1:NASVP0dOE5Zdlq+3Op7Fh2Yc8ei32uf9PxEbuwGLQm0=
980962
kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e/go.mod h1:AZ58K5hrxkkNPf8tM+UWeZjtNG3/mn192nKcUyC93F8=
981963
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
@@ -998,6 +980,6 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
998980
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
999981
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
1000982
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
1001-
stash.appscode.dev/apimachinery v0.11.0 h1:ntvpZDGRsM0f99TBMYrvdtPiF7+d/0th13/EW9d978c=
1002-
stash.appscode.dev/apimachinery v0.11.0/go.mod h1:Cw+8L2u+1T7ZqfYvB2ktdXD/bsWslXNG/bIhk/sV+qs=
983+
stash.appscode.dev/apimachinery v0.11.3-0.20201012035827-8f31689080d6 h1:HzGwwdUhJhqJRYnAAeoparQ9nj42w6pAMoA6dpZoUlY=
984+
stash.appscode.dev/apimachinery v0.11.3-0.20201012035827-8f31689080d6/go.mod h1:ieNywb/MTJs/n1T2wMBEr1m13Ek+ygTnhPCsaqqcyBI=
1003985
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=

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

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package v1
1818

1919
import (
20+
core "k8s.io/api/core/v1"
2021
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2122
)
2223

@@ -34,18 +35,6 @@ const (
3435
ConditionRequestDenied = "Denied"
3536
)
3637

37-
type ConditionStatus string
38-
39-
// These are valid condition statuses. "ConditionTrue" means a resource is in the condition.
40-
// "ConditionFalse" means a resource is not in the condition. "ConditionUnknown" means kubernetes
41-
// can't decide if a resource is in the condition or not. In the future, we could add other
42-
// intermediate conditions, e.g. ConditionDegraded.
43-
const (
44-
ConditionTrue ConditionStatus = "True"
45-
ConditionFalse ConditionStatus = "False"
46-
ConditionUnknown ConditionStatus = "Unknown"
47-
)
48-
4938
type Condition struct {
5039
// Type of condition in CamelCase or in foo.example.com/CamelCase.
5140
// Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
@@ -54,7 +43,7 @@ type Condition struct {
5443
Type string `json:"type" protobuf:"bytes,1,opt,name=type"`
5544
// Status of the condition, one of True, False, Unknown.
5645
// +required
57-
Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status"`
46+
Status core.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status"`
5847
// If set, this represents the .metadata.generation that the condition was set based upon.
5948
// For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date
6049
// with respect to the current state of the instance.
@@ -76,9 +65,9 @@ type Condition struct {
7665
}
7766

7867
func NewCondition(reason string, message string, generation int64, conditionStatus ...bool) Condition {
79-
cs := ConditionTrue
68+
cs := core.ConditionTrue
8069
if len(conditionStatus) > 0 && !conditionStatus[0] {
81-
cs = ConditionFalse
70+
cs = core.ConditionFalse
8271
}
8372

8473
return Condition{
@@ -150,7 +139,7 @@ func RemoveCondition(conditions []Condition, condType string) []Condition {
150139
// It returns "false" if the desired condition is not in "true" state or is not in the condition list.
151140
func IsConditionTrue(conditions []Condition, condType string) bool {
152141
for i := range conditions {
153-
if conditions[i].Type == condType && conditions[i].Status == ConditionTrue {
142+
if conditions[i].Type == condType && conditions[i].Status == core.ConditionTrue {
154143
return true
155144
}
156145
}
@@ -161,7 +150,7 @@ func IsConditionTrue(conditions []Condition, condType string) bool {
161150
// It returns "false" if the desired condition is not in "false" state or is not in the condition list.
162151
func IsConditionFalse(conditions []Condition, condType string) bool {
163152
for i := range conditions {
164-
if conditions[i].Type == condType && conditions[i].Status == ConditionFalse {
153+
if conditions[i].Type == condType && conditions[i].Status == core.ConditionFalse {
165154
return true
166155
}
167156
}

0 commit comments

Comments
 (0)