From 0f17ca3f0314e17d4971b5804afc323184ce6cd8 Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Sat, 11 Sep 2021 10:31:44 -0700 Subject: [PATCH] [cherry-pick] Use official restic v0.12.1 (#136) (#137) /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> --- Dockerfile.dbg | 2 +- Dockerfile.in | 2 +- Makefile | 2 +- go.mod | 8 +- go.sum | 18 +- vendor/kmodules.xyz/client-go/Makefile | 2 +- .../client-go/api/v1/generated.pb.go | 344 ++++++++++++++---- .../client-go/api/v1/generated.proto | 12 + .../client-go/api/v1/objectref.go | 28 ++ .../client-go/api/v1/openapi_generated.go | 31 ++ .../client-go/api/v1/zz_generated.deepcopy.go | 17 + .../appcatalog/v1alpha1/openapi_generated.go | 1 + .../v1alpha1/zz_generated.deepcopy.go | 1 + .../auditor/v1alpha1/openapi_generated.go | 1 + .../auditor/v1alpha1/zz_generated.deepcopy.go | 1 + .../metrics/v1alpha1/openapi_generated.go | 1 + .../metrics/v1alpha1/zz_generated.deepcopy.go | 1 + .../api/v1/openapi_generated.go | 1 + .../api/v1/zz_generated.deepcopy.go | 1 + vendor/modules.txt | 10 +- 20 files changed, 392 insertions(+), 92 deletions(-) create mode 100644 vendor/kmodules.xyz/client-go/api/v1/objectref.go diff --git a/Dockerfile.dbg b/Dockerfile.dbg index c3ba61dc..42fe2af1 100644 --- a/Dockerfile.dbg +++ b/Dockerfile.dbg @@ -22,7 +22,7 @@ RUN set -x \ && 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/stashed/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \ + && 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 diff --git a/Dockerfile.in b/Dockerfile.in index 05829edd..fc2f13e2 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -22,7 +22,7 @@ RUN set -x \ && 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/stashed/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \ + && 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 diff --git a/Makefile b/Makefile index 9c5f6223..5cb55434 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ else endif endif -RESTIC_VER := 0.12.0-ac.20210727 +RESTIC_VER := 0.12.1 ### ### These variables should not need tweaking. diff --git a/go.mod b/go.mod index 54910a1f..1c943f4e 100644 --- a/go.mod +++ b/go.mod @@ -8,14 +8,14 @@ require ( gomodules.xyz/flags v0.1.2 gomodules.xyz/go-sh v0.1.0 gomodules.xyz/logs v0.0.4 - gomodules.xyz/x v0.0.7 + gomodules.xyz/x v0.0.8 k8s.io/api v0.21.1 k8s.io/apimachinery v0.21.1 k8s.io/client-go v0.21.1 k8s.io/klog/v2 v2.8.0 - kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f - kmodules.xyz/custom-resources v0.0.0-20210824055127-e5a3d2d6c161 - kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e // indirect + kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063 + kmodules.xyz/custom-resources v0.0.0-20210829135624-c63be82e13c0 + kmodules.xyz/objectstore-api v0.0.0-20210829122106-d39859fc2d56 // indirect kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d stash.appscode.dev/apimachinery v0.15.0 ) diff --git a/go.sum b/go.sum index 28b50f0a..e9bcdd6f 100644 --- a/go.sum +++ b/go.sum @@ -887,8 +887,9 @@ gomodules.xyz/flags v0.1.2 h1:z/XHHGmduLYY/aSkzcQWJgXWIs3TCTSTLkmwtCjoizg= gomodules.xyz/flags v0.1.2/go.mod h1:CIzWYc2zYDs5lQyGJsjhqKgIj+LriNLpiYuX8Pk34gc= gomodules.xyz/go-sh v0.1.0 h1:1BJAuGREh2RhePt7HRrpmjnkbgfpXlCzc42SiyZ5dkc= gomodules.xyz/go-sh v0.1.0/go.mod h1:N8IrjNiYppUI/rxENYrWD6FOrSxSyEZnIekPEWM7LP0= -gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84 h1:RH11GBm37fGstaCcoFB5KtcUijofDS0yxcdkCS6vx/A= gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9eraH4= +gomodules.xyz/homedir v0.1.0 h1:qnY/+0XQbMk/UcpImZCJYeSI1rNa2BFtcJ/xqxzCpow= +gomodules.xyz/homedir v0.1.0/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9eraH4= gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= @@ -911,8 +912,9 @@ gomodules.xyz/stow v0.2.4/go.mod h1:aAgUEHyZ+4nKznyVupMMkP0JX9MXW1ZRrbRGaclp3E0= gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 h1:iiD24jN1H8PzliVe1igIzYsx8+VmbXG12y9UUSupUJU= gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545/go.mod h1:g/epKzZQuCqgvhzhaoG4cSBNGHqnOrhFR4Q7szDJ1JM= gomodules.xyz/x v0.0.5/go.mod h1:EGy7cB7ifSuOcbNFc0U1zUPTf5yY8RtXVJlAlhGS9OE= -gomodules.xyz/x v0.0.7 h1:LjrGG5w+XntDZekAdpEFxYD2dCr14hWRODeMztY1xVs= gomodules.xyz/x v0.0.7/go.mod h1:CMXe28rpApV30pPw9cxdyEmvoC+aa5LiAqzks9dlxag= +gomodules.xyz/x v0.0.8 h1:piAVBINs42F6RPf5WbiulSNYWU0JFwueKoBfR98J9Ro= +gomodules.xyz/x v0.0.8/go.mod h1:YnL5CAnLrEtAV/NQGn5sKJe6u08/vDlRyJddXIuD9mc= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= @@ -1022,16 +1024,16 @@ kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b/go.mod h1:A6GAK6xP5zBu kmodules.xyz/client-go v0.0.0-20210715065708-d4f0cc74ead1/go.mod h1:E/vGngai00UtVwP8R4PWpPUBF/EZa6Ub9WS5+tVcs4M= kmodules.xyz/client-go v0.0.0-20210719120358-dd0503cf99cf/go.mod h1:E/vGngai00UtVwP8R4PWpPUBF/EZa6Ub9WS5+tVcs4M= kmodules.xyz/client-go v0.0.0-20210822203828-5e9cebbf1dfa/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= -kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f h1:yesFlt5yHpnklVxbVZWOQD2lWB5ETu85e1FGHdAorwg= -kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= +kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063 h1:u+/fmk4N1LsxeCU7q7vnNgaADK73UeyNWKzNtjFe3Bs= +kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA= kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153/go.mod h1:/NLuNSf299U0XVuNEh2swtw3EczWFRL3Sx24WhNoWCM= -kmodules.xyz/custom-resources v0.0.0-20210824055127-e5a3d2d6c161 h1:0zHsitjggQMbdlJ5eC8cTac6Lqy8AS5jJ3Fs5cAwpiA= -kmodules.xyz/custom-resources v0.0.0-20210824055127-e5a3d2d6c161/go.mod h1:VYtz1fgHgLqCk+sdSUGBClfZfJ6z4873wB5MYOXxpS8= +kmodules.xyz/custom-resources v0.0.0-20210829135624-c63be82e13c0 h1:sCzXaZ9wWsKjOF/j4mTd8zeAXhd6BWZrdKJ8Dr6c++U= +kmodules.xyz/custom-resources v0.0.0-20210829135624-c63be82e13c0/go.mod h1:VYtz1fgHgLqCk+sdSUGBClfZfJ6z4873wB5MYOXxpS8= kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9/go.mod h1:8sCfgZQImwjTLh2mDxYiim6+GecFN+DamkPSF9joyu4= -kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e h1:e9Q0JFAWPmhjGYmNa9OBxewV3SKf82ZDJ1h0b7YdRms= -kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e/go.mod h1:Tkcf9uTplnrJ6C8o0zlw2kpgS1SaWAiMO5P2YgLjTo8= +kmodules.xyz/objectstore-api v0.0.0-20210829122106-d39859fc2d56 h1:hAROzfrhdJPMDJ8tKnwSSt4WIe+OdQobS0gmSo+VhyA= +kmodules.xyz/objectstore-api v0.0.0-20210829122106-d39859fc2d56/go.mod h1:Tkcf9uTplnrJ6C8o0zlw2kpgS1SaWAiMO5P2YgLjTo8= kmodules.xyz/offshoot-api v0.0.0-20210618005544-5217a24765da/go.mod h1:3LECbAL3FgbyK80NP3V3Pmiuo/a3hFWg/PR6SPFhTns= kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d h1:RXuVF3wMeqR+GMgZA7nK2WnsJ63pCnz56KyQpu+0obQ= kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d/go.mod h1:3LECbAL3FgbyK80NP3V3Pmiuo/a3hFWg/PR6SPFhTns= diff --git a/vendor/kmodules.xyz/client-go/Makefile b/vendor/kmodules.xyz/client-go/Makefile index c838aa81..4527d62e 100644 --- a/vendor/kmodules.xyz/client-go/Makefile +++ b/vendor/kmodules.xyz/client-go/Makefile @@ -58,7 +58,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) BASEIMAGE_PROD ?= gcr.io/distroless/static:nonroot BASEIMAGE_DBG ?= debian:buster -GO_VERSION ?= 1.16 +GO_VERSION ?= 1.17 BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION) OUTBIN = bin/$(OS)_$(ARCH)/$(BIN) 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 709fde28..5f3fe4f1 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go @@ -128,10 +128,38 @@ func (m *Condition) XXX_DiscardUnknown() { var xxx_messageInfo_Condition proto.InternalMessageInfo +func (m *ObjectReference) Reset() { *m = ObjectReference{} } +func (*ObjectReference) ProtoMessage() {} +func (*ObjectReference) Descriptor() ([]byte, []int) { + return fileDescriptor_af8e7a11c7a1ccd9, []int{3} +} +func (m *ObjectReference) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ObjectReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *ObjectReference) XXX_Merge(src proto.Message) { + xxx_messageInfo_ObjectReference.Merge(m, src) +} +func (m *ObjectReference) XXX_Size() int { + return m.Size() +} +func (m *ObjectReference) XXX_DiscardUnknown() { + xxx_messageInfo_ObjectReference.DiscardUnknown(m) +} + +var xxx_messageInfo_ObjectReference proto.InternalMessageInfo + func (m *ResourceID) Reset() { *m = ResourceID{} } func (*ResourceID) ProtoMessage() {} func (*ResourceID) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{3} + return fileDescriptor_af8e7a11c7a1ccd9, []int{4} } func (m *ResourceID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +187,7 @@ var xxx_messageInfo_ResourceID proto.InternalMessageInfo func (m *TLSConfig) Reset() { *m = TLSConfig{} } func (*TLSConfig) ProtoMessage() {} func (*TLSConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{4} + return fileDescriptor_af8e7a11c7a1ccd9, []int{5} } func (m *TLSConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -187,7 +215,7 @@ var xxx_messageInfo_TLSConfig proto.InternalMessageInfo func (m *X509Subject) Reset() { *m = X509Subject{} } func (*X509Subject) ProtoMessage() {} func (*X509Subject) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{5} + return fileDescriptor_af8e7a11c7a1ccd9, []int{6} } func (m *X509Subject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -216,6 +244,7 @@ func init() { proto.RegisterType((*CertificatePrivateKey)(nil), "kmodules.xyz.client_go.api.v1.CertificatePrivateKey") proto.RegisterType((*CertificateSpec)(nil), "kmodules.xyz.client_go.api.v1.CertificateSpec") proto.RegisterType((*Condition)(nil), "kmodules.xyz.client_go.api.v1.Condition") + proto.RegisterType((*ObjectReference)(nil), "kmodules.xyz.client_go.api.v1.ObjectReference") proto.RegisterType((*ResourceID)(nil), "kmodules.xyz.client_go.api.v1.ResourceID") proto.RegisterType((*TLSConfig)(nil), "kmodules.xyz.client_go.api.v1.TLSConfig") proto.RegisterType((*X509Subject)(nil), "kmodules.xyz.client_go.api.v1.X509Subject") @@ -226,74 +255,76 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 1065 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0xe3, 0xc4, - 0x1b, 0x6e, 0x9a, 0xa4, 0x8d, 0x27, 0xfd, 0xa3, 0xdf, 0xf4, 0x87, 0xb0, 0x2a, 0x88, 0xab, 0x20, - 0xad, 0x0a, 0xa8, 0x0e, 0x5d, 0x15, 0xb1, 0x20, 0x71, 0x58, 0x77, 0x57, 0xab, 0xb2, 0xa5, 0x2d, - 0x93, 0x2e, 0x5a, 0x2d, 0x07, 0x34, 0xb5, 0xdf, 0xb8, 0x43, 0x13, 0x8f, 0x35, 0x63, 0x07, 0xba, - 0x27, 0x3e, 0x02, 0xe2, 0x4b, 0xd1, 0xe3, 0x72, 0x41, 0x7b, 0xb2, 0xa8, 0xf9, 0x08, 0xdc, 0x7a, - 0x42, 0x33, 0xfe, 0x9b, 0x36, 0x82, 0x15, 0xe2, 0x16, 0x3f, 0xcf, 0xf3, 0x3e, 0xf3, 0xce, 0xbc, - 0x7f, 0x82, 0x76, 0x2e, 0x26, 0xdc, 0x8b, 0xc7, 0x20, 0xed, 0x1f, 0x2e, 0x5f, 0x0e, 0xdc, 0x31, - 0x83, 0x20, 0xda, 0xf1, 0xf9, 0x80, 0x86, 0x6c, 0x30, 0xdd, 0x1d, 0xf8, 0x10, 0x80, 0xa0, 0x11, - 0x78, 0x76, 0x28, 0x78, 0xc4, 0xf1, 0xbb, 0x75, 0xb9, 0x9d, 0xc9, 0xbf, 0xf5, 0xb9, 0x4d, 0x43, - 0x66, 0x4f, 0x77, 0x37, 0x77, 0x7c, 0x16, 0x9d, 0xc7, 0x67, 0xb6, 0xcb, 0x27, 0x03, 0x9f, 0xfb, - 0x7c, 0xa0, 0xa3, 0xce, 0xe2, 0x91, 0xfe, 0xd2, 0x1f, 0xfa, 0x57, 0xe6, 0xb6, 0xd9, 0xbf, 0x78, - 0x20, 0x6d, 0x96, 0x1d, 0xe6, 0x72, 0x01, 0x73, 0x4e, 0xdc, 0xdc, 0xab, 0x34, 0x13, 0xea, 0x9e, - 0xb3, 0x00, 0xc4, 0xe5, 0x20, 0xbc, 0xf0, 0x15, 0x20, 0x07, 0x13, 0x88, 0xe8, 0x9c, 0xa8, 0xfe, - 0x37, 0xe8, 0xad, 0x7d, 0x10, 0x11, 0x1b, 0x31, 0x97, 0x46, 0x70, 0x22, 0xd8, 0x94, 0x46, 0xf0, - 0x14, 0x2e, 0xb1, 0x83, 0x3a, 0x10, 0xb8, 0xdc, 0x63, 0x81, 0x6f, 0x36, 0xb6, 0x1a, 0xdb, 0x86, - 0x73, 0xef, 0x2a, 0xb1, 0x16, 0xd2, 0xc4, 0xea, 0x3c, 0xce, 0xf1, 0x9b, 0xc4, 0xc2, 0x55, 0x44, - 0x81, 0x92, 0x32, 0xae, 0xff, 0x67, 0x1b, 0xad, 0xd7, 0xdc, 0x87, 0x21, 0xb8, 0xf8, 0x3d, 0xd4, - 0xa6, 0x63, 0x46, 0x65, 0x6e, 0xba, 0x9a, 0x9b, 0xb6, 0x1f, 0x2a, 0x90, 0x64, 0x1c, 0x7e, 0x81, - 0x0c, 0x26, 0x65, 0x0c, 0x82, 0xc0, 0xc8, 0x5c, 0xdc, 0x6a, 0x6c, 0x77, 0xef, 0xef, 0xd8, 0xd9, - 0xfd, 0xf4, 0x0b, 0xaa, 0x37, 0xb0, 0xa7, 0xbb, 0xf6, 0xe9, 0x65, 0x08, 0xde, 0x21, 0x77, 0xe9, - 0xf8, 0xf8, 0xec, 0x3b, 0x70, 0x23, 0x02, 0x23, 0x10, 0x10, 0xb8, 0xe0, 0xac, 0xa6, 0x89, 0x65, - 0x1c, 0x14, 0x1e, 0xa4, 0xb2, 0xc3, 0xf7, 0x11, 0x92, 0xe0, 0x0a, 0x88, 0x8e, 0xe8, 0x04, 0xcc, - 0xa6, 0xce, 0x02, 0xe7, 0x59, 0xa0, 0x61, 0xc9, 0x90, 0x9a, 0x0a, 0x7f, 0x85, 0x96, 0x65, 0xac, - 0x4f, 0x30, 0x5b, 0x3a, 0x9b, 0x0f, 0xec, 0xbf, 0xad, 0xaf, 0xfd, 0xfc, 0xe3, 0x8f, 0x3e, 0x1d, - 0x66, 0x11, 0x4e, 0x37, 0x4d, 0xac, 0xe5, 0xfc, 0x83, 0x14, 0x3e, 0xf8, 0x39, 0xea, 0x78, 0xb1, - 0xa0, 0x11, 0xe3, 0x81, 0xd9, 0xd6, 0x9e, 0x76, 0xed, 0x86, 0x65, 0x05, 0xed, 0xf0, 0xc2, 0x57, - 0x80, 0xb4, 0x55, 0x05, 0x95, 0xf5, 0xa3, 0x3c, 0xca, 0x59, 0x51, 0xb5, 0x28, 0xbe, 0x48, 0xe9, - 0x86, 0x29, 0xea, 0x0a, 0x08, 0xe0, 0x7b, 0x07, 0x46, 0x5c, 0x80, 0xb9, 0xf4, 0xaf, 0xcc, 0xd7, - 0xd3, 0xc4, 0xea, 0x92, 0xca, 0x86, 0xd4, 0x3d, 0xf1, 0x36, 0xea, 0x78, 0x81, 0x54, 0x4f, 0x23, - 0xcd, 0xe5, 0xad, 0xe6, 0xb6, 0x91, 0x27, 0x73, 0x34, 0xd4, 0x18, 0x29, 0x59, 0xbc, 0x8b, 0xba, - 0x2c, 0x7c, 0xe8, 0x79, 0x02, 0xa4, 0x04, 0x69, 0x76, 0xb4, 0x58, 0x9b, 0x1f, 0x9c, 0x94, 0x30, - 0xa9, 0x6b, 0xf0, 0x3b, 0xa8, 0x15, 0x0b, 0x26, 0x4d, 0x43, 0x6b, 0x3b, 0x69, 0x62, 0xb5, 0x9e, - 0x91, 0x03, 0x49, 0x34, 0x8a, 0x3f, 0x43, 0x6b, 0x30, 0xa1, 0x6c, 0x5c, 0x79, 0x22, 0xad, 0xc3, - 0x69, 0x62, 0xad, 0x3d, 0x9e, 0x61, 0xc8, 0x2d, 0x25, 0xf6, 0x10, 0x0a, 0xcb, 0x7e, 0x35, 0xbb, - 0xfa, 0x61, 0xf6, 0xfe, 0xa1, 0x92, 0x73, 0xa7, 0xc3, 0x59, 0x53, 0xcd, 0x52, 0x7d, 0x93, 0x9a, - 0x6f, 0xff, 0xe7, 0x26, 0x32, 0xf6, 0x79, 0xe0, 0x31, 0x5d, 0x8d, 0x2d, 0xd4, 0x8a, 0x2e, 0x43, - 0xc8, 0xdb, 0x7d, 0x25, 0x6f, 0xb4, 0x96, 0xea, 0x5c, 0xa2, 0x19, 0x7c, 0x88, 0x96, 0x64, 0x44, - 0xa3, 0x58, 0xea, 0x4e, 0x37, 0x9c, 0xbd, 0x5c, 0xb3, 0x34, 0xd4, 0xe8, 0x4d, 0x62, 0xcd, 0x19, - 0x7f, 0xbb, 0x3c, 0x21, 0x53, 0x91, 0xdc, 0x03, 0x7f, 0x81, 0x30, 0x3f, 0x93, 0x20, 0xa6, 0xe0, - 0x3d, 0xc9, 0x66, 0x5d, 0x75, 0x98, 0x6a, 0xf3, 0xa6, 0xb3, 0x99, 0x3b, 0xe3, 0xe3, 0x3b, 0x0a, - 0x32, 0x27, 0x0a, 0x4f, 0x11, 0x1e, 0x53, 0x19, 0x9d, 0x0a, 0x1a, 0x48, 0x7d, 0xd6, 0x29, 0x9b, - 0x40, 0x35, 0x01, 0x6f, 0xd2, 0x50, 0x2a, 0xa2, 0x3a, 0xf7, 0xf0, 0x8e, 0x1b, 0x99, 0x73, 0x02, - 0xbe, 0x87, 0x96, 0x04, 0x50, 0x99, 0x4f, 0x86, 0xe1, 0xac, 0x15, 0x2f, 0x42, 0x34, 0x4a, 0x72, - 0x16, 0xbf, 0x8f, 0x96, 0x27, 0x20, 0x25, 0xf5, 0xb3, 0x2e, 0x37, 0x9c, 0xf5, 0x5c, 0xb8, 0xfc, - 0x65, 0x06, 0x93, 0x82, 0xef, 0xff, 0xd6, 0x40, 0x88, 0x80, 0xe4, 0xb1, 0x70, 0xe1, 0xe0, 0x91, - 0xda, 0x42, 0xbe, 0xe0, 0x71, 0x78, 0x7b, 0x0b, 0x3d, 0x51, 0x20, 0xc9, 0x38, 0x65, 0x3f, 0x05, - 0x21, 0xd5, 0xfb, 0x2d, 0xce, 0xda, 0x7f, 0x9d, 0xc1, 0xa4, 0xe0, 0x55, 0x95, 0x83, 0x6a, 0x9d, - 0x94, 0x55, 0xd6, 0x8b, 0x44, 0x33, 0x4a, 0x71, 0xc1, 0x02, 0x4f, 0xbf, 0x5e, 0x4d, 0xf1, 0x94, - 0x05, 0x1e, 0xd1, 0x0c, 0xde, 0x43, 0x6d, 0xe9, 0xf2, 0x10, 0xf2, 0x4b, 0xf7, 0x8a, 0x9c, 0x86, - 0x0a, 0xbc, 0x49, 0xac, 0xd5, 0x22, 0x7f, 0x0d, 0x90, 0x4c, 0xdc, 0xff, 0xb5, 0x81, 0x8c, 0xd3, - 0xc3, 0xe1, 0x3e, 0x0f, 0x46, 0xcc, 0x9f, 0x5d, 0x9c, 0x8d, 0xff, 0x76, 0x71, 0x9e, 0xa3, 0x15, - 0xb7, 0x1a, 0x06, 0xd5, 0xad, 0xcd, 0x6c, 0xb1, 0xbc, 0xe9, 0xfc, 0xa8, 0xfd, 0xef, 0xfc, 0x3f, - 0xbf, 0xd6, 0x4a, 0x8d, 0x90, 0x64, 0xc6, 0xb9, 0xff, 0x4b, 0x13, 0x75, 0x6b, 0x1b, 0x14, 0x7f, - 0x82, 0x56, 0xb9, 0xf0, 0x69, 0xc0, 0x5e, 0xea, 0xbe, 0x54, 0xff, 0x1d, 0x6a, 0xe4, 0xff, 0x97, - 0x26, 0xd6, 0xea, 0x71, 0x9d, 0x20, 0xb3, 0x3a, 0xfc, 0x21, 0x32, 0x5c, 0x1e, 0x07, 0x91, 0x60, - 0x79, 0xbe, 0x46, 0x76, 0xbf, 0xfd, 0x02, 0x24, 0x15, 0x8f, 0x0f, 0xd0, 0x46, 0x3d, 0x9a, 0x8e, - 0x9f, 0x05, 0x2c, 0x92, 0x66, 0x53, 0x87, 0xbd, 0x9d, 0x26, 0xd6, 0xc6, 0xf1, 0x5d, 0x9a, 0xcc, - 0x8b, 0xc1, 0x36, 0x42, 0x63, 0xf5, 0xb8, 0x2c, 0x52, 0x07, 0xb7, 0xb4, 0x83, 0x5e, 0x19, 0x87, - 0x25, 0x4a, 0x6a, 0x0a, 0x95, 0x67, 0x28, 0xf8, 0x94, 0x05, 0x2e, 0x48, 0xb3, 0x5d, 0xe5, 0x79, - 0x52, 0x80, 0xa4, 0xe2, 0xf1, 0xe7, 0x68, 0x5d, 0x46, 0x02, 0x20, 0xaa, 0x56, 0xe0, 0x92, 0x0e, - 0xd9, 0x48, 0x13, 0x6b, 0x7d, 0x38, 0x4b, 0x91, 0xdb, 0x5a, 0xb5, 0x91, 0x43, 0x2e, 0x23, 0x3a, - 0xde, 0xe7, 0x5e, 0xb9, 0xbe, 0xf5, 0x46, 0x3e, 0xa9, 0x60, 0x52, 0xd7, 0xe0, 0x07, 0x68, 0x45, - 0x82, 0x60, 0x74, 0x7c, 0x14, 0x4f, 0xce, 0x40, 0x98, 0x1d, 0xdd, 0xa0, 0x65, 0x25, 0x87, 0x35, - 0x8e, 0xcc, 0x28, 0x9d, 0xed, 0xab, 0xeb, 0xde, 0xc2, 0xab, 0xeb, 0xde, 0xc2, 0xeb, 0xeb, 0xde, - 0xc2, 0x8f, 0x69, 0xaf, 0x71, 0x95, 0xf6, 0x1a, 0xaf, 0xd2, 0x5e, 0xe3, 0x75, 0xda, 0x6b, 0xfc, - 0x9e, 0xf6, 0x1a, 0x3f, 0xfd, 0xd1, 0x5b, 0x78, 0xb1, 0x38, 0xdd, 0xfd, 0x2b, 0x00, 0x00, 0xff, - 0xff, 0x74, 0xcb, 0x77, 0x53, 0x60, 0x09, 0x00, 0x00, + // 1099 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5f, 0x6f, 0x1b, 0xc5, + 0x17, 0x8d, 0x6b, 0x3b, 0xf1, 0x8e, 0x93, 0x58, 0x9d, 0xfe, 0x7e, 0x62, 0x15, 0x81, 0x37, 0x32, + 0x52, 0x15, 0x40, 0x59, 0x93, 0x2a, 0x88, 0x82, 0xc4, 0x43, 0x37, 0xad, 0xaa, 0xd0, 0x90, 0x84, + 0x71, 0x8a, 0xaa, 0xf2, 0x80, 0x26, 0xbb, 0xd7, 0xdb, 0x21, 0xf6, 0xce, 0x6a, 0x66, 0xd7, 0x90, + 0x3e, 0xf1, 0x11, 0x10, 0x5f, 0x8a, 0x3c, 0x96, 0x17, 0xd4, 0xa7, 0x15, 0x59, 0x3e, 0x02, 0x6f, + 0x79, 0x42, 0x33, 0xfb, 0xd7, 0x89, 0x81, 0x0a, 0xf1, 0xb6, 0x73, 0xce, 0xb9, 0x67, 0xee, 0xcc, + 0xbd, 0x73, 0x17, 0x6d, 0x9f, 0x4d, 0xb9, 0x17, 0x4f, 0x40, 0xda, 0xdf, 0x9f, 0xbf, 0x1c, 0xba, + 0x13, 0x06, 0x41, 0xb4, 0xed, 0xf3, 0x21, 0x0d, 0xd9, 0x70, 0xb6, 0x33, 0xf4, 0x21, 0x00, 0x41, + 0x23, 0xf0, 0xec, 0x50, 0xf0, 0x88, 0xe3, 0x77, 0xea, 0x72, 0x3b, 0x93, 0x7f, 0xe3, 0x73, 0x9b, + 0x86, 0xcc, 0x9e, 0xed, 0x6c, 0x6c, 0xfb, 0x2c, 0x7a, 0x11, 0x9f, 0xda, 0x2e, 0x9f, 0x0e, 0x7d, + 0xee, 0xf3, 0xa1, 0x8e, 0x3a, 0x8d, 0xc7, 0x7a, 0xa5, 0x17, 0xfa, 0x2b, 0x73, 0xdb, 0x18, 0x9c, + 0xdd, 0x97, 0x36, 0xcb, 0x36, 0x73, 0xb9, 0x80, 0x05, 0x3b, 0x6e, 0xec, 0x56, 0x9a, 0x29, 0x75, + 0x5f, 0xb0, 0x00, 0xc4, 0xf9, 0x30, 0x3c, 0xf3, 0x15, 0x20, 0x87, 0x53, 0x88, 0xe8, 0x82, 0xa8, + 0xc1, 0xd7, 0xe8, 0xff, 0x7b, 0x20, 0x22, 0x36, 0x66, 0x2e, 0x8d, 0xe0, 0x58, 0xb0, 0x19, 0x8d, + 0xe0, 0x09, 0x9c, 0x63, 0x07, 0x75, 0x20, 0x70, 0xb9, 0xc7, 0x02, 0xdf, 0x6c, 0x6c, 0x36, 0xb6, + 0x0c, 0xe7, 0xee, 0x45, 0x62, 0x2d, 0xa5, 0x89, 0xd5, 0x79, 0x94, 0xe3, 0x57, 0x89, 0x85, 0xab, + 0x88, 0x02, 0x25, 0x65, 0xdc, 0xe0, 0x8f, 0x36, 0xea, 0xd5, 0xdc, 0x47, 0x21, 0xb8, 0xf8, 0x5d, + 0xd4, 0xa6, 0x13, 0x46, 0x65, 0x6e, 0xba, 0x96, 0x9b, 0xb6, 0x1f, 0x28, 0x90, 0x64, 0x1c, 0x7e, + 0x8e, 0x0c, 0x26, 0x65, 0x0c, 0x82, 0xc0, 0xd8, 0xbc, 0xb5, 0xd9, 0xd8, 0xea, 0xde, 0xdb, 0xb6, + 0xb3, 0xf3, 0xe9, 0x1b, 0x54, 0x77, 0x60, 0xcf, 0x76, 0xec, 0x93, 0xf3, 0x10, 0xbc, 0x03, 0xee, + 0xd2, 0xc9, 0xd1, 0xe9, 0xb7, 0xe0, 0x46, 0x04, 0xc6, 0x20, 0x20, 0x70, 0xc1, 0x59, 0x4b, 0x13, + 0xcb, 0xd8, 0x2f, 0x3c, 0x48, 0x65, 0x87, 0xef, 0x21, 0x24, 0xc1, 0x15, 0x10, 0x1d, 0xd2, 0x29, + 0x98, 0x4d, 0x9d, 0x05, 0xce, 0xb3, 0x40, 0xa3, 0x92, 0x21, 0x35, 0x15, 0xfe, 0x12, 0xad, 0xc8, + 0x58, 0xef, 0x60, 0xb6, 0x74, 0x36, 0xef, 0xdb, 0x7f, 0x5b, 0x5f, 0xfb, 0xd9, 0x47, 0x1f, 0x7e, + 0x32, 0xca, 0x22, 0x9c, 0x6e, 0x9a, 0x58, 0x2b, 0xf9, 0x82, 0x14, 0x3e, 0xf8, 0x19, 0xea, 0x78, + 0xb1, 0xa0, 0x11, 0xe3, 0x81, 0xd9, 0xd6, 0x9e, 0x76, 0xed, 0x84, 0x65, 0x05, 0xed, 0xf0, 0xcc, + 0x57, 0x80, 0xb4, 0x55, 0x05, 0x95, 0xf5, 0xc3, 0x3c, 0xca, 0x59, 0x55, 0xb5, 0x28, 0x56, 0xa4, + 0x74, 0xc3, 0x14, 0x75, 0x05, 0x04, 0xf0, 0x9d, 0x03, 0x63, 0x2e, 0xc0, 0x5c, 0xfe, 0x57, 0xe6, + 0xbd, 0x34, 0xb1, 0xba, 0xa4, 0xb2, 0x21, 0x75, 0x4f, 0xbc, 0x85, 0x3a, 0x5e, 0x20, 0xd5, 0xd5, + 0x48, 0x73, 0x65, 0xb3, 0xb9, 0x65, 0xe4, 0xc9, 0x1c, 0x8e, 0x34, 0x46, 0x4a, 0x16, 0xef, 0xa0, + 0x2e, 0x0b, 0x1f, 0x78, 0x9e, 0x00, 0x29, 0x41, 0x9a, 0x1d, 0x2d, 0xd6, 0xe6, 0xfb, 0xc7, 0x25, + 0x4c, 0xea, 0x1a, 0xfc, 0x36, 0x6a, 0xc5, 0x82, 0x49, 0xd3, 0xd0, 0xda, 0x4e, 0x9a, 0x58, 0xad, + 0xa7, 0x64, 0x5f, 0x12, 0x8d, 0xe2, 0x4f, 0xd1, 0x3a, 0x4c, 0x29, 0x9b, 0x54, 0x9e, 0x48, 0xeb, + 0x70, 0x9a, 0x58, 0xeb, 0x8f, 0xe6, 0x18, 0x72, 0x4d, 0x89, 0x3d, 0x84, 0xc2, 0xb2, 0x5f, 0xcd, + 0xae, 0xbe, 0x98, 0xdd, 0x7f, 0xa8, 0xe4, 0xc2, 0xd7, 0xe1, 0xac, 0xab, 0x66, 0xa9, 0xd6, 0xa4, + 0xe6, 0x3b, 0xf8, 0xa9, 0x89, 0x8c, 0x3d, 0x1e, 0x78, 0x4c, 0x57, 0x63, 0x13, 0xb5, 0xa2, 0xf3, + 0x10, 0xf2, 0x76, 0x5f, 0xcd, 0x1b, 0xad, 0xa5, 0x3a, 0x97, 0x68, 0x06, 0x1f, 0xa0, 0x65, 0x19, + 0xd1, 0x28, 0x96, 0xba, 0xd3, 0x0d, 0x67, 0x37, 0xd7, 0x2c, 0x8f, 0x34, 0x7a, 0x95, 0x58, 0x0b, + 0x9e, 0xbf, 0x5d, 0xee, 0x90, 0xa9, 0x48, 0xee, 0x81, 0x3f, 0x47, 0x98, 0x9f, 0x4a, 0x10, 0x33, + 0xf0, 0x1e, 0x67, 0x6f, 0x5d, 0x75, 0x98, 0x6a, 0xf3, 0xa6, 0xb3, 0x91, 0x3b, 0xe3, 0xa3, 0x1b, + 0x0a, 0xb2, 0x20, 0x0a, 0xcf, 0x10, 0x9e, 0x50, 0x19, 0x9d, 0x08, 0x1a, 0x48, 0xbd, 0xd7, 0x09, + 0x9b, 0x42, 0xf5, 0x02, 0xde, 0xa4, 0xa1, 0x54, 0x44, 0xb5, 0xef, 0xc1, 0x0d, 0x37, 0xb2, 0x60, + 0x07, 0x7c, 0x17, 0x2d, 0x0b, 0xa0, 0x32, 0x7f, 0x19, 0x86, 0xb3, 0x5e, 0xdc, 0x08, 0xd1, 0x28, + 0xc9, 0x59, 0xfc, 0x1e, 0x5a, 0x99, 0x82, 0x94, 0xd4, 0xcf, 0xba, 0xdc, 0x70, 0x7a, 0xb9, 0x70, + 0xe5, 0x8b, 0x0c, 0x26, 0x05, 0x3f, 0xf0, 0x50, 0xef, 0xda, 0x88, 0xc0, 0x43, 0x64, 0x04, 0xaa, + 0x47, 0x43, 0xea, 0x16, 0xe5, 0xb9, 0x9d, 0xc7, 0x1b, 0x87, 0x05, 0x41, 0x2a, 0x8d, 0x2a, 0xa5, + 0x5a, 0xe4, 0x65, 0x2a, 0x4b, 0xa9, 0xa7, 0x85, 0x66, 0x06, 0xbf, 0x36, 0x10, 0x22, 0x20, 0x79, + 0x2c, 0x5c, 0xd8, 0x7f, 0xa8, 0x66, 0x9d, 0x2f, 0x78, 0x1c, 0x5e, 0x9f, 0x75, 0x8f, 0x15, 0x48, + 0x32, 0x4e, 0x1d, 0x62, 0x06, 0x42, 0xaa, 0x2a, 0xdd, 0x9a, 0x3f, 0xc4, 0x57, 0x19, 0x4c, 0x0a, + 0xbe, 0x4c, 0xa0, 0xf9, 0x57, 0x09, 0x28, 0xc5, 0x19, 0x0b, 0x3c, 0x5d, 0xa3, 0x9a, 0xe2, 0x09, + 0x0b, 0x3c, 0xa2, 0x19, 0xbc, 0x8b, 0xda, 0xd2, 0xe5, 0x21, 0xe4, 0x57, 0xdb, 0x2f, 0x72, 0x1a, + 0x29, 0xf0, 0x2a, 0xb1, 0xd6, 0x8a, 0xfc, 0x35, 0x40, 0x32, 0xf1, 0xe0, 0x97, 0x06, 0x32, 0x4e, + 0x0e, 0x46, 0x7b, 0x3c, 0x18, 0x33, 0x7f, 0x7e, 0x3c, 0x37, 0xfe, 0xdb, 0xf1, 0xfc, 0x02, 0xad, + 0xba, 0xd5, 0x93, 0x53, 0x6f, 0xa2, 0x99, 0x8d, 0xaf, 0x37, 0x7d, 0xa5, 0xea, 0x2f, 0xe3, 0xfc, + 0x2f, 0x3f, 0xd6, 0x6a, 0x8d, 0x90, 0x64, 0xce, 0x79, 0xf0, 0x73, 0x13, 0x75, 0x6b, 0x73, 0x1a, + 0x7f, 0x8c, 0xd6, 0xb8, 0xf0, 0x69, 0xc0, 0x5e, 0xea, 0xee, 0x57, 0x7f, 0x28, 0x35, 0x58, 0x6e, + 0xa7, 0x89, 0xb5, 0x76, 0x54, 0x27, 0xc8, 0xbc, 0x0e, 0x7f, 0x80, 0x0c, 0x97, 0xc7, 0x41, 0x24, + 0x58, 0x9e, 0xaf, 0x91, 0x9d, 0x6f, 0xaf, 0x00, 0x49, 0xc5, 0xe3, 0x7d, 0x74, 0xa7, 0x1e, 0x4d, + 0x27, 0x4f, 0x03, 0x16, 0x49, 0xb3, 0xa9, 0xc3, 0xde, 0x4a, 0x13, 0xeb, 0xce, 0xd1, 0x4d, 0x9a, + 0x2c, 0x8a, 0xc1, 0x36, 0x42, 0x13, 0x75, 0xb9, 0x2c, 0x52, 0x1b, 0xb7, 0xb4, 0x83, 0x1e, 0x4c, + 0x07, 0x25, 0x4a, 0x6a, 0x0a, 0x95, 0x67, 0x28, 0xf8, 0x8c, 0x05, 0x2e, 0x48, 0xb3, 0x5d, 0xe5, + 0x79, 0x5c, 0x80, 0xa4, 0xe2, 0xf1, 0x67, 0xa8, 0x27, 0x23, 0x01, 0x10, 0x55, 0x83, 0x76, 0x59, + 0x87, 0xdc, 0x49, 0x13, 0xab, 0x37, 0x9a, 0xa7, 0xc8, 0x75, 0xad, 0x9a, 0xfb, 0x21, 0x97, 0x11, + 0x9d, 0xec, 0x71, 0xaf, 0xfc, 0x49, 0xe8, 0xb9, 0x7f, 0x5c, 0xc1, 0xa4, 0xae, 0xc1, 0xf7, 0xd1, + 0xaa, 0x04, 0xc1, 0xe8, 0xe4, 0x30, 0x9e, 0x9e, 0x82, 0x30, 0x3b, 0xba, 0x41, 0xcb, 0x4a, 0x8e, + 0x6a, 0x1c, 0x99, 0x53, 0x3a, 0x5b, 0x17, 0x97, 0xfd, 0xa5, 0x57, 0x97, 0xfd, 0xa5, 0xd7, 0x97, + 0xfd, 0xa5, 0x1f, 0xd2, 0x7e, 0xe3, 0x22, 0xed, 0x37, 0x5e, 0xa5, 0xfd, 0xc6, 0xeb, 0xb4, 0xdf, + 0xf8, 0x2d, 0xed, 0x37, 0x7e, 0xfc, 0xbd, 0xbf, 0xf4, 0xfc, 0xd6, 0x6c, 0xe7, 0xcf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x95, 0xf0, 0x1a, 0x97, 0xc6, 0x09, 0x00, 0x00, } func (m *CertificatePrivateKey) Marshal() (dAtA []byte, err error) { @@ -509,6 +540,39 @@ func (m *Condition) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ObjectReference) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ObjectReference) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ObjectReference) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0x12 + i -= len(m.Namespace) + copy(dAtA[i:], m.Namespace) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Namespace))) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + func (m *ResourceID) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -796,6 +860,19 @@ func (m *Condition) Size() (n int) { return n } +func (m *ObjectReference) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Namespace) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.Name) + n += 1 + l + sovGenerated(uint64(l)) + return n +} + func (m *ResourceID) Size() (n int) { if m == nil { return 0 @@ -938,6 +1015,17 @@ func (this *Condition) String() string { }, "") return s } +func (this *ObjectReference) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&ObjectReference{`, + `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, + `Name:` + fmt.Sprintf("%v", this.Name) + `,`, + `}`, + }, "") + return s +} func (this *ResourceID) String() string { if this == nil { return "nil" @@ -1727,6 +1815,120 @@ func (m *Condition) Unmarshal(dAtA []byte) error { } return nil } +func (m *ObjectReference) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ObjectReference: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ObjectReference: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Namespace", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Namespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *ResourceID) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.proto b/vendor/kmodules.xyz/client-go/api/v1/generated.proto index 7ac87d23..6dfab369 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.proto +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.proto @@ -121,6 +121,18 @@ message Condition { optional string message = 6; } +// ObjectReference contains enough information to let you inspect or modify the referred object. +message ObjectReference { + // Namespace of the referent. + // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/ + // +optional + optional string namespace = 1; + + // Name of the referent. + // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + optional string name = 2; +} + // ResourceID identifies a resource message ResourceID { optional string group = 1; diff --git a/vendor/kmodules.xyz/client-go/api/v1/objectref.go b/vendor/kmodules.xyz/client-go/api/v1/objectref.go new file mode 100644 index 00000000..96396df0 --- /dev/null +++ b/vendor/kmodules.xyz/client-go/api/v1/objectref.go @@ -0,0 +1,28 @@ +/* +Copyright AppsCode Inc. and Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1 + +// ObjectReference contains enough information to let you inspect or modify the referred object. +type ObjectReference struct { + // Namespace of the referent. + // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/ + // +optional + Namespace string `json:"namespace,omitempty" protobuf:"bytes,1,opt,name=namespace"` + // Name of the referent. + // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + Name string `json:"name" protobuf:"bytes,2,opt,name=name"` +} diff --git a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go index 832b1ebe..57be0acc 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* @@ -32,6 +33,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "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.ObjectReference": schema_kmodulesxyz_client_go_api_v1_ObjectReference(ref), "kmodules.xyz/client-go/api/v1.ResourceID": schema_kmodulesxyz_client_go_api_v1_ResourceID(ref), "kmodules.xyz/client-go/api/v1.TLSConfig": schema_kmodulesxyz_client_go_api_v1_TLSConfig(ref), "kmodules.xyz/client-go/api/v1.X509Subject": schema_kmodulesxyz_client_go_api_v1_X509Subject(ref), @@ -240,6 +242,35 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) } } +func schema_kmodulesxyz_client_go_api_v1_ObjectReference(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ObjectReference contains enough information to let you inspect or modify the referred object.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "namespace": { + SchemaProps: spec.SchemaProps{ + Description: "Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/", + Type: []string{"string"}, + Format: "", + }, + }, + "name": { + SchemaProps: spec.SchemaProps{ + Description: "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"name"}, + }, + }, + } +} + func schema_kmodulesxyz_client_go_api_v1_ResourceID(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go index fe17f99c..07e05f1d 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* @@ -119,6 +120,22 @@ func (in *Condition) DeepCopy() *Condition { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ObjectReference) DeepCopyInto(out *ObjectReference) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ObjectReference. +func (in *ObjectReference) DeepCopy() *ObjectReference { + if in == nil { + return nil + } + out := new(ObjectReference) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ResourceID) DeepCopyInto(out *ResourceID) { *out = *in diff --git a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/openapi_generated.go index a0cd26e4..d7364e9d 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/openapi_generated.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/zz_generated.deepcopy.go index 9509248f..1ad39115 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go index 9ba84cbb..610e8497 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go index 48405955..3e0e7ad5 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go index 84d51cdf..bb93a78c 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/zz_generated.deepcopy.go index 8ab72d5d..3dd763ab 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/vendor/kmodules.xyz/objectstore-api/api/v1/openapi_generated.go b/vendor/kmodules.xyz/objectstore-api/api/v1/openapi_generated.go index 8ce6677e..ba88fcbd 100644 --- a/vendor/kmodules.xyz/objectstore-api/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/objectstore-api/api/v1/openapi_generated.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/vendor/kmodules.xyz/objectstore-api/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/objectstore-api/api/v1/zz_generated.deepcopy.go index 50a99567..853f6491 100644 --- a/vendor/kmodules.xyz/objectstore-api/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/objectstore-api/api/v1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/vendor/modules.txt b/vendor/modules.txt index f4a7cf72..00a03781 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -172,7 +172,7 @@ gomodules.xyz/flags # gomodules.xyz/go-sh v0.1.0 ## explicit gomodules.xyz/go-sh -# gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84 +# gomodules.xyz/homedir v0.1.0 gomodules.xyz/homedir # gomodules.xyz/jsonpatch/v2 v2.2.0 gomodules.xyz/jsonpatch/v2 @@ -187,7 +187,7 @@ gomodules.xyz/pointer gomodules.xyz/sets # gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 gomodules.xyz/wait -# gomodules.xyz/x v0.0.7 +# gomodules.xyz/x v0.0.8 ## explicit gomodules.xyz/x/analytics gomodules.xyz/x/version @@ -533,7 +533,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f +# kmodules.xyz/client-go v0.0.0-20210909114628-15cac6c74063 ## explicit kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -547,7 +547,7 @@ kmodules.xyz/client-go/meta kmodules.xyz/client-go/tools/analytics kmodules.xyz/client-go/tools/cli kmodules.xyz/client-go/tools/clusterid -# kmodules.xyz/custom-resources v0.0.0-20210824055127-e5a3d2d6c161 +# kmodules.xyz/custom-resources v0.0.0-20210829135624-c63be82e13c0 ## explicit kmodules.xyz/custom-resources/apis/appcatalog kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1 @@ -561,7 +561,7 @@ kmodules.xyz/custom-resources/client/clientset/versioned/typed/appcatalog/v1alph kmodules.xyz/custom-resources/client/clientset/versioned/typed/auditor/v1alpha1 kmodules.xyz/custom-resources/client/clientset/versioned/typed/metrics/v1alpha1 kmodules.xyz/custom-resources/crds -# kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e +# kmodules.xyz/objectstore-api v0.0.0-20210829122106-d39859fc2d56 ## explicit kmodules.xyz/objectstore-api/api/v1 # kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d