diff --git a/Dockerfile.dbg b/Dockerfile.dbg index 2ff8db7f5..c5d3e0a69 100644 --- a/Dockerfile.dbg +++ b/Dockerfile.dbg @@ -21,13 +21,10 @@ RUN set -x \ && apt-get update \ && apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl bzip2 -RUN set -x \ - && curl -fsSL -o restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \ - && bzip2 -d restic.bz2 \ - && chmod 755 restic \ - && 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 \ - && bzip2 -d restic_{NEW_RESTIC_VER}.bz2 \ - && chmod 755 restic_{NEW_RESTIC_VER} +RUN set -x \ + && curl -fsSL -o restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \ + && bzip2 -d restic.bz2 \ + && chmod 755 restic @@ -43,7 +40,7 @@ RUN set -x \ && apt-get install -y --no-install-recommends ca-certificates \ && rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man /tmp/* -COPY --from=0 restic_{NEW_RESTIC_VER} /bin/restic_{NEW_RESTIC_VER} +COPY --from=0 restic /bin/restic COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN} ENTRYPOINT ["/{ARG_BIN}"] diff --git a/Dockerfile.in b/Dockerfile.in index 07ec7bab7..7cf204997 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -21,13 +21,10 @@ RUN set -x \ && apt-get update \ && apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl bzip2 -RUN set -x \ - && curl -fsSL -o restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \ - && bzip2 -d restic.bz2 \ - && chmod 755 restic \ - && 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 \ - && bzip2 -d restic_{NEW_RESTIC_VER}.bz2 \ - && chmod 755 restic_{NEW_RESTIC_VER} +RUN set -x \ + && curl -fsSL -o restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \ + && bzip2 -d restic.bz2 \ + && chmod 755 restic @@ -43,7 +40,7 @@ RUN set -x \ && apt-get install -y --no-install-recommends ca-certificates \ && rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man /tmp/* -COPY --from=0 /restic_{NEW_RESTIC_VER} /bin/restic_{NEW_RESTIC_VER} +COPY --from=0 /restic /bin/restic COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN} USER nobody:nobody diff --git a/Makefile b/Makefile index 25a420811..778373a53 100644 --- a/Makefile +++ b/Makefile @@ -48,9 +48,7 @@ else endif endif -RESTIC_VER := 0.8.3 -# also update in restic wrapper library -NEW_RESTIC_VER := 0.9.6 +RESTIC_VER := 0.10.0 ### ### These variables should not need tweaking. @@ -397,7 +395,6 @@ bin/.container-$(DOTFILE_IMAGE)-%: bin/$(OS)_$(ARCH)/$(BIN) $(DOCKERFILE_%) -e 's|{ARG_OS}|$(OS)|g' \ -e 's|{ARG_FROM}|$(BASEIMAGE_$*)|g' \ -e 's|{RESTIC_VER}|$(RESTIC_VER)|g' \ - -e 's|{NEW_RESTIC_VER}|$(NEW_RESTIC_VER)|g' \ $(DOCKERFILE_$*) > bin/.dockerfile-$*-$(OS)_$(ARCH) @DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform $(OS)/$(ARCH) --load --pull -t $(IMAGE):$(TAG_$*) -f bin/.dockerfile-$*-$(OS)_$(ARCH) . @docker images -q $(IMAGE):$(TAG_$*) > $@ diff --git a/go.mod b/go.mod index 7a0deab31..ddd92bad7 100644 --- a/go.mod +++ b/go.mod @@ -18,15 +18,12 @@ require ( k8s.io/apimachinery v0.18.9 k8s.io/client-go v12.0.0+incompatible k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 - k8s.io/kubernetes v1.18.9 // indirect - kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5 + kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845 kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 - kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 // indirect kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab - kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e // indirect sigs.k8s.io/yaml v1.2.0 - stash.appscode.dev/apimachinery v0.11.0 + stash.appscode.dev/apimachinery v0.11.3-0.20201012035827-8f31689080d6 ) replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d diff --git a/go.sum b/go.sum index 11f0a2768..a194f0a6e 100644 --- a/go.sum +++ b/go.sum @@ -164,7 +164,6 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/gabriel-vasile/mimetype v1.1.0/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To= github.com/gabriel-vasile/mimetype v1.1.1/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -218,8 +217,6 @@ github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsd github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/spec v0.19.7 h1:0xWSeMd35y5avQAThZR2PkEuqSosoS5t6gDH4L8n11M= -github.com/go-openapi/spec v0.19.7/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/spec v0.19.8 h1:qAdZLh1r6QF/hI/gTq+TJTvsQUodZsM7KLqkAJdiJNg= github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= @@ -952,35 +949,20 @@ k8s.io/sample-apiserver v0.18.9/go.mod h1:BqskggZvQv6thkecZe2iAoPeNTN7WRu6e5bfDz k8s.io/system-validators v1.0.4/go.mod h1:HgSgTg4NAGNoYYjKsUyk52gdNi2PVDswQ9Iyn66R7NI= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -kmodules.xyz/client-go v0.0.0-20200521005126-35ce6bd4ed46/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= kmodules.xyz/client-go v0.0.0-20200521065424-173e32c78a20/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= -kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371 h1:PPawDOMyDHGeDPN8j1epNozaIB/Z7MlJsXpwm/r4jgk= -kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= kmodules.xyz/client-go v0.0.0-20200818143024-600fef263e03/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= -kmodules.xyz/client-go v0.0.0-20200915091229-7df16c29f4e8 h1:C6+M9aTLhPCmsJ8dmhPvkr7Qe2MN+iiY3kZvbonhS9E= -kmodules.xyz/client-go v0.0.0-20200915091229-7df16c29f4e8/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= kmodules.xyz/client-go v0.0.0-20200922200830-63d86b6e5b63/go.mod h1:JZN34jqk6ZlR+QOnBPpnUVBab4rmfamqxfSvLaulBMY= -kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5 h1:mGySTT2dC8u2FQDUFbDLcOt7GM+IkXqlH2xzATyddKg= -kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM= +kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845 h1:7ytqOvrfdq5Ul5SicCyy0s1YnnBSGu33hSZaBEcTbXs= +kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM= kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= -kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95 h1:v0S/+ftzL6Xrs9XevgchAOJyPKlRQXPiZf87xotj3X4= -kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95/go.mod h1:jpu8xFsDKd6kAWUAKk8oTu/GQGBWqhrcaDeOJdaCJnk= kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZT9hIk1+BbgQtIytNOoCU4g4vqUmh3M= kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE= -kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9 h1:W+k1qhU0W1rptia2PWPOb7IWUvWnf31EMnatXt7MW6w= -kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9/go.mod h1:bu1V7HdnuHc1hgvbqAdcwTViQ0TfZwF3Nu/SjB4vai4= kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 h1:eftT0CrrAYK1uniwsVhheYao4mwGk+eFT9eftRX9BMo= kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4/go.mod h1:+YU32jSWaGGE4etTr/iCF88tLAeDNq1lhptVymjUbjg= -kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d h1:ud3XDScnBdD5q6nLQI/tHLSbuuSwIFaav6IhcQAz2qA= -kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d/go.mod h1:k6sbzLWYBLRGDNmCj/NwLgj1cniRXCl9ux/P6+7Xd+A= kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 h1:BsCSSPoY0uRGylfPTUzzQ28h2axuXremPGPzwpmxvYI= kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41/go.mod h1:XAWxC/b1ICoufU6XDV0AOHNQY+y+4/B3Z5uyLnW1B6s= -kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226 h1:RZ7H0gl1z/9jLI74YOlGEtNeAknxTEKeAeYH0jakUcM= -kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226/go.mod h1:IbK+hCI23UfTDMzG7hos9sERCase2xsFK+XC0Ns3OCg= kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab h1:d/4AFAN0TfKgwhjbQYzwXXHT/5/vTP7SAAvS4uJX+wQ= kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab/go.mod h1:Wy3/mWK2lWQOviKVpBtiCEYtLaYIaSiym8leZNKBUd4= -kmodules.xyz/prober v0.0.0-20200521101241-adf06150535c h1:aV6O9NbDpnFVra/D8c7b7TjI05w/CyI5CYJ8IBg6lg8= -kmodules.xyz/prober v0.0.0-20200521101241-adf06150535c/go.mod h1:XYWZkfQquD09Mn+O7piHS+SEPq9oFV1Wy2WZ9DA+oeA= kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e h1:NASVP0dOE5Zdlq+3Op7Fh2Yc8ei32uf9PxEbuwGLQm0= kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e/go.mod h1:AZ58K5hrxkkNPf8tM+UWeZjtNG3/mn192nKcUyC93F8= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= @@ -1003,6 +985,6 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= -stash.appscode.dev/apimachinery v0.11.0 h1:ntvpZDGRsM0f99TBMYrvdtPiF7+d/0th13/EW9d978c= -stash.appscode.dev/apimachinery v0.11.0/go.mod h1:Cw+8L2u+1T7ZqfYvB2ktdXD/bsWslXNG/bIhk/sV+qs= +stash.appscode.dev/apimachinery v0.11.3-0.20201012035827-8f31689080d6 h1:HzGwwdUhJhqJRYnAAeoparQ9nj42w6pAMoA6dpZoUlY= +stash.appscode.dev/apimachinery v0.11.3-0.20201012035827-8f31689080d6/go.mod h1:ieNywb/MTJs/n1T2wMBEr1m13Ek+ygTnhPCsaqqcyBI= vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/vendor/kmodules.xyz/client-go/api/v1/conditions.go b/vendor/kmodules.xyz/client-go/api/v1/conditions.go index 5c69c8dbd..9ddb127e2 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/conditions.go +++ b/vendor/kmodules.xyz/client-go/api/v1/conditions.go @@ -17,6 +17,7 @@ limitations under the License. package v1 import ( + core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -34,18 +35,6 @@ const ( ConditionRequestDenied = "Denied" ) -type ConditionStatus string - -// These are valid condition statuses. "ConditionTrue" means a resource is in the condition. -// "ConditionFalse" means a resource is not in the condition. "ConditionUnknown" means kubernetes -// can't decide if a resource is in the condition or not. In the future, we could add other -// intermediate conditions, e.g. ConditionDegraded. -const ( - ConditionTrue ConditionStatus = "True" - ConditionFalse ConditionStatus = "False" - ConditionUnknown ConditionStatus = "Unknown" -) - type Condition struct { // Type of condition in CamelCase or in foo.example.com/CamelCase. // Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be @@ -54,7 +43,7 @@ type Condition struct { Type string `json:"type" protobuf:"bytes,1,opt,name=type"` // Status of the condition, one of True, False, Unknown. // +required - Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status"` + Status core.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status"` // If set, this represents the .metadata.generation that the condition was set based upon. // For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date // with respect to the current state of the instance. @@ -76,9 +65,9 @@ type Condition struct { } func NewCondition(reason string, message string, generation int64, conditionStatus ...bool) Condition { - cs := ConditionTrue + cs := core.ConditionTrue if len(conditionStatus) > 0 && !conditionStatus[0] { - cs = ConditionFalse + cs = core.ConditionFalse } return Condition{ @@ -150,7 +139,7 @@ func RemoveCondition(conditions []Condition, condType string) []Condition { // It returns "false" if the desired condition is not in "true" state or is not in the condition list. func IsConditionTrue(conditions []Condition, condType string) bool { for i := range conditions { - if conditions[i].Type == condType && conditions[i].Status == ConditionTrue { + if conditions[i].Type == condType && conditions[i].Status == core.ConditionTrue { return true } } @@ -161,7 +150,7 @@ func IsConditionTrue(conditions []Condition, condType string) bool { // It returns "false" if the desired condition is not in "false" state or is not in the condition list. func IsConditionFalse(conditions []Condition, condType string) bool { for i := range conditions { - if conditions[i].Type == condType && conditions[i].Status == ConditionFalse { + if conditions[i].Type == condType && conditions[i].Status == core.ConditionFalse { return true } } diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go index 8c1ac3c28..c0f393564 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go @@ -28,6 +28,7 @@ import ( strings "strings" proto "github.com/gogo/protobuf/proto" + k8s_io_api_core_v1 "k8s.io/api/core/v1" v11 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -196,68 +197,68 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 962 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6f, 0xe3, 0x44, - 0x18, 0x6d, 0x36, 0x69, 0x9b, 0x4c, 0xda, 0x46, 0x4c, 0x41, 0x58, 0x15, 0xc4, 0x25, 0x48, 0xab, - 0xb2, 0xa8, 0x0e, 0xad, 0x16, 0xb1, 0x8b, 0xc4, 0x61, 0x5d, 0x56, 0xa8, 0x50, 0xda, 0x32, 0xe9, - 0x4a, 0xab, 0xe5, 0x80, 0x26, 0xf6, 0x17, 0x77, 0xa8, 0xe3, 0xb1, 0x66, 0xc6, 0x81, 0xec, 0x89, - 0x9f, 0xc0, 0x8d, 0x9f, 0x44, 0x8f, 0xcb, 0x6d, 0x4f, 0x16, 0x35, 0xff, 0x62, 0x2f, 0xa0, 0x19, - 0x3b, 0xb1, 0xb3, 0x8d, 0x60, 0xc5, 0xcd, 0xf3, 0xde, 0xfb, 0xde, 0x8c, 0xe7, 0x7b, 0xf3, 0xa1, - 0xfd, 0xab, 0x31, 0xf7, 0x93, 0x10, 0xa4, 0xf3, 0xf3, 0xf4, 0x79, 0xdf, 0x0b, 0x19, 0x44, 0x6a, - 0x3f, 0xe0, 0x7d, 0x1a, 0xb3, 0xfe, 0xe4, 0xa0, 0x1f, 0x40, 0x04, 0x82, 0x2a, 0xf0, 0x9d, 0x58, - 0x70, 0xc5, 0xf1, 0xfb, 0x55, 0xb9, 0x93, 0xcb, 0x7f, 0x08, 0xb8, 0x43, 0x63, 0xe6, 0x4c, 0x0e, - 0x76, 0xf6, 0x03, 0xa6, 0x2e, 0x93, 0xa1, 0xe3, 0xf1, 0x71, 0x3f, 0xe0, 0x01, 0xef, 0x9b, 0xaa, - 0x61, 0x32, 0x32, 0x2b, 0xb3, 0x30, 0x5f, 0xb9, 0xdb, 0x4e, 0xef, 0xea, 0x81, 0x74, 0x58, 0xbe, - 0x99, 0xc7, 0x05, 0x2c, 0xd9, 0x71, 0xe7, 0x7e, 0xa9, 0x19, 0x53, 0xef, 0x92, 0x45, 0x20, 0xa6, - 0xfd, 0xf8, 0x2a, 0xd0, 0x80, 0xec, 0x8f, 0x41, 0xd1, 0x25, 0x55, 0xbd, 0xef, 0xd1, 0x3b, 0x47, - 0x20, 0x14, 0x1b, 0x31, 0x8f, 0x2a, 0x38, 0x17, 0x6c, 0x42, 0x15, 0x7c, 0x03, 0x53, 0xec, 0xa2, - 0x26, 0x44, 0x1e, 0xf7, 0x59, 0x14, 0x58, 0xb5, 0xdd, 0xda, 0x5e, 0xcb, 0xbd, 0x7b, 0x9d, 0xda, - 0x2b, 0x59, 0x6a, 0x37, 0x1f, 0x17, 0xf8, 0xab, 0xd4, 0xc6, 0x65, 0xc5, 0x0c, 0x25, 0xf3, 0xba, - 0xde, 0x6f, 0xab, 0xa8, 0x53, 0x71, 0x1f, 0xc4, 0xe0, 0xe1, 0x0f, 0xd1, 0x2a, 0x0d, 0x19, 0x95, - 0x85, 0xe9, 0x66, 0x61, 0xba, 0xfa, 0x48, 0x83, 0x24, 0xe7, 0xf0, 0x21, 0x42, 0x12, 0x3c, 0x01, - 0xea, 0x94, 0x8e, 0xc1, 0xba, 0x63, 0x94, 0xb8, 0x50, 0xa2, 0xc1, 0x9c, 0x21, 0x15, 0x15, 0xfe, - 0x0e, 0xad, 0xcb, 0x64, 0xf8, 0x23, 0x78, 0xca, 0xaa, 0xef, 0xd6, 0xf6, 0xda, 0x87, 0xf7, 0x9c, - 0x7f, 0xed, 0x81, 0xf3, 0xf4, 0xd3, 0x4f, 0x1e, 0x0e, 0xf2, 0x0a, 0xb7, 0x9d, 0xa5, 0xf6, 0x7a, - 0xb1, 0x20, 0x33, 0x1f, 0xfc, 0x14, 0x35, 0xfd, 0x44, 0x50, 0xc5, 0x78, 0x64, 0x35, 0x8c, 0xa7, - 0xe3, 0xe4, 0xb7, 0xec, 0x54, 0x6f, 0xd9, 0x89, 0xaf, 0x02, 0x0d, 0x48, 0x47, 0xdf, 0xb2, 0xb6, - 0xfe, 0xb2, 0xa8, 0x72, 0x37, 0xf4, 0x7d, 0xcd, 0x56, 0x64, 0xee, 0x86, 0x29, 0x6a, 0x0b, 0x88, - 0xe0, 0x27, 0x17, 0x46, 0x5c, 0x80, 0xb5, 0xfa, 0xbf, 0xcc, 0x3b, 0x59, 0x6a, 0xb7, 0x49, 0x69, - 0x43, 0xaa, 0x9e, 0x78, 0x0f, 0x35, 0xfd, 0x48, 0xea, 0xab, 0x91, 0xd6, 0xda, 0x6e, 0x7d, 0xaf, - 0x55, 0x1c, 0xe6, 0x74, 0x60, 0x30, 0x32, 0x67, 0xf1, 0x01, 0x6a, 0xb3, 0xf8, 0x91, 0xef, 0x0b, - 0x90, 0x12, 0xa4, 0xb5, 0x6e, 0xc4, 0xc6, 0xfc, 0xf8, 0x7c, 0x0e, 0x93, 0xaa, 0x06, 0xbf, 0x87, - 0x1a, 0x89, 0x60, 0xd2, 0x6a, 0x1a, 0x6d, 0x33, 0x4b, 0xed, 0xc6, 0x13, 0x72, 0x2c, 0x89, 0x41, - 0xf1, 0xe7, 0x68, 0x0b, 0xc6, 0x94, 0x85, 0xa5, 0x67, 0xcb, 0xe8, 0x70, 0x96, 0xda, 0x5b, 0x8f, - 0x17, 0x18, 0xf2, 0x9a, 0x12, 0xfb, 0x08, 0xc5, 0xf3, 0x4c, 0x59, 0xc8, 0x5c, 0xcc, 0xfd, 0xff, - 0xe8, 0xe4, 0xd2, 0x04, 0xbb, 0x5b, 0x3a, 0x2c, 0xe5, 0x9a, 0x54, 0x7c, 0x7b, 0x7f, 0xdf, 0x41, - 0xad, 0x23, 0x1e, 0xf9, 0xcc, 0x74, 0x63, 0x17, 0x35, 0xd4, 0x34, 0x86, 0x22, 0x92, 0x1b, 0x45, - 0xd0, 0x1a, 0x17, 0xd3, 0x18, 0x88, 0x61, 0xf0, 0x43, 0xb4, 0x26, 0x15, 0x55, 0x89, 0x2c, 0xc2, - 0xf8, 0x41, 0xa1, 0x59, 0x1b, 0x18, 0xf4, 0x55, 0x6a, 0x77, 0xe6, 0x76, 0x39, 0x44, 0x8a, 0x02, - 0xfc, 0x35, 0xc2, 0x7c, 0x28, 0x41, 0x4c, 0xc0, 0xff, 0x2a, 0x7f, 0x7c, 0x3a, 0x4e, 0x3a, 0xa2, - 0x75, 0x77, 0xa7, 0xb0, 0xc1, 0x67, 0xb7, 0x14, 0x64, 0x49, 0x15, 0x9e, 0x20, 0x1c, 0x52, 0xa9, - 0x2e, 0x04, 0x8d, 0xa4, 0xd9, 0xeb, 0x82, 0x8d, 0xa1, 0x88, 0xe6, 0xbd, 0x37, 0x4b, 0x8f, 0xae, - 0x28, 0xf7, 0x3d, 0xb9, 0xe5, 0x46, 0x96, 0xec, 0x80, 0xef, 0xa2, 0x35, 0x01, 0x54, 0xf2, 0xc8, - 0x24, 0xb5, 0xe5, 0x6e, 0xcd, 0x7e, 0x9f, 0x18, 0x94, 0x14, 0x2c, 0xfe, 0x08, 0xad, 0x8f, 0x41, - 0x4a, 0x1a, 0x80, 0xb5, 0x66, 0x84, 0x9d, 0x42, 0xb8, 0xfe, 0x6d, 0x0e, 0x93, 0x19, 0xdf, 0xfb, - 0xa3, 0x86, 0x5a, 0x17, 0x27, 0x83, 0x23, 0x1e, 0x8d, 0x58, 0x80, 0x9f, 0xa1, 0x16, 0x93, 0x32, - 0x01, 0x41, 0x60, 0x64, 0xda, 0xd0, 0x3e, 0xdc, 0xaf, 0xfc, 0x8f, 0xa3, 0x87, 0x9e, 0x39, 0xfd, - 0x34, 0x06, 0xff, 0x84, 0x7b, 0x34, 0x3c, 0xcb, 0xdf, 0x2a, 0x8c, 0x40, 0x40, 0xe4, 0x81, 0xbb, - 0x99, 0xa5, 0x76, 0xeb, 0x78, 0xe6, 0x41, 0x4a, 0x3b, 0x7c, 0x89, 0x36, 0xbc, 0x32, 0x20, 0xba, - 0x83, 0xf5, 0xfc, 0xb1, 0xbd, 0x69, 0xa6, 0xf4, 0xdc, 0x72, 0xdf, 0x2e, 0xfe, 0x64, 0xa3, 0x42, - 0x48, 0xb2, 0xe0, 0xdc, 0xfb, 0xbd, 0x8e, 0xda, 0x95, 0xa9, 0x82, 0x3f, 0x43, 0x9b, 0x5c, 0x04, - 0x34, 0x62, 0xcf, 0x4d, 0xfb, 0xf4, 0xcc, 0xd3, 0xcf, 0xe0, 0xad, 0x2c, 0xb5, 0x37, 0xcf, 0xaa, - 0x04, 0x59, 0xd4, 0xe1, 0x8f, 0x51, 0xcb, 0xe3, 0x49, 0xa4, 0x04, 0x2b, 0xce, 0xdb, 0xca, 0xff, - 0xef, 0x68, 0x06, 0x92, 0x92, 0xc7, 0xc7, 0x68, 0xbb, 0x5a, 0x4d, 0xc3, 0x27, 0x11, 0x53, 0xd2, - 0xaa, 0x9b, 0xb2, 0x77, 0xb3, 0xd4, 0xde, 0x3e, 0xbb, 0x4d, 0x93, 0x65, 0x35, 0xd8, 0x41, 0x28, - 0xd4, 0x97, 0xcb, 0x94, 0xde, 0xb8, 0x61, 0x1c, 0xcc, 0x33, 0x3a, 0x99, 0xa3, 0xa4, 0xa2, 0xd0, - 0xe7, 0x8c, 0x05, 0x9f, 0xb0, 0xc8, 0x03, 0x69, 0xad, 0x96, 0xe7, 0x3c, 0x9f, 0x81, 0xa4, 0xe4, - 0xf1, 0x17, 0xa8, 0x23, 0x95, 0x00, 0x50, 0xe5, 0x58, 0xc8, 0xe7, 0xd2, 0x76, 0x96, 0xda, 0x9d, - 0xc1, 0x22, 0x45, 0x5e, 0xd7, 0xea, 0x29, 0x15, 0x73, 0xa9, 0x68, 0x78, 0xc4, 0xfd, 0xc5, 0x29, - 0x75, 0x5e, 0xc2, 0xa4, 0xaa, 0xc1, 0x0f, 0xd0, 0x86, 0x04, 0xc1, 0x68, 0x78, 0x9a, 0x8c, 0x87, - 0x20, 0xac, 0xa6, 0xc9, 0xe4, 0xbc, 0x93, 0x83, 0x0a, 0x47, 0x16, 0x94, 0xee, 0xde, 0xf5, 0x4d, - 0x77, 0xe5, 0xc5, 0x4d, 0x77, 0xe5, 0xe5, 0x4d, 0x77, 0xe5, 0x97, 0xac, 0x5b, 0xbb, 0xce, 0xba, - 0xb5, 0x17, 0x59, 0xb7, 0xf6, 0x32, 0xeb, 0xd6, 0xfe, 0xcc, 0xba, 0xb5, 0x5f, 0xff, 0xea, 0xae, - 0x3c, 0xbb, 0x33, 0x39, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x50, 0x28, 0xcf, 0x18, 0x08, - 0x00, 0x00, + // 965 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x6f, 0xe3, 0x44, + 0x18, 0x6d, 0x36, 0x69, 0x1b, 0x4f, 0xfa, 0x43, 0x4c, 0x41, 0x58, 0x15, 0xc4, 0x55, 0x90, 0x56, + 0x65, 0x51, 0x1d, 0x5a, 0x15, 0xb1, 0x20, 0x71, 0x58, 0x97, 0x15, 0x2a, 0x94, 0xb6, 0x4c, 0xba, + 0xd2, 0x6a, 0x39, 0xa0, 0xa9, 0xfd, 0xc5, 0x1d, 0xea, 0x78, 0xac, 0x99, 0x71, 0x20, 0x7b, 0xe2, + 0x4f, 0x40, 0x5c, 0xf8, 0x93, 0xe8, 0x71, 0xb9, 0xed, 0xc9, 0xa2, 0xe6, 0xbf, 0xd8, 0x13, 0x9a, + 0xb1, 0x13, 0x3b, 0xdb, 0x08, 0x56, 0xdc, 0x3c, 0xef, 0xbd, 0xef, 0xcd, 0xf8, 0x9b, 0x37, 0x1f, + 0xda, 0xbb, 0x1e, 0xf1, 0x20, 0x8d, 0x40, 0xba, 0x3f, 0x4f, 0x9e, 0xf7, 0xfd, 0x88, 0x41, 0xac, + 0xf6, 0x42, 0xde, 0xa7, 0x09, 0xeb, 0x8f, 0xf7, 0xfb, 0x21, 0xc4, 0x20, 0xa8, 0x82, 0xc0, 0x4d, + 0x04, 0x57, 0x1c, 0xbf, 0x5f, 0x97, 0xbb, 0x85, 0xfc, 0x87, 0x90, 0xbb, 0x34, 0x61, 0xee, 0x78, + 0x7f, 0x7b, 0x2f, 0x64, 0xea, 0x2a, 0xbd, 0x74, 0x7d, 0x3e, 0xea, 0x87, 0x3c, 0xe4, 0x7d, 0x53, + 0x75, 0x99, 0x0e, 0xcd, 0xca, 0x2c, 0xcc, 0x57, 0xe1, 0xb6, 0xdd, 0xbb, 0x7e, 0x28, 0x5d, 0x56, + 0x6c, 0xe6, 0x73, 0x01, 0x0b, 0x76, 0xdc, 0x3e, 0xac, 0x34, 0x23, 0xea, 0x5f, 0xb1, 0x18, 0xc4, + 0xa4, 0x9f, 0x5c, 0x87, 0x1a, 0x90, 0xfd, 0x11, 0x28, 0xba, 0xa0, 0xaa, 0xf7, 0x3d, 0x7a, 0xe7, + 0x08, 0x84, 0x62, 0x43, 0xe6, 0x53, 0x05, 0xe7, 0x82, 0x8d, 0xa9, 0x82, 0x6f, 0x60, 0x82, 0x3d, + 0xd4, 0x86, 0xd8, 0xe7, 0x01, 0x8b, 0x43, 0xbb, 0xb1, 0xd3, 0xd8, 0xb5, 0xbc, 0xfb, 0x37, 0x99, + 0xb3, 0x94, 0x67, 0x4e, 0xfb, 0x71, 0x89, 0xbf, 0xca, 0x1c, 0x5c, 0x55, 0x4c, 0x51, 0x32, 0xab, + 0xeb, 0xfd, 0xbe, 0x8c, 0x36, 0x6b, 0xee, 0x83, 0x04, 0x7c, 0xfc, 0x01, 0x5a, 0xa6, 0x11, 0xa3, + 0xb2, 0x34, 0x5d, 0x2f, 0x4d, 0x97, 0x1f, 0x69, 0x90, 0x14, 0x1c, 0x3e, 0x40, 0x48, 0x82, 0x2f, + 0x40, 0x9d, 0xd2, 0x11, 0xd8, 0xf7, 0x8c, 0x12, 0x97, 0x4a, 0x34, 0x98, 0x31, 0xa4, 0xa6, 0xc2, + 0xdf, 0xa1, 0x55, 0x99, 0x5e, 0xfe, 0x08, 0xbe, 0xb2, 0x9b, 0x3b, 0x8d, 0xdd, 0xce, 0xc1, 0x03, + 0xf7, 0x5f, 0xef, 0xc0, 0x7d, 0xfa, 0xc9, 0xc7, 0x9f, 0x0d, 0x8a, 0x0a, 0xaf, 0x93, 0x67, 0xce, + 0x6a, 0xb9, 0x20, 0x53, 0x1f, 0xfc, 0x14, 0xb5, 0x83, 0x54, 0x50, 0xc5, 0x78, 0x6c, 0xb7, 0x8c, + 0xa7, 0xeb, 0x16, 0x5d, 0x76, 0xeb, 0x5d, 0x76, 0x93, 0xeb, 0x50, 0x03, 0xd2, 0xd5, 0x5d, 0xd6, + 0xd6, 0x5f, 0x96, 0x55, 0xde, 0x9a, 0xee, 0xd7, 0x74, 0x45, 0x66, 0x6e, 0x98, 0xa2, 0x8e, 0x80, + 0x18, 0x7e, 0xf2, 0x60, 0xc8, 0x05, 0xd8, 0xcb, 0xff, 0xcb, 0x7c, 0x33, 0xcf, 0x9c, 0x0e, 0xa9, + 0x6c, 0x48, 0xdd, 0x13, 0xef, 0xa2, 0x76, 0x10, 0x4b, 0xdd, 0x1a, 0x69, 0xaf, 0xec, 0x34, 0x77, + 0xad, 0xf2, 0x30, 0xa7, 0x03, 0x83, 0x91, 0x19, 0x8b, 0xf7, 0x51, 0x87, 0x25, 0x8f, 0x82, 0x40, + 0x80, 0x94, 0x20, 0xed, 0x55, 0x23, 0x36, 0xe6, 0xc7, 0xe7, 0x33, 0x98, 0xd4, 0x35, 0xf8, 0x3d, + 0xd4, 0x4a, 0x05, 0x93, 0x76, 0xdb, 0x68, 0xdb, 0x79, 0xe6, 0xb4, 0x9e, 0x90, 0x63, 0x49, 0x0c, + 0x8a, 0x3f, 0x47, 0x1b, 0x30, 0xa2, 0x2c, 0xaa, 0x3c, 0x2d, 0xa3, 0xc3, 0x79, 0xe6, 0x6c, 0x3c, + 0x9e, 0x63, 0xc8, 0x6b, 0x4a, 0x1c, 0x20, 0x94, 0xcc, 0x32, 0x65, 0x23, 0xd3, 0x98, 0xc3, 0xff, + 0xb8, 0xc9, 0x85, 0x09, 0xf6, 0x36, 0x74, 0x58, 0xaa, 0x35, 0xa9, 0xf9, 0xf6, 0x7e, 0x6b, 0x22, + 0xeb, 0x88, 0xc7, 0x01, 0x33, 0xb7, 0xb1, 0x83, 0x5a, 0x6a, 0x92, 0x40, 0x19, 0xc9, 0xb5, 0x32, + 0x68, 0xad, 0x8b, 0x49, 0x02, 0xc4, 0x30, 0xf8, 0x04, 0xad, 0x48, 0x45, 0x55, 0x2a, 0xcb, 0x30, + 0x1e, 0x96, 0x9a, 0x95, 0x81, 0x41, 0x5f, 0x65, 0xce, 0x82, 0x27, 0xea, 0xce, 0x76, 0x28, 0x54, + 0xa4, 0xf4, 0xc0, 0x5f, 0x23, 0xcc, 0x2f, 0x25, 0x88, 0x31, 0x04, 0x5f, 0x15, 0xef, 0x51, 0x27, + 0x4c, 0xa7, 0xb6, 0xe9, 0x6d, 0x97, 0xce, 0xf8, 0xec, 0x8e, 0x82, 0x2c, 0xa8, 0xc2, 0x63, 0x84, + 0x23, 0x2a, 0xd5, 0x85, 0xa0, 0xb1, 0x34, 0x7b, 0x5d, 0xb0, 0x11, 0x94, 0x69, 0x7d, 0xf0, 0x66, + 0x81, 0xd2, 0x15, 0xd5, 0xbe, 0x27, 0x77, 0xdc, 0xc8, 0x82, 0x1d, 0xf0, 0x7d, 0xb4, 0x22, 0x80, + 0x4a, 0x1e, 0x9b, 0xf0, 0x5a, 0xde, 0xc6, 0xb4, 0x23, 0xc4, 0xa0, 0xa4, 0x64, 0xf1, 0x87, 0x68, + 0x75, 0x04, 0x52, 0xd2, 0x10, 0xec, 0x15, 0x23, 0xdc, 0x2c, 0x85, 0xab, 0xdf, 0x16, 0x30, 0x99, + 0xf2, 0xbd, 0x3f, 0x1b, 0xc8, 0xba, 0x38, 0x19, 0x1c, 0xf1, 0x78, 0xc8, 0x42, 0xfc, 0x0c, 0x59, + 0x4c, 0xca, 0x14, 0x04, 0x81, 0xa1, 0xb9, 0x99, 0xce, 0xc1, 0x5e, 0xed, 0x7f, 0x5c, 0xdd, 0x64, + 0x73, 0xfa, 0x49, 0x02, 0xc1, 0x09, 0xf7, 0x69, 0x74, 0x56, 0x3c, 0x5f, 0x18, 0x82, 0x80, 0xd8, + 0x07, 0x6f, 0x3d, 0xcf, 0x1c, 0xeb, 0x78, 0xea, 0x41, 0x2a, 0x3b, 0x7c, 0x85, 0xd6, 0xfc, 0x2a, + 0x33, 0xfa, 0x52, 0x9b, 0xc5, 0xfb, 0x7b, 0xd3, 0x98, 0xe9, 0x51, 0xe6, 0xbd, 0x5d, 0xfe, 0xc9, + 0x5a, 0x8d, 0x90, 0x64, 0xce, 0xb9, 0xf7, 0x47, 0x13, 0x75, 0x6a, 0x83, 0x06, 0x7f, 0x8a, 0xd6, + 0xb9, 0x08, 0x69, 0xcc, 0x9e, 0x9b, 0xeb, 0xd3, 0x63, 0x50, 0xbf, 0x8c, 0xb7, 0xf2, 0xcc, 0x59, + 0x3f, 0xab, 0x13, 0x64, 0x5e, 0x87, 0x3f, 0x42, 0x96, 0xcf, 0xd3, 0x58, 0x09, 0x56, 0x9e, 0xd7, + 0x2a, 0xfe, 0xef, 0x68, 0x0a, 0x92, 0x8a, 0xc7, 0xc7, 0x68, 0xab, 0x5e, 0x4d, 0xa3, 0x27, 0x31, + 0x53, 0xd2, 0x6e, 0x9a, 0xb2, 0x77, 0xf3, 0xcc, 0xd9, 0x3a, 0xbb, 0x4b, 0x93, 0x45, 0x35, 0xd8, + 0x45, 0x28, 0xd2, 0xcd, 0x65, 0x4a, 0x6f, 0xdc, 0x32, 0x0e, 0xe6, 0x65, 0x9d, 0xcc, 0x50, 0x52, + 0x53, 0xe8, 0x73, 0x26, 0x82, 0x8f, 0x59, 0xec, 0x83, 0xb4, 0x97, 0xab, 0x73, 0x9e, 0x4f, 0x41, + 0x52, 0xf1, 0xf8, 0x0b, 0xb4, 0x29, 0x95, 0x00, 0x50, 0xd5, 0xa4, 0x28, 0x46, 0xd5, 0x56, 0x9e, + 0x39, 0x9b, 0x83, 0x79, 0x8a, 0xbc, 0xae, 0xd5, 0x83, 0x2b, 0xe1, 0x52, 0xd1, 0xe8, 0x88, 0x07, + 0xf3, 0x83, 0xeb, 0xbc, 0x82, 0x49, 0x5d, 0x83, 0x1f, 0xa2, 0x35, 0x09, 0x82, 0xd1, 0xe8, 0x34, + 0x1d, 0x5d, 0x82, 0xb0, 0xdb, 0x26, 0x93, 0xb3, 0x9b, 0x1c, 0xd4, 0x38, 0x32, 0xa7, 0xf4, 0x76, + 0x6f, 0x6e, 0xbb, 0x4b, 0x2f, 0x6e, 0xbb, 0x4b, 0x2f, 0x6f, 0xbb, 0x4b, 0xbf, 0xe4, 0xdd, 0xc6, + 0x4d, 0xde, 0x6d, 0xbc, 0xc8, 0xbb, 0x8d, 0x97, 0x79, 0xb7, 0xf1, 0x57, 0xde, 0x6d, 0xfc, 0xfa, + 0x77, 0x77, 0xe9, 0xd9, 0xbd, 0xf1, 0xfe, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x6c, 0x65, + 0x09, 0x2b, 0x08, 0x00, 0x00, } func (m *CertificatePrivateKey) Marshal() (dAtA []byte, err error) { @@ -1424,7 +1425,7 @@ func (m *Condition) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Status = ConditionStatus(dAtA[iNdEx:postIndex]) + m.Status = k8s_io_api_core_v1.ConditionStatus(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 0 { diff --git a/vendor/modules.txt b/vendor/modules.txt index 340a1775a..1fa937f47 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -843,7 +843,7 @@ k8s.io/utils/net k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace -# kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5 +# kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 kmodules.xyz/client-go/apiextensions @@ -884,7 +884,7 @@ sigs.k8s.io/structured-merge-diff/v3/typed sigs.k8s.io/structured-merge-diff/v3/value # sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml -# stash.appscode.dev/apimachinery v0.11.0 +# stash.appscode.dev/apimachinery v0.11.3-0.20201012035827-8f31689080d6 stash.appscode.dev/apimachinery/apis stash.appscode.dev/apimachinery/apis/repositories stash.appscode.dev/apimachinery/apis/repositories/v1alpha1 diff --git a/vendor/stash.appscode.dev/apimachinery/apis/repositories/v1alpha1/openapi_generated.go b/vendor/stash.appscode.dev/apimachinery/apis/repositories/v1alpha1/openapi_generated.go index 91f644ce8..27ddcf2f4 100644 --- a/vendor/stash.appscode.dev/apimachinery/apis/repositories/v1alpha1/openapi_generated.go +++ b/vendor/stash.appscode.dev/apimachinery/apis/repositories/v1alpha1/openapi_generated.go @@ -332,6 +332,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), + "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), "kmodules.xyz/client-go/api/v1.TLSConfig": schema_kmodulesxyz_client_go_api_v1_TLSConfig(ref), @@ -15575,6 +15576,26 @@ func schema_k8sio_apimachinery_pkg_version_Info(ref common.ReferenceCallback) co } } +func schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "CertificatePrivateKey contains configuration options for private keys used by the Certificate controller. This allows control of how private keys are rotated.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "encoding": { + SchemaProps: spec.SchemaProps{ + Description: "The private key cryptography standards (PKCS) encoding for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\" standing for PKCS#1 and PKCS#8, respectively. Defaults to PKCS#1 if not specified. See here for the difference between the formats: https://stackoverflow.com/a/48960291", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + } +} + func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -15595,13 +15616,6 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal Format: "", }, }, - "keyEncoding": { - SchemaProps: spec.SchemaProps{ - Description: "KeyEncoding is the private key cryptography standards (PKCS) for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\". If KeyEncoding is not specified, then PKCS#1 will be used by default.", - Type: []string{"string"}, - Format: "", - }, - }, "subject": { SchemaProps: spec.SchemaProps{ Description: "Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).", @@ -15676,12 +15690,18 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, + "privateKey": { + SchemaProps: spec.SchemaProps{ + Description: "Options to control private keys used for the Certificate.", + Ref: ref("kmodules.xyz/client-go/api/v1.CertificatePrivateKey"), + }, + }, }, Required: []string{"alias"}, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration", "kmodules.xyz/client-go/api/v1.X509Subject"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration", "kmodules.xyz/client-go/api/v1.CertificatePrivateKey", "kmodules.xyz/client-go/api/v1.X509Subject"}, } } diff --git a/vendor/stash.appscode.dev/apimachinery/apis/stash/v1alpha1/openapi_generated.go b/vendor/stash.appscode.dev/apimachinery/apis/stash/v1alpha1/openapi_generated.go index 1e956d598..edfd91c34 100644 --- a/vendor/stash.appscode.dev/apimachinery/apis/stash/v1alpha1/openapi_generated.go +++ b/vendor/stash.appscode.dev/apimachinery/apis/stash/v1alpha1/openapi_generated.go @@ -332,6 +332,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), + "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), "kmodules.xyz/client-go/api/v1.TLSConfig": schema_kmodulesxyz_client_go_api_v1_TLSConfig(ref), @@ -15587,6 +15588,26 @@ func schema_k8sio_apimachinery_pkg_version_Info(ref common.ReferenceCallback) co } } +func schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "CertificatePrivateKey contains configuration options for private keys used by the Certificate controller. This allows control of how private keys are rotated.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "encoding": { + SchemaProps: spec.SchemaProps{ + Description: "The private key cryptography standards (PKCS) encoding for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\" standing for PKCS#1 and PKCS#8, respectively. Defaults to PKCS#1 if not specified. See here for the difference between the formats: https://stackoverflow.com/a/48960291", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + } +} + func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -15607,13 +15628,6 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal Format: "", }, }, - "keyEncoding": { - SchemaProps: spec.SchemaProps{ - Description: "KeyEncoding is the private key cryptography standards (PKCS) for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\". If KeyEncoding is not specified, then PKCS#1 will be used by default.", - Type: []string{"string"}, - Format: "", - }, - }, "subject": { SchemaProps: spec.SchemaProps{ Description: "Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).", @@ -15688,12 +15702,18 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, + "privateKey": { + SchemaProps: spec.SchemaProps{ + Description: "Options to control private keys used for the Certificate.", + Ref: ref("kmodules.xyz/client-go/api/v1.CertificatePrivateKey"), + }, + }, }, Required: []string{"alias"}, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration", "kmodules.xyz/client-go/api/v1.X509Subject"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration", "kmodules.xyz/client-go/api/v1.CertificatePrivateKey", "kmodules.xyz/client-go/api/v1.X509Subject"}, } } diff --git a/vendor/stash.appscode.dev/apimachinery/apis/stash/v1beta1/openapi_generated.go b/vendor/stash.appscode.dev/apimachinery/apis/stash/v1beta1/openapi_generated.go index 21e03b455..c2db32b30 100644 --- a/vendor/stash.appscode.dev/apimachinery/apis/stash/v1beta1/openapi_generated.go +++ b/vendor/stash.appscode.dev/apimachinery/apis/stash/v1beta1/openapi_generated.go @@ -332,6 +332,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), + "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), "kmodules.xyz/client-go/api/v1.TLSConfig": schema_kmodulesxyz_client_go_api_v1_TLSConfig(ref), @@ -15621,6 +15622,26 @@ func schema_k8sio_apimachinery_pkg_version_Info(ref common.ReferenceCallback) co } } +func schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "CertificatePrivateKey contains configuration options for private keys used by the Certificate controller. This allows control of how private keys are rotated.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "encoding": { + SchemaProps: spec.SchemaProps{ + Description: "The private key cryptography standards (PKCS) encoding for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\" standing for PKCS#1 and PKCS#8, respectively. Defaults to PKCS#1 if not specified. See here for the difference between the formats: https://stackoverflow.com/a/48960291", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + } +} + func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -15641,13 +15662,6 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal Format: "", }, }, - "keyEncoding": { - SchemaProps: spec.SchemaProps{ - Description: "KeyEncoding is the private key cryptography standards (PKCS) for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\". If KeyEncoding is not specified, then PKCS#1 will be used by default.", - Type: []string{"string"}, - Format: "", - }, - }, "subject": { SchemaProps: spec.SchemaProps{ Description: "Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).", @@ -15722,12 +15736,18 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, + "privateKey": { + SchemaProps: spec.SchemaProps{ + Description: "Options to control private keys used for the Certificate.", + Ref: ref("kmodules.xyz/client-go/api/v1.CertificatePrivateKey"), + }, + }, }, Required: []string{"alias"}, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration", "kmodules.xyz/client-go/api/v1.X509Subject"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration", "kmodules.xyz/client-go/api/v1.CertificatePrivateKey", "kmodules.xyz/client-go/api/v1.X509Subject"}, } } diff --git a/vendor/stash.appscode.dev/apimachinery/pkg/conditions/backup.go b/vendor/stash.appscode.dev/apimachinery/pkg/conditions/backup.go index d52935682..2680b4f40 100644 --- a/vendor/stash.appscode.dev/apimachinery/pkg/conditions/backup.go +++ b/vendor/stash.appscode.dev/apimachinery/pkg/conditions/backup.go @@ -23,13 +23,14 @@ import ( "stash.appscode.dev/apimachinery/apis" api_v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + core "k8s.io/api/core/v1" kmapi "kmodules.xyz/client-go/api/v1" ) func SetBackupTargetFoundConditionToUnknown(invoker apis.Invoker, tref api_v1beta1.TargetRef, err error) error { return invoker.SetCondition(&tref, kmapi.Condition{ Type: apis.BackupTargetFound, - Status: kmapi.ConditionUnknown, + Status: core.ConditionUnknown, Reason: apis.UnableToCheckTargetAvailability, Message: fmt.Sprintf("Failed to check whether backup target %s %s/%s exist or not. Reason: %v", tref.APIVersion, @@ -44,7 +45,7 @@ func SetBackupTargetFoundConditionToFalse(invoker apis.Invoker, tref api_v1beta1 return invoker.SetCondition(&tref, kmapi.Condition{ // Set the "BackupTargetFound" condition to "False" Type: apis.BackupTargetFound, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.TargetNotAvailable, Message: fmt.Sprintf("Backup target %s %s/%s does not exist.", tref.APIVersion, @@ -57,7 +58,7 @@ func SetBackupTargetFoundConditionToFalse(invoker apis.Invoker, tref api_v1beta1 func SetBackupTargetFoundConditionToTrue(invoker apis.Invoker, tref api_v1beta1.TargetRef) error { return invoker.SetCondition(&tref, kmapi.Condition{ Type: apis.BackupTargetFound, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.TargetAvailable, Message: fmt.Sprintf("Backup target %s %s/%s found.", tref.APIVersion, @@ -70,7 +71,7 @@ func SetBackupTargetFoundConditionToTrue(invoker apis.Invoker, tref api_v1beta1. func SetCronJobCreatedConditionToFalse(invoker apis.Invoker, err error) error { return invoker.SetCondition(nil, kmapi.Condition{ Type: apis.CronJobCreated, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.CronJobCreationFailed, Message: fmt.Sprintf("Failed to create backup triggering CronJob. Reason: %v", err.Error()), }) @@ -79,7 +80,7 @@ func SetCronJobCreatedConditionToFalse(invoker apis.Invoker, err error) error { func SetCronJobCreatedConditionToTrue(invoker apis.Invoker) error { return invoker.SetCondition(nil, kmapi.Condition{ Type: apis.CronJobCreated, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.CronJobCreationSucceeded, Message: "Successfully created backup triggering CronJob.", }) @@ -88,7 +89,7 @@ func SetCronJobCreatedConditionToTrue(invoker apis.Invoker) error { func SetSidecarInjectedConditionToTrue(invoker apis.Invoker, tref api_v1beta1.TargetRef) error { return invoker.SetCondition(&tref, kmapi.Condition{ Type: apis.StashSidecarInjected, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.SidecarInjectionSucceeded, Message: fmt.Sprintf("Successfully injected stash sidecar into %s %s/%s", tref.APIVersion, @@ -101,7 +102,7 @@ func SetSidecarInjectedConditionToTrue(invoker apis.Invoker, tref api_v1beta1.Ta func SetSidecarInjectedConditionToFalse(invoker apis.Invoker, tref api_v1beta1.TargetRef, err error) error { return invoker.SetCondition(&tref, kmapi.Condition{ Type: apis.StashSidecarInjected, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.SidecarInjectionFailed, Message: fmt.Sprintf("Failed to inject stash sidecar into %s %s/%s. Reason: %v", tref.APIVersion, diff --git a/vendor/stash.appscode.dev/apimachinery/pkg/conditions/hooks.go b/vendor/stash.appscode.dev/apimachinery/pkg/conditions/hooks.go index 3da1e0084..d8064fe15 100644 --- a/vendor/stash.appscode.dev/apimachinery/pkg/conditions/hooks.go +++ b/vendor/stash.appscode.dev/apimachinery/pkg/conditions/hooks.go @@ -25,6 +25,7 @@ import ( cs "stash.appscode.dev/apimachinery/client/clientset/versioned" stash_util "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util" + core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kmapi "kmodules.xyz/client-go/api/v1" ) @@ -37,7 +38,7 @@ func SetGlobalPreBackupHookSucceededConditionToFalse(stashClient cs.Interface, b func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.GlobalPreBackupHookSucceeded, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.GlobalPreBackupHookExecutionFailed, Message: fmt.Sprintf("Failed to execute global PreBackup Hook. Reason: %v.", hookErr), }, @@ -56,7 +57,7 @@ func SetGlobalPreBackupHookSucceededConditionToTrue(stashClient cs.Interface, ba func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.GlobalPreBackupHookSucceeded, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.GlobalPreBackupHookExecutedSuccessfully, Message: "Global PreBackup hook has been executed successfully", }, @@ -75,7 +76,7 @@ func SetGlobalPostBackupHookSucceededConditionToFalse(stashClient cs.Interface, func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.GlobalPostBackupHookSucceeded, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.GlobalPostBackupHookExecutionFailed, Message: fmt.Sprintf("Failed to execute global PostBackup Hook. Reason: %v.", hookErr), }, @@ -94,7 +95,7 @@ func SetGlobalPostBackupHookSucceededConditionToTrue(stashClient cs.Interface, b func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.GlobalPostBackupHookSucceeded, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.GlobalPostBackupHookExecutedSuccessfully, Message: "Global PostBackup hook has been executed successfully", }, @@ -108,7 +109,7 @@ func SetGlobalPostBackupHookSucceededConditionToTrue(stashClient cs.Interface, b func SetGlobalPreRestoreHookSucceededConditionToFalse(invoker apis.RestoreInvoker, hookErr error) error { return invoker.SetCondition(nil, kmapi.Condition{ Type: apis.GlobalPreRestoreHookSucceeded, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.GlobalPreRestoreHookExecutionFailed, Message: fmt.Sprintf("Failed to execute global PreRestore Hook. Reason: %v.", hookErr), }) @@ -117,7 +118,7 @@ func SetGlobalPreRestoreHookSucceededConditionToFalse(invoker apis.RestoreInvoke func SetGlobalPreRestoreHookSucceededConditionToTrue(invoker apis.RestoreInvoker) error { return invoker.SetCondition(nil, kmapi.Condition{ Type: apis.GlobalPreRestoreHookSucceeded, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.GlobalPreRestoreHookExecutedSuccessfully, Message: "Global PreRestore hook has been executed successfully", }) @@ -126,7 +127,7 @@ func SetGlobalPreRestoreHookSucceededConditionToTrue(invoker apis.RestoreInvoker func SetGlobalPostRestoreHookSucceededConditionToFalse(invoker apis.RestoreInvoker, hookErr error) error { return invoker.SetCondition(nil, kmapi.Condition{ Type: apis.GlobalPostRestoreHookSucceeded, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.GlobalPostRestoreHookExecutionFailed, Message: fmt.Sprintf("Failed to execute global PostRestore Hook. Reason: %v.", hookErr), }) @@ -135,7 +136,7 @@ func SetGlobalPostRestoreHookSucceededConditionToFalse(invoker apis.RestoreInvok func SetGlobalPostRestoreHookSucceededConditionToTrue(invoker apis.RestoreInvoker) error { return invoker.SetCondition(nil, kmapi.Condition{ Type: apis.GlobalPostRestoreHookSucceeded, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.GlobalPostRestoreHookExecutedSuccessfully, Message: "Global PostRestore hook has been executed successfully", }) diff --git a/vendor/stash.appscode.dev/apimachinery/pkg/conditions/repository.go b/vendor/stash.appscode.dev/apimachinery/pkg/conditions/repository.go index ded2da13b..3d65e03e3 100644 --- a/vendor/stash.appscode.dev/apimachinery/pkg/conditions/repository.go +++ b/vendor/stash.appscode.dev/apimachinery/pkg/conditions/repository.go @@ -26,6 +26,7 @@ import ( cs "stash.appscode.dev/apimachinery/client/clientset/versioned" stash_util "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util" + core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kmapi "kmodules.xyz/client-go/api/v1" ) @@ -38,7 +39,7 @@ func SetBackendRepositoryInitializedConditionToFalse(stashClient cs.Interface, b func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.BackendRepositoryInitialized, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.FailedToInitializeBackendRepository, Message: fmt.Sprintf("Failed to initialize backend repository. Reason: %v", err.Error()), }, @@ -57,7 +58,7 @@ func SetBackendRepositoryInitializedConditionToTrue(stashClient cs.Interface, ba func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.BackendRepositoryInitialized, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.BackendRepositoryFound, Message: "Repository exist in the backend.", }, @@ -73,7 +74,7 @@ func SetRepositoryFoundConditionToUnknown(invoker interface{}, err error) error case apis.Invoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.RepositoryFound, - Status: kmapi.ConditionUnknown, + Status: core.ConditionUnknown, Reason: apis.UnableToCheckRepositoryAvailability, Message: fmt.Sprintf("Failed to check whether the Repository %s/%s exist or not. Reason: %v", in.ObjectMeta.Namespace, @@ -84,7 +85,7 @@ func SetRepositoryFoundConditionToUnknown(invoker interface{}, err error) error case apis.RestoreInvoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.RepositoryFound, - Status: kmapi.ConditionUnknown, + Status: core.ConditionUnknown, Reason: apis.UnableToCheckRepositoryAvailability, Message: fmt.Sprintf("Failed to check whether the Repository %s/%s exist or not. Reason: %v", in.ObjectMeta.Namespace, @@ -102,7 +103,7 @@ func SetRepositoryFoundConditionToFalse(invoker interface{}) error { case apis.Invoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.RepositoryFound, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.RepositoryNotAvailable, Message: fmt.Sprintf("Repository %s/%s does not exist.", in.ObjectMeta.Namespace, @@ -112,7 +113,7 @@ func SetRepositoryFoundConditionToFalse(invoker interface{}) error { case apis.RestoreInvoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.RepositoryFound, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.RepositoryNotAvailable, Message: fmt.Sprintf("Repository %s/%s does not exist.", in.ObjectMeta.Namespace, @@ -129,7 +130,7 @@ func SetRepositoryFoundConditionToTrue(invoker interface{}) error { case apis.Invoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.RepositoryFound, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.RepositoryAvailable, Message: fmt.Sprintf("Repository %s/%s exist.", in.ObjectMeta.Namespace, @@ -139,7 +140,7 @@ func SetRepositoryFoundConditionToTrue(invoker interface{}) error { case apis.RestoreInvoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.RepositoryFound, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.RepositoryAvailable, Message: fmt.Sprintf("Repository %s/%s exist.", in.ObjectMeta.Namespace, @@ -156,7 +157,7 @@ func SetBackendSecretFoundConditionToUnknown(invoker interface{}, secretName str case apis.Invoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.BackendSecretFound, - Status: kmapi.ConditionUnknown, + Status: core.ConditionUnknown, Reason: apis.UnableToCheckBackendSecretAvailability, Message: fmt.Sprintf("Failed to check whether the backend Secret %s/%s exist or not. Reason: %v", in.ObjectMeta.Namespace, @@ -167,7 +168,7 @@ func SetBackendSecretFoundConditionToUnknown(invoker interface{}, secretName str case apis.RestoreInvoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.BackendSecretFound, - Status: kmapi.ConditionUnknown, + Status: core.ConditionUnknown, Reason: apis.UnableToCheckBackendSecretAvailability, Message: fmt.Sprintf("Failed to check whether the backend Secret %s/%s exist or not. Reason: %v", in.ObjectMeta.Namespace, @@ -185,7 +186,7 @@ func SetBackendSecretFoundConditionToFalse(invoker interface{}, secretName strin case apis.Invoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.BackendSecretFound, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.BackendSecretNotAvailable, Message: fmt.Sprintf("Backend Secret %s/%s does not exist.", in.ObjectMeta.Namespace, @@ -195,7 +196,7 @@ func SetBackendSecretFoundConditionToFalse(invoker interface{}, secretName strin case apis.RestoreInvoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.BackendSecretFound, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.BackendSecretNotAvailable, Message: fmt.Sprintf("Backend Secret %s/%s does not exist.", in.ObjectMeta.Namespace, @@ -212,7 +213,7 @@ func SetBackendSecretFoundConditionToTrue(invoker interface{}, secretName string case apis.Invoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.BackendSecretFound, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.BackendSecretAvailable, Message: fmt.Sprintf("Backend Secret %s/%s exist.", in.ObjectMeta.Namespace, @@ -222,7 +223,7 @@ func SetBackendSecretFoundConditionToTrue(invoker interface{}, secretName string case apis.RestoreInvoker: return in.SetCondition(nil, kmapi.Condition{ Type: apis.BackendSecretFound, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.BackendSecretAvailable, Message: fmt.Sprintf("Backend Secret %s/%s exist.", in.ObjectMeta.Namespace, @@ -242,7 +243,7 @@ func SetRetentionPolicyAppliedConditionToFalse(stashClient cs.Interface, backupS func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.RetentionPolicyApplied, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.FailedToApplyRetentionPolicy, Message: fmt.Sprintf("Failed to apply retention policy. Reason: %v", err.Error()), }, @@ -261,7 +262,7 @@ func SetRetentionPolicyAppliedConditionToTrue(stashClient cs.Interface, backupSe func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.RetentionPolicyApplied, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.SuccessfullyAppliedRetentionPolicy, Message: "Successfully applied retention policy.", }, @@ -280,7 +281,7 @@ func SetRepositoryIntegrityVerifiedConditionToFalse(stashClient cs.Interface, ba func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.RepositoryIntegrityVerified, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.FailedToVerifyRepositoryIntegrity, Message: fmt.Sprintf("Repository integrity verification failed. Reason: %v", err.Error()), }, @@ -299,7 +300,7 @@ func SetRepositoryIntegrityVerifiedConditionToTrue(stashClient cs.Interface, bac func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.RepositoryIntegrityVerified, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.SuccessfullyVerifiedRepositoryIntegrity, Message: "Repository integrity verification succeeded.", }, @@ -318,7 +319,7 @@ func SetRepositoryMetricsPushedConditionToFalse(stashClient cs.Interface, backup func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.RepositoryMetricsPushed, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.FailedToPushRepositoryMetrics, Message: fmt.Sprintf("Failed to push repository metrics. Reason: %v", err.Error()), }, @@ -337,7 +338,7 @@ func SetRepositoryMetricsPushedConditionToTrue(stashClient cs.Interface, backupS func(in *api_v1beta1.BackupSessionStatus) *api_v1beta1.BackupSessionStatus { in.Conditions = kmapi.SetCondition(in.Conditions, kmapi.Condition{ Type: apis.RepositoryMetricsPushed, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.SuccessfullyPushedRepositoryMetrics, Message: "Successfully pushed repository metrics.", }, diff --git a/vendor/stash.appscode.dev/apimachinery/pkg/conditions/restore.go b/vendor/stash.appscode.dev/apimachinery/pkg/conditions/restore.go index a0e88002b..3132a708f 100644 --- a/vendor/stash.appscode.dev/apimachinery/pkg/conditions/restore.go +++ b/vendor/stash.appscode.dev/apimachinery/pkg/conditions/restore.go @@ -23,6 +23,7 @@ import ( "stash.appscode.dev/apimachinery/apis" api_v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + core "k8s.io/api/core/v1" kmapi "kmodules.xyz/client-go/api/v1" ) @@ -30,7 +31,7 @@ func SetRestoreTargetFoundConditionToTrue(invoker apis.RestoreInvoker, index int target := invoker.TargetsInfo[index].Target return invoker.SetCondition(&target.Ref, kmapi.Condition{ Type: apis.RestoreTargetFound, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.TargetAvailable, Message: fmt.Sprintf("Restore target %s %s/%s found.", target.Ref.APIVersion, @@ -44,7 +45,7 @@ func SetRestoreTargetFoundConditionToFalse(invoker apis.RestoreInvoker, index in target := invoker.TargetsInfo[index].Target return invoker.SetCondition(&target.Ref, kmapi.Condition{ Type: apis.RestoreTargetFound, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.TargetNotAvailable, Message: fmt.Sprintf("Restore target %s %s/%s does not exist.", target.Ref.APIVersion, @@ -58,7 +59,7 @@ func SetRestoreTargetFoundConditionToUnknown(invoker apis.RestoreInvoker, index target := invoker.TargetsInfo[index].Target return invoker.SetCondition(&target.Ref, kmapi.Condition{ Type: apis.RestoreTargetFound, - Status: kmapi.ConditionUnknown, + Status: core.ConditionUnknown, Reason: apis.UnableToCheckTargetAvailability, Message: fmt.Sprintf("Failed to check whether restore target %s %s/%s exist or not. Reason: %v", target.Ref.APIVersion, @@ -72,7 +73,7 @@ func SetRestoreTargetFoundConditionToUnknown(invoker apis.RestoreInvoker, index func SetRestoreJobCreatedConditionToTrue(invoker apis.RestoreInvoker, tref *api_v1beta1.TargetRef) error { return invoker.SetCondition(tref, kmapi.Condition{ Type: apis.RestoreJobCreated, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.RestoreJobCreationSucceeded, Message: "Successfully created restore job.", }) @@ -81,7 +82,7 @@ func SetRestoreJobCreatedConditionToTrue(invoker apis.RestoreInvoker, tref *api_ func SetRestoreJobCreatedConditionToFalse(invoker apis.RestoreInvoker, tref *api_v1beta1.TargetRef, err error) error { return invoker.SetCondition(tref, kmapi.Condition{ Type: apis.RestoreJobCreated, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.RestoreJobCreationFailed, Message: fmt.Sprintf("Failed to create restore job. Reason: %v", err.Error()), }) @@ -90,7 +91,7 @@ func SetRestoreJobCreatedConditionToFalse(invoker apis.RestoreInvoker, tref *api func SetInitContainerInjectedConditionToTrue(invoker apis.RestoreInvoker, tref api_v1beta1.TargetRef) error { return invoker.SetCondition(&tref, kmapi.Condition{ Type: apis.StashInitContainerInjected, - Status: kmapi.ConditionTrue, + Status: core.ConditionTrue, Reason: apis.InitContainerInjectionSucceeded, Message: "Successfully injected stash init-container.", }) @@ -99,7 +100,7 @@ func SetInitContainerInjectedConditionToTrue(invoker apis.RestoreInvoker, tref a func SetInitContainerInjectedConditionToFalse(invoker apis.RestoreInvoker, tref api_v1beta1.TargetRef, err error) error { return invoker.SetCondition(&tref, kmapi.Condition{ Type: apis.StashInitContainerInjected, - Status: kmapi.ConditionFalse, + Status: core.ConditionFalse, Reason: apis.InitContainerInjectionFailed, Message: fmt.Sprintf("Failed to inject Stash init-container. Reason: %v", err.Error()), }) diff --git a/vendor/stash.appscode.dev/apimachinery/pkg/restic/commands.go b/vendor/stash.appscode.dev/apimachinery/pkg/restic/commands.go index aec2aaf2b..6a659303d 100644 --- a/vendor/stash.appscode.dev/apimachinery/pkg/restic/commands.go +++ b/vendor/stash.appscode.dev/apimachinery/pkg/restic/commands.go @@ -36,7 +36,7 @@ import ( ) const ( - ResticCMD = "/bin/restic_0.9.6" + ResticCMD = "/bin/restic" ) type Snapshot struct { diff --git a/vendor/stash.appscode.dev/apimachinery/pkg/restic/metrics.go b/vendor/stash.appscode.dev/apimachinery/pkg/restic/metrics.go index b2746d268..01619dfdf 100644 --- a/vendor/stash.appscode.dev/apimachinery/pkg/restic/metrics.go +++ b/vendor/stash.appscode.dev/apimachinery/pkg/restic/metrics.go @@ -872,7 +872,7 @@ func (metricOpt *MetricsOptions) sendMetrics(registry *prometheus.Registry, jobN // if Pushgateway URL is provided, then push the metrics to Pushgateway if metricOpt.PushgatewayURL != "" { pusher := push.New(metricOpt.PushgatewayURL, jobName) - err := pusher.Gatherer(registry).Push() + err := pusher.Gatherer(registry).Add() if err != nil { return err }