From 0bfe7db39a6e6d448183795a8affe125a9d3d19d Mon Sep 17 00:00:00 2001 From: CMGS Date: Sun, 22 Jul 2018 10:37:09 +0800 Subject: [PATCH] update to golang 1.10.3 at alpine 3.8 --- Dockerfile | 12 +- Makefile | 2 +- README.md | 4 +- app.yaml | 4 +- glide.lock | 31 +- glide.yaml | 2 +- rpc/gen/core.pb.go | 1798 ++++++++++----------------------------- source/common/common.go | 2 +- 8 files changed, 450 insertions(+), 1405 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26db35972..dedcb41b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,20 @@ -FROM golang:1.10.3-alpine3.7 AS BUILD +FROM golang:1.10.3-alpine3.8 AS BUILD MAINTAINER CMGS -ENV LIBGIT2VERSION 0.26.4 - # make binary RUN apk add --no-cache build-base musl-dev libgit2-dev git curl make cmake python\ && curl https://glide.sh/get | sh \ && go get -d github.com/projecteru2/core -RUN wget -c https://github.com/libgit2/libgit2/archive/v$LIBGIT2VERSION.tar.gz -O - | tar -xz -RUN cd libgit2-$LIBGIT2VERSION && cmake . && make && cp libgit2.so* /tmp && make install WORKDIR /go/src/github.com/projecteru2/core RUN make build && ./eru-core --version -FROM alpine:3.7 +FROM alpine:3.8 MAINTAINER CMGS RUN mkdir /etc/eru/ LABEL ERU=1 version=latest -RUN apk --no-cache add libcurl libssh2 && rm -rf /var/cache/apk/* -COPY --from=BUILD /tmp/libgit2.so.26 /usr/lib/libgit2.so.26 -COPY --from=BUILD /tmp/libgit2.so.0.26.4 /usr/lib/libgit2.so.0.26.4 +RUN apk --no-cache add libcurl libssh2 libgit2 && rm -rf /var/cache/apk/* COPY --from=BUILD /go/src/github.com/projecteru2/core/eru-core /usr/bin/eru-core COPY --from=BUILD /go/src/github.com/projecteru2/core/core.yaml.sample /etc/eru/core.yaml.sample diff --git a/Makefile b/Makefile index 98417385c..6223a5f43 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ GO_LDFLAGS ?= -s -X $(REPO_PATH)/versioninfo.REVISION=$(REVISION) \ grpc: cd ./rpc/gen/; protoc --go_out=plugins=grpc:. core.proto - cd ./rpc/gen/; python -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. core.proto; + cd ./rpc/gen/; python3 -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. core.proto; deps: glide i diff --git a/README.md b/README.md index afd884441..488ed2d91 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,7 @@ Run `make deps` for generating vendor dir. Under macOS we have to install `libgit2` manually, if you using [Homebrew](https://brew.sh/) please install like this: ```shell -# libgit2 version 0.25.1 -cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula -gco 9c527911c8c630355d92df001575cacbb4a8b8b4 libgit2.rb +# libgit2 version 0.27.x HOMEBREW_NO_AUTO_UPDATE=1 brew install libgit2 make deps ``` diff --git a/app.yaml b/app.yaml index a8f293fd8..1bf54491e 100644 --- a/app.yaml +++ b/app.yaml @@ -16,7 +16,7 @@ stages: - pack builds: build: - base: "golang:1.9.1-alpine3.6" + base: "golang:1.10.3-alpine3.8" # only support ssh protocol repo: "git@github.com:projecteru2/core.git" version: "HEAD" @@ -33,7 +33,7 @@ builds: # HTTP_PROXY: # HTTPS_PROXY: pack: - base: alpine:3.6 + base: alpine:3.8 labels: ERU: 1 version: latest diff --git a/glide.lock b/glide.lock index 35e28ed01..4c7a3dc2c 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 521e7204f49ed6faa31599ac176da17dfe21bf19edabb43b289a7ffc96866ff1 -updated: 2018-06-20T11:20:17.279786+08:00 +hash: b2d5dbb92f685f99a1c869a41a5148badd8af12c4ad51d7076c94333af6e2b62 +updated: 2018-07-22T10:16:27.471704+08:00 imports: - name: github.com/Azure/go-ansiterm version: d6e3b3328b783f23731bc4d058875b0371ff8109 @@ -49,7 +49,7 @@ imports: - registry/storage/cache - registry/storage/cache/memory - name: github.com/docker/docker - version: 3dfb26ab3cbf961298f8ce3f94659b5fe4146ceb + version: dc74e31bb211faa189ef83469d7f58dfde0b052a subpackages: - api - api/types @@ -68,7 +68,6 @@ imports: - api/types/versions - api/types/volume - client - - errdefs - pkg/archive - pkg/fileutils - pkg/idtools @@ -103,10 +102,7 @@ imports: version: b4deda0973fb4c70b50d226b1af49f3da59f5265 subpackages: - proto - - ptypes - ptypes/any - - ptypes/duration - - ptypes/timestamp - name: github.com/gorilla/context version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 - name: github.com/gorilla/mux @@ -134,7 +130,7 @@ imports: subpackages: - difflib - name: github.com/sirupsen/logrus - version: c155da19408a8799da419ed3eeb0cb5db0ad5dbc + version: 3e01752db0189b9157070a0e1668a620f9a85da2 - name: github.com/stretchr/objx version: 0ab728f62c7f6fcd754334f7931c2dd659dce1d1 - name: github.com/stretchr/testify @@ -179,35 +175,24 @@ imports: subpackages: - googleapis/rpc/status - name: google.golang.org/grpc - version: 2ab07fd5cb02cfc44fd49af17dd2356ed1647ed4 + version: 6495e8dfeb47dc61ff4c392ba6369fa3f15cdc1b subpackages: - - balancer - - balancer/base - - balancer/roundrobin - codes - - connectivity - credentials - - encoding - - encoding/proto + - grpclb/grpc_lb_v1 - grpclog - health/grpc_health_v1 - internal - - internal/backoff - - internal/channelz - - internal/grpcrand - keepalive - metadata - naming - peer - - resolver - - resolver/dns - - resolver/passthrough - stats - status - tap - transport -- name: gopkg.in/libgit2/git2go.v26 - version: 1f712c6f9608f55e9756073539dec0c9a9a81bf3 +- name: gopkg.in/libgit2/git2go.v27 + version: 9abc0506daca78c054d153321cdb0518c7487a17 - name: gopkg.in/yaml.v2 version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 testImports: [] diff --git a/glide.yaml b/glide.yaml index 9b2d095e3..d1f8d159e 100644 --- a/glide.yaml +++ b/glide.yaml @@ -36,7 +36,7 @@ import: - context - package: google.golang.org/grpc version: master -- package: gopkg.in/libgit2/git2go.v26 +- package: gopkg.in/libgit2/git2go.v27 - package: gopkg.in/yaml.v2 - package: github.com/coreos/go-semver version: ^0.2.0 diff --git a/rpc/gen/core.pb.go b/rpc/gen/core.pb.go index da8301bfb..595ce1141 100644 --- a/rpc/gen/core.pb.go +++ b/rpc/gen/core.pb.go @@ -1,6 +1,58 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: core.proto +/* +Package pb is a generated protocol buffer package. + +It is generated from these files: + core.proto + +It has these top-level messages: + Empty + DeployStatusOptions + DeployStatusMessage + Pod + Pods + ListNetworkOptions + Network + Networks + Node + Nodes + NodeAvailable + Container + ContainerDeployedOptions + Containers + ContainerID + ContainerIDs + RemoveContainerOptions + ReallocOptions + AddPodOptions + RemovePodOptions + GetPodOptions + AddNodeOptions + RemoveNodeOptions + GetNodeOptions + ListNodesOptions + Build + Builds + BuildImageOptions + HookOptions + HealthCheckOptions + EntrypointOptions + DeployOptions + RemoveImageOptions + CopyPaths + CopyOptions + ErrorDetail + BuildImageMessage + CreateContainerMessage + RunAndWaitMessage + RemoveImageMessage + RemoveContainerMessage + ReallocResourceMessage + CopyMessage + RunAndWaitOptions +*/ package pb import proto "github.com/golang/protobuf/proto" @@ -24,67 +76,23 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Empty struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` } -func (m *Empty) Reset() { *m = Empty{} } -func (m *Empty) String() string { return proto.CompactTextString(m) } -func (*Empty) ProtoMessage() {} -func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{0} -} -func (m *Empty) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Empty.Unmarshal(m, b) -} -func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Empty.Marshal(b, m, deterministic) -} -func (dst *Empty) XXX_Merge(src proto.Message) { - xxx_messageInfo_Empty.Merge(dst, src) -} -func (m *Empty) XXX_Size() int { - return xxx_messageInfo_Empty.Size(m) -} -func (m *Empty) XXX_DiscardUnknown() { - xxx_messageInfo_Empty.DiscardUnknown(m) -} - -var xxx_messageInfo_Empty proto.InternalMessageInfo +func (m *Empty) Reset() { *m = Empty{} } +func (m *Empty) String() string { return proto.CompactTextString(m) } +func (*Empty) ProtoMessage() {} +func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } type DeployStatusOptions struct { - Appname string `protobuf:"bytes,1,opt,name=appname,proto3" json:"appname,omitempty"` - Entrypoint string `protobuf:"bytes,2,opt,name=entrypoint,proto3" json:"entrypoint,omitempty"` - Nodename string `protobuf:"bytes,3,opt,name=nodename,proto3" json:"nodename,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DeployStatusOptions) Reset() { *m = DeployStatusOptions{} } -func (m *DeployStatusOptions) String() string { return proto.CompactTextString(m) } -func (*DeployStatusOptions) ProtoMessage() {} -func (*DeployStatusOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{1} -} -func (m *DeployStatusOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeployStatusOptions.Unmarshal(m, b) -} -func (m *DeployStatusOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeployStatusOptions.Marshal(b, m, deterministic) -} -func (dst *DeployStatusOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeployStatusOptions.Merge(dst, src) -} -func (m *DeployStatusOptions) XXX_Size() int { - return xxx_messageInfo_DeployStatusOptions.Size(m) -} -func (m *DeployStatusOptions) XXX_DiscardUnknown() { - xxx_messageInfo_DeployStatusOptions.DiscardUnknown(m) + Appname string `protobuf:"bytes,1,opt,name=appname" json:"appname,omitempty"` + Entrypoint string `protobuf:"bytes,2,opt,name=entrypoint" json:"entrypoint,omitempty"` + Nodename string `protobuf:"bytes,3,opt,name=nodename" json:"nodename,omitempty"` } -var xxx_messageInfo_DeployStatusOptions proto.InternalMessageInfo +func (m *DeployStatusOptions) Reset() { *m = DeployStatusOptions{} } +func (m *DeployStatusOptions) String() string { return proto.CompactTextString(m) } +func (*DeployStatusOptions) ProtoMessage() {} +func (*DeployStatusOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func (m *DeployStatusOptions) GetAppname() string { if m != nil { @@ -108,40 +116,18 @@ func (m *DeployStatusOptions) GetNodename() string { } type DeployStatusMessage struct { - Action string `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - Appname string `protobuf:"bytes,2,opt,name=appname,proto3" json:"appname,omitempty"` - Entrypoint string `protobuf:"bytes,3,opt,name=entrypoint,proto3" json:"entrypoint,omitempty"` - Nodename string `protobuf:"bytes,4,opt,name=nodename,proto3" json:"nodename,omitempty"` - Id string `protobuf:"bytes,5,opt,name=id,proto3" json:"id,omitempty"` - Data []byte `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Action string `protobuf:"bytes,1,opt,name=action" json:"action,omitempty"` + Appname string `protobuf:"bytes,2,opt,name=appname" json:"appname,omitempty"` + Entrypoint string `protobuf:"bytes,3,opt,name=entrypoint" json:"entrypoint,omitempty"` + Nodename string `protobuf:"bytes,4,opt,name=nodename" json:"nodename,omitempty"` + Id string `protobuf:"bytes,5,opt,name=id" json:"id,omitempty"` + Data []byte `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"` } -func (m *DeployStatusMessage) Reset() { *m = DeployStatusMessage{} } -func (m *DeployStatusMessage) String() string { return proto.CompactTextString(m) } -func (*DeployStatusMessage) ProtoMessage() {} -func (*DeployStatusMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{2} -} -func (m *DeployStatusMessage) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeployStatusMessage.Unmarshal(m, b) -} -func (m *DeployStatusMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeployStatusMessage.Marshal(b, m, deterministic) -} -func (dst *DeployStatusMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeployStatusMessage.Merge(dst, src) -} -func (m *DeployStatusMessage) XXX_Size() int { - return xxx_messageInfo_DeployStatusMessage.Size(m) -} -func (m *DeployStatusMessage) XXX_DiscardUnknown() { - xxx_messageInfo_DeployStatusMessage.DiscardUnknown(m) -} - -var xxx_messageInfo_DeployStatusMessage proto.InternalMessageInfo +func (m *DeployStatusMessage) Reset() { *m = DeployStatusMessage{} } +func (m *DeployStatusMessage) String() string { return proto.CompactTextString(m) } +func (*DeployStatusMessage) ProtoMessage() {} +func (*DeployStatusMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } func (m *DeployStatusMessage) GetAction() string { if m != nil { @@ -187,36 +173,14 @@ func (m *DeployStatusMessage) GetData() []byte { // 对的, protobuf 就是这样... type Pod struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Desc string `protobuf:"bytes,2,opt,name=desc,proto3" json:"desc,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Pod) Reset() { *m = Pod{} } -func (m *Pod) String() string { return proto.CompactTextString(m) } -func (*Pod) ProtoMessage() {} -func (*Pod) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{3} -} -func (m *Pod) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Pod.Unmarshal(m, b) -} -func (m *Pod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Pod.Marshal(b, m, deterministic) -} -func (dst *Pod) XXX_Merge(src proto.Message) { - xxx_messageInfo_Pod.Merge(dst, src) -} -func (m *Pod) XXX_Size() int { - return xxx_messageInfo_Pod.Size(m) -} -func (m *Pod) XXX_DiscardUnknown() { - xxx_messageInfo_Pod.DiscardUnknown(m) + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Desc string `protobuf:"bytes,2,opt,name=desc" json:"desc,omitempty"` } -var xxx_messageInfo_Pod proto.InternalMessageInfo +func (m *Pod) Reset() { *m = Pod{} } +func (m *Pod) String() string { return proto.CompactTextString(m) } +func (*Pod) ProtoMessage() {} +func (*Pod) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *Pod) GetName() string { if m != nil { @@ -233,35 +197,13 @@ func (m *Pod) GetDesc() string { } type Pods struct { - Pods []*Pod `protobuf:"bytes,1,rep,name=pods,proto3" json:"pods,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Pods []*Pod `protobuf:"bytes,1,rep,name=pods" json:"pods,omitempty"` } -func (m *Pods) Reset() { *m = Pods{} } -func (m *Pods) String() string { return proto.CompactTextString(m) } -func (*Pods) ProtoMessage() {} -func (*Pods) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{4} -} -func (m *Pods) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Pods.Unmarshal(m, b) -} -func (m *Pods) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Pods.Marshal(b, m, deterministic) -} -func (dst *Pods) XXX_Merge(src proto.Message) { - xxx_messageInfo_Pods.Merge(dst, src) -} -func (m *Pods) XXX_Size() int { - return xxx_messageInfo_Pods.Size(m) -} -func (m *Pods) XXX_DiscardUnknown() { - xxx_messageInfo_Pods.DiscardUnknown(m) -} - -var xxx_messageInfo_Pods proto.InternalMessageInfo +func (m *Pods) Reset() { *m = Pods{} } +func (m *Pods) String() string { return proto.CompactTextString(m) } +func (*Pods) ProtoMessage() {} +func (*Pods) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } func (m *Pods) GetPods() []*Pod { if m != nil { @@ -271,36 +213,14 @@ func (m *Pods) GetPods() []*Pod { } type ListNetworkOptions struct { - Podname string `protobuf:"bytes,1,opt,name=podname,proto3" json:"podname,omitempty"` - Driver string `protobuf:"bytes,2,opt,name=driver,proto3" json:"driver,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ListNetworkOptions) Reset() { *m = ListNetworkOptions{} } -func (m *ListNetworkOptions) String() string { return proto.CompactTextString(m) } -func (*ListNetworkOptions) ProtoMessage() {} -func (*ListNetworkOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{5} -} -func (m *ListNetworkOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ListNetworkOptions.Unmarshal(m, b) -} -func (m *ListNetworkOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ListNetworkOptions.Marshal(b, m, deterministic) -} -func (dst *ListNetworkOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListNetworkOptions.Merge(dst, src) -} -func (m *ListNetworkOptions) XXX_Size() int { - return xxx_messageInfo_ListNetworkOptions.Size(m) -} -func (m *ListNetworkOptions) XXX_DiscardUnknown() { - xxx_messageInfo_ListNetworkOptions.DiscardUnknown(m) + Podname string `protobuf:"bytes,1,opt,name=podname" json:"podname,omitempty"` + Driver string `protobuf:"bytes,2,opt,name=driver" json:"driver,omitempty"` } -var xxx_messageInfo_ListNetworkOptions proto.InternalMessageInfo +func (m *ListNetworkOptions) Reset() { *m = ListNetworkOptions{} } +func (m *ListNetworkOptions) String() string { return proto.CompactTextString(m) } +func (*ListNetworkOptions) ProtoMessage() {} +func (*ListNetworkOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } func (m *ListNetworkOptions) GetPodname() string { if m != nil { @@ -317,36 +237,14 @@ func (m *ListNetworkOptions) GetDriver() string { } type Network struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Subnets []string `protobuf:"bytes,2,rep,name=subnets,proto3" json:"subnets,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Network) Reset() { *m = Network{} } -func (m *Network) String() string { return proto.CompactTextString(m) } -func (*Network) ProtoMessage() {} -func (*Network) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{6} -} -func (m *Network) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Network.Unmarshal(m, b) -} -func (m *Network) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Network.Marshal(b, m, deterministic) -} -func (dst *Network) XXX_Merge(src proto.Message) { - xxx_messageInfo_Network.Merge(dst, src) -} -func (m *Network) XXX_Size() int { - return xxx_messageInfo_Network.Size(m) -} -func (m *Network) XXX_DiscardUnknown() { - xxx_messageInfo_Network.DiscardUnknown(m) + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Subnets []string `protobuf:"bytes,2,rep,name=subnets" json:"subnets,omitempty"` } -var xxx_messageInfo_Network proto.InternalMessageInfo +func (m *Network) Reset() { *m = Network{} } +func (m *Network) String() string { return proto.CompactTextString(m) } +func (*Network) ProtoMessage() {} +func (*Network) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } func (m *Network) GetName() string { if m != nil { @@ -363,35 +261,13 @@ func (m *Network) GetSubnets() []string { } type Networks struct { - Networks []*Network `protobuf:"bytes,1,rep,name=networks,proto3" json:"networks,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Networks []*Network `protobuf:"bytes,1,rep,name=networks" json:"networks,omitempty"` } -func (m *Networks) Reset() { *m = Networks{} } -func (m *Networks) String() string { return proto.CompactTextString(m) } -func (*Networks) ProtoMessage() {} -func (*Networks) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{7} -} -func (m *Networks) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Networks.Unmarshal(m, b) -} -func (m *Networks) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Networks.Marshal(b, m, deterministic) -} -func (dst *Networks) XXX_Merge(src proto.Message) { - xxx_messageInfo_Networks.Merge(dst, src) -} -func (m *Networks) XXX_Size() int { - return xxx_messageInfo_Networks.Size(m) -} -func (m *Networks) XXX_DiscardUnknown() { - xxx_messageInfo_Networks.DiscardUnknown(m) -} - -var xxx_messageInfo_Networks proto.InternalMessageInfo +func (m *Networks) Reset() { *m = Networks{} } +func (m *Networks) String() string { return proto.CompactTextString(m) } +func (*Networks) ProtoMessage() {} +func (*Networks) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } func (m *Networks) GetNetworks() []*Network { if m != nil { @@ -401,42 +277,20 @@ func (m *Networks) GetNetworks() []*Network { } type Node struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Endpoint string `protobuf:"bytes,2,opt,name=endpoint,proto3" json:"endpoint,omitempty"` - Podname string `protobuf:"bytes,3,opt,name=podname,proto3" json:"podname,omitempty"` - Cpu map[string]int64 `protobuf:"bytes,4,rep,name=cpu,proto3" json:"cpu,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` - Memory int64 `protobuf:"varint,5,opt,name=memory,proto3" json:"memory,omitempty"` - Info string `protobuf:"bytes,6,opt,name=info,proto3" json:"info,omitempty"` - Available bool `protobuf:"varint,7,opt,name=available,proto3" json:"available,omitempty"` - Labels map[string]string `protobuf:"bytes,8,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Endpoint string `protobuf:"bytes,2,opt,name=endpoint" json:"endpoint,omitempty"` + Podname string `protobuf:"bytes,3,opt,name=podname" json:"podname,omitempty"` + Cpu map[string]int64 `protobuf:"bytes,4,rep,name=cpu" json:"cpu,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + Memory int64 `protobuf:"varint,5,opt,name=memory" json:"memory,omitempty"` + Info string `protobuf:"bytes,6,opt,name=info" json:"info,omitempty"` + Available bool `protobuf:"varint,7,opt,name=available" json:"available,omitempty"` + Labels map[string]string `protobuf:"bytes,8,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } -func (m *Node) Reset() { *m = Node{} } -func (m *Node) String() string { return proto.CompactTextString(m) } -func (*Node) ProtoMessage() {} -func (*Node) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{8} -} -func (m *Node) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Node.Unmarshal(m, b) -} -func (m *Node) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Node.Marshal(b, m, deterministic) -} -func (dst *Node) XXX_Merge(src proto.Message) { - xxx_messageInfo_Node.Merge(dst, src) -} -func (m *Node) XXX_Size() int { - return xxx_messageInfo_Node.Size(m) -} -func (m *Node) XXX_DiscardUnknown() { - xxx_messageInfo_Node.DiscardUnknown(m) -} - -var xxx_messageInfo_Node proto.InternalMessageInfo +func (m *Node) Reset() { *m = Node{} } +func (m *Node) String() string { return proto.CompactTextString(m) } +func (*Node) ProtoMessage() {} +func (*Node) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } func (m *Node) GetName() string { if m != nil { @@ -495,35 +349,13 @@ func (m *Node) GetLabels() map[string]string { } type Nodes struct { - Nodes []*Node `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Nodes []*Node `protobuf:"bytes,1,rep,name=nodes" json:"nodes,omitempty"` } -func (m *Nodes) Reset() { *m = Nodes{} } -func (m *Nodes) String() string { return proto.CompactTextString(m) } -func (*Nodes) ProtoMessage() {} -func (*Nodes) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{9} -} -func (m *Nodes) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Nodes.Unmarshal(m, b) -} -func (m *Nodes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Nodes.Marshal(b, m, deterministic) -} -func (dst *Nodes) XXX_Merge(src proto.Message) { - xxx_messageInfo_Nodes.Merge(dst, src) -} -func (m *Nodes) XXX_Size() int { - return xxx_messageInfo_Nodes.Size(m) -} -func (m *Nodes) XXX_DiscardUnknown() { - xxx_messageInfo_Nodes.DiscardUnknown(m) -} - -var xxx_messageInfo_Nodes proto.InternalMessageInfo +func (m *Nodes) Reset() { *m = Nodes{} } +func (m *Nodes) String() string { return proto.CompactTextString(m) } +func (*Nodes) ProtoMessage() {} +func (*Nodes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } func (m *Nodes) GetNodes() []*Node { if m != nil { @@ -533,37 +365,15 @@ func (m *Nodes) GetNodes() []*Node { } type NodeAvailable struct { - Nodename string `protobuf:"bytes,1,opt,name=nodename,proto3" json:"nodename,omitempty"` - Podname string `protobuf:"bytes,2,opt,name=podname,proto3" json:"podname,omitempty"` - Available bool `protobuf:"varint,3,opt,name=available,proto3" json:"available,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Nodename string `protobuf:"bytes,1,opt,name=nodename" json:"nodename,omitempty"` + Podname string `protobuf:"bytes,2,opt,name=podname" json:"podname,omitempty"` + Available bool `protobuf:"varint,3,opt,name=available" json:"available,omitempty"` } -func (m *NodeAvailable) Reset() { *m = NodeAvailable{} } -func (m *NodeAvailable) String() string { return proto.CompactTextString(m) } -func (*NodeAvailable) ProtoMessage() {} -func (*NodeAvailable) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{10} -} -func (m *NodeAvailable) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_NodeAvailable.Unmarshal(m, b) -} -func (m *NodeAvailable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_NodeAvailable.Marshal(b, m, deterministic) -} -func (dst *NodeAvailable) XXX_Merge(src proto.Message) { - xxx_messageInfo_NodeAvailable.Merge(dst, src) -} -func (m *NodeAvailable) XXX_Size() int { - return xxx_messageInfo_NodeAvailable.Size(m) -} -func (m *NodeAvailable) XXX_DiscardUnknown() { - xxx_messageInfo_NodeAvailable.DiscardUnknown(m) -} - -var xxx_messageInfo_NodeAvailable proto.InternalMessageInfo +func (m *NodeAvailable) Reset() { *m = NodeAvailable{} } +func (m *NodeAvailable) String() string { return proto.CompactTextString(m) } +func (*NodeAvailable) ProtoMessage() {} +func (*NodeAvailable) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } func (m *NodeAvailable) GetNodename() string { if m != nil { @@ -587,39 +397,17 @@ func (m *NodeAvailable) GetAvailable() bool { } type Container struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Podname string `protobuf:"bytes,2,opt,name=podname,proto3" json:"podname,omitempty"` - Nodename string `protobuf:"bytes,3,opt,name=nodename,proto3" json:"nodename,omitempty"` - Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` - Info string `protobuf:"bytes,5,opt,name=info,proto3" json:"info,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Container) Reset() { *m = Container{} } -func (m *Container) String() string { return proto.CompactTextString(m) } -func (*Container) ProtoMessage() {} -func (*Container) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{11} -} -func (m *Container) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Container.Unmarshal(m, b) -} -func (m *Container) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Container.Marshal(b, m, deterministic) -} -func (dst *Container) XXX_Merge(src proto.Message) { - xxx_messageInfo_Container.Merge(dst, src) -} -func (m *Container) XXX_Size() int { - return xxx_messageInfo_Container.Size(m) -} -func (m *Container) XXX_DiscardUnknown() { - xxx_messageInfo_Container.DiscardUnknown(m) + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + Podname string `protobuf:"bytes,2,opt,name=podname" json:"podname,omitempty"` + Nodename string `protobuf:"bytes,3,opt,name=nodename" json:"nodename,omitempty"` + Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"` + Info string `protobuf:"bytes,5,opt,name=info" json:"info,omitempty"` } -var xxx_messageInfo_Container proto.InternalMessageInfo +func (m *Container) Reset() { *m = Container{} } +func (m *Container) String() string { return proto.CompactTextString(m) } +func (*Container) ProtoMessage() {} +func (*Container) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } func (m *Container) GetId() string { if m != nil { @@ -657,39 +445,17 @@ func (m *Container) GetInfo() string { } type ContainerDeployedOptions struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Appname string `protobuf:"bytes,2,opt,name=appname,proto3" json:"appname,omitempty"` - Entrypoint string `protobuf:"bytes,3,opt,name=entrypoint,proto3" json:"entrypoint,omitempty"` - Nodename string `protobuf:"bytes,4,opt,name=nodename,proto3" json:"nodename,omitempty"` - Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ContainerDeployedOptions) Reset() { *m = ContainerDeployedOptions{} } -func (m *ContainerDeployedOptions) String() string { return proto.CompactTextString(m) } -func (*ContainerDeployedOptions) ProtoMessage() {} -func (*ContainerDeployedOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{12} -} -func (m *ContainerDeployedOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ContainerDeployedOptions.Unmarshal(m, b) -} -func (m *ContainerDeployedOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ContainerDeployedOptions.Marshal(b, m, deterministic) -} -func (dst *ContainerDeployedOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ContainerDeployedOptions.Merge(dst, src) -} -func (m *ContainerDeployedOptions) XXX_Size() int { - return xxx_messageInfo_ContainerDeployedOptions.Size(m) -} -func (m *ContainerDeployedOptions) XXX_DiscardUnknown() { - xxx_messageInfo_ContainerDeployedOptions.DiscardUnknown(m) + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + Appname string `protobuf:"bytes,2,opt,name=appname" json:"appname,omitempty"` + Entrypoint string `protobuf:"bytes,3,opt,name=entrypoint" json:"entrypoint,omitempty"` + Nodename string `protobuf:"bytes,4,opt,name=nodename" json:"nodename,omitempty"` + Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"` } -var xxx_messageInfo_ContainerDeployedOptions proto.InternalMessageInfo +func (m *ContainerDeployedOptions) Reset() { *m = ContainerDeployedOptions{} } +func (m *ContainerDeployedOptions) String() string { return proto.CompactTextString(m) } +func (*ContainerDeployedOptions) ProtoMessage() {} +func (*ContainerDeployedOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } func (m *ContainerDeployedOptions) GetId() string { if m != nil { @@ -727,35 +493,13 @@ func (m *ContainerDeployedOptions) GetData() []byte { } type Containers struct { - Containers []*Container `protobuf:"bytes,1,rep,name=containers,proto3" json:"containers,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Containers) Reset() { *m = Containers{} } -func (m *Containers) String() string { return proto.CompactTextString(m) } -func (*Containers) ProtoMessage() {} -func (*Containers) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{13} -} -func (m *Containers) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Containers.Unmarshal(m, b) -} -func (m *Containers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Containers.Marshal(b, m, deterministic) -} -func (dst *Containers) XXX_Merge(src proto.Message) { - xxx_messageInfo_Containers.Merge(dst, src) -} -func (m *Containers) XXX_Size() int { - return xxx_messageInfo_Containers.Size(m) -} -func (m *Containers) XXX_DiscardUnknown() { - xxx_messageInfo_Containers.DiscardUnknown(m) + Containers []*Container `protobuf:"bytes,1,rep,name=containers" json:"containers,omitempty"` } -var xxx_messageInfo_Containers proto.InternalMessageInfo +func (m *Containers) Reset() { *m = Containers{} } +func (m *Containers) String() string { return proto.CompactTextString(m) } +func (*Containers) ProtoMessage() {} +func (*Containers) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } func (m *Containers) GetContainers() []*Container { if m != nil { @@ -765,35 +509,13 @@ func (m *Containers) GetContainers() []*Container { } type ContainerID struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` } -func (m *ContainerID) Reset() { *m = ContainerID{} } -func (m *ContainerID) String() string { return proto.CompactTextString(m) } -func (*ContainerID) ProtoMessage() {} -func (*ContainerID) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{14} -} -func (m *ContainerID) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ContainerID.Unmarshal(m, b) -} -func (m *ContainerID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ContainerID.Marshal(b, m, deterministic) -} -func (dst *ContainerID) XXX_Merge(src proto.Message) { - xxx_messageInfo_ContainerID.Merge(dst, src) -} -func (m *ContainerID) XXX_Size() int { - return xxx_messageInfo_ContainerID.Size(m) -} -func (m *ContainerID) XXX_DiscardUnknown() { - xxx_messageInfo_ContainerID.DiscardUnknown(m) -} - -var xxx_messageInfo_ContainerID proto.InternalMessageInfo +func (m *ContainerID) Reset() { *m = ContainerID{} } +func (m *ContainerID) String() string { return proto.CompactTextString(m) } +func (*ContainerID) ProtoMessage() {} +func (*ContainerID) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } func (m *ContainerID) GetId() string { if m != nil { @@ -803,35 +525,13 @@ func (m *ContainerID) GetId() string { } type ContainerIDs struct { - Ids []string `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Ids []string `protobuf:"bytes,1,rep,name=ids" json:"ids,omitempty"` } -func (m *ContainerIDs) Reset() { *m = ContainerIDs{} } -func (m *ContainerIDs) String() string { return proto.CompactTextString(m) } -func (*ContainerIDs) ProtoMessage() {} -func (*ContainerIDs) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{15} -} -func (m *ContainerIDs) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ContainerIDs.Unmarshal(m, b) -} -func (m *ContainerIDs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ContainerIDs.Marshal(b, m, deterministic) -} -func (dst *ContainerIDs) XXX_Merge(src proto.Message) { - xxx_messageInfo_ContainerIDs.Merge(dst, src) -} -func (m *ContainerIDs) XXX_Size() int { - return xxx_messageInfo_ContainerIDs.Size(m) -} -func (m *ContainerIDs) XXX_DiscardUnknown() { - xxx_messageInfo_ContainerIDs.DiscardUnknown(m) -} - -var xxx_messageInfo_ContainerIDs proto.InternalMessageInfo +func (m *ContainerIDs) Reset() { *m = ContainerIDs{} } +func (m *ContainerIDs) String() string { return proto.CompactTextString(m) } +func (*ContainerIDs) ProtoMessage() {} +func (*ContainerIDs) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } func (m *ContainerIDs) GetIds() []string { if m != nil { @@ -841,36 +541,14 @@ func (m *ContainerIDs) GetIds() []string { } type RemoveContainerOptions struct { - Ids []string `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids,omitempty"` - Force bool `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *RemoveContainerOptions) Reset() { *m = RemoveContainerOptions{} } -func (m *RemoveContainerOptions) String() string { return proto.CompactTextString(m) } -func (*RemoveContainerOptions) ProtoMessage() {} -func (*RemoveContainerOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{16} -} -func (m *RemoveContainerOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RemoveContainerOptions.Unmarshal(m, b) -} -func (m *RemoveContainerOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RemoveContainerOptions.Marshal(b, m, deterministic) -} -func (dst *RemoveContainerOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveContainerOptions.Merge(dst, src) -} -func (m *RemoveContainerOptions) XXX_Size() int { - return xxx_messageInfo_RemoveContainerOptions.Size(m) -} -func (m *RemoveContainerOptions) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveContainerOptions.DiscardUnknown(m) + Ids []string `protobuf:"bytes,1,rep,name=ids" json:"ids,omitempty"` + Force bool `protobuf:"varint,2,opt,name=force" json:"force,omitempty"` } -var xxx_messageInfo_RemoveContainerOptions proto.InternalMessageInfo +func (m *RemoveContainerOptions) Reset() { *m = RemoveContainerOptions{} } +func (m *RemoveContainerOptions) String() string { return proto.CompactTextString(m) } +func (*RemoveContainerOptions) ProtoMessage() {} +func (*RemoveContainerOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } func (m *RemoveContainerOptions) GetIds() []string { if m != nil { @@ -887,37 +565,15 @@ func (m *RemoveContainerOptions) GetForce() bool { } type ReallocOptions struct { - Ids []string `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids,omitempty"` - Cpu float64 `protobuf:"fixed64,2,opt,name=cpu,proto3" json:"cpu,omitempty"` - Mem int64 `protobuf:"varint,3,opt,name=mem,proto3" json:"mem,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ReallocOptions) Reset() { *m = ReallocOptions{} } -func (m *ReallocOptions) String() string { return proto.CompactTextString(m) } -func (*ReallocOptions) ProtoMessage() {} -func (*ReallocOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{17} -} -func (m *ReallocOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ReallocOptions.Unmarshal(m, b) -} -func (m *ReallocOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ReallocOptions.Marshal(b, m, deterministic) -} -func (dst *ReallocOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReallocOptions.Merge(dst, src) -} -func (m *ReallocOptions) XXX_Size() int { - return xxx_messageInfo_ReallocOptions.Size(m) -} -func (m *ReallocOptions) XXX_DiscardUnknown() { - xxx_messageInfo_ReallocOptions.DiscardUnknown(m) + Ids []string `protobuf:"bytes,1,rep,name=ids" json:"ids,omitempty"` + Cpu float64 `protobuf:"fixed64,2,opt,name=cpu" json:"cpu,omitempty"` + Mem int64 `protobuf:"varint,3,opt,name=mem" json:"mem,omitempty"` } -var xxx_messageInfo_ReallocOptions proto.InternalMessageInfo +func (m *ReallocOptions) Reset() { *m = ReallocOptions{} } +func (m *ReallocOptions) String() string { return proto.CompactTextString(m) } +func (*ReallocOptions) ProtoMessage() {} +func (*ReallocOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } func (m *ReallocOptions) GetIds() []string { if m != nil { @@ -941,37 +597,15 @@ func (m *ReallocOptions) GetMem() int64 { } type AddPodOptions struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Favor string `protobuf:"bytes,2,opt,name=favor,proto3" json:"favor,omitempty"` - Desc string `protobuf:"bytes,3,opt,name=desc,proto3" json:"desc,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *AddPodOptions) Reset() { *m = AddPodOptions{} } -func (m *AddPodOptions) String() string { return proto.CompactTextString(m) } -func (*AddPodOptions) ProtoMessage() {} -func (*AddPodOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{18} -} -func (m *AddPodOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AddPodOptions.Unmarshal(m, b) -} -func (m *AddPodOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AddPodOptions.Marshal(b, m, deterministic) -} -func (dst *AddPodOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddPodOptions.Merge(dst, src) -} -func (m *AddPodOptions) XXX_Size() int { - return xxx_messageInfo_AddPodOptions.Size(m) -} -func (m *AddPodOptions) XXX_DiscardUnknown() { - xxx_messageInfo_AddPodOptions.DiscardUnknown(m) + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Favor string `protobuf:"bytes,2,opt,name=favor" json:"favor,omitempty"` + Desc string `protobuf:"bytes,3,opt,name=desc" json:"desc,omitempty"` } -var xxx_messageInfo_AddPodOptions proto.InternalMessageInfo +func (m *AddPodOptions) Reset() { *m = AddPodOptions{} } +func (m *AddPodOptions) String() string { return proto.CompactTextString(m) } +func (*AddPodOptions) ProtoMessage() {} +func (*AddPodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } func (m *AddPodOptions) GetName() string { if m != nil { @@ -995,35 +629,13 @@ func (m *AddPodOptions) GetDesc() string { } type RemovePodOptions struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` } -func (m *RemovePodOptions) Reset() { *m = RemovePodOptions{} } -func (m *RemovePodOptions) String() string { return proto.CompactTextString(m) } -func (*RemovePodOptions) ProtoMessage() {} -func (*RemovePodOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{19} -} -func (m *RemovePodOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RemovePodOptions.Unmarshal(m, b) -} -func (m *RemovePodOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RemovePodOptions.Marshal(b, m, deterministic) -} -func (dst *RemovePodOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemovePodOptions.Merge(dst, src) -} -func (m *RemovePodOptions) XXX_Size() int { - return xxx_messageInfo_RemovePodOptions.Size(m) -} -func (m *RemovePodOptions) XXX_DiscardUnknown() { - xxx_messageInfo_RemovePodOptions.DiscardUnknown(m) -} - -var xxx_messageInfo_RemovePodOptions proto.InternalMessageInfo +func (m *RemovePodOptions) Reset() { *m = RemovePodOptions{} } +func (m *RemovePodOptions) String() string { return proto.CompactTextString(m) } +func (*RemovePodOptions) ProtoMessage() {} +func (*RemovePodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} } func (m *RemovePodOptions) GetName() string { if m != nil { @@ -1033,35 +645,13 @@ func (m *RemovePodOptions) GetName() string { } type GetPodOptions struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetPodOptions) Reset() { *m = GetPodOptions{} } -func (m *GetPodOptions) String() string { return proto.CompactTextString(m) } -func (*GetPodOptions) ProtoMessage() {} -func (*GetPodOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{20} -} -func (m *GetPodOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetPodOptions.Unmarshal(m, b) -} -func (m *GetPodOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetPodOptions.Marshal(b, m, deterministic) -} -func (dst *GetPodOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetPodOptions.Merge(dst, src) -} -func (m *GetPodOptions) XXX_Size() int { - return xxx_messageInfo_GetPodOptions.Size(m) -} -func (m *GetPodOptions) XXX_DiscardUnknown() { - xxx_messageInfo_GetPodOptions.DiscardUnknown(m) + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` } -var xxx_messageInfo_GetPodOptions proto.InternalMessageInfo +func (m *GetPodOptions) Reset() { *m = GetPodOptions{} } +func (m *GetPodOptions) String() string { return proto.CompactTextString(m) } +func (*GetPodOptions) ProtoMessage() {} +func (*GetPodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} } func (m *GetPodOptions) GetName() string { if m != nil { @@ -1071,44 +661,22 @@ func (m *GetPodOptions) GetName() string { } type AddNodeOptions struct { - Nodename string `protobuf:"bytes,1,opt,name=nodename,proto3" json:"nodename,omitempty"` - Endpoint string `protobuf:"bytes,2,opt,name=endpoint,proto3" json:"endpoint,omitempty"` - Podname string `protobuf:"bytes,3,opt,name=podname,proto3" json:"podname,omitempty"` - Ca string `protobuf:"bytes,4,opt,name=ca,proto3" json:"ca,omitempty"` - Cert string `protobuf:"bytes,5,opt,name=cert,proto3" json:"cert,omitempty"` - Key string `protobuf:"bytes,6,opt,name=key,proto3" json:"key,omitempty"` - Cpu int32 `protobuf:"varint,7,opt,name=cpu,proto3" json:"cpu,omitempty"` - Share int64 `protobuf:"varint,8,opt,name=share,proto3" json:"share,omitempty"` - Memory int64 `protobuf:"varint,9,opt,name=memory,proto3" json:"memory,omitempty"` - Labels map[string]string `protobuf:"bytes,10,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *AddNodeOptions) Reset() { *m = AddNodeOptions{} } -func (m *AddNodeOptions) String() string { return proto.CompactTextString(m) } -func (*AddNodeOptions) ProtoMessage() {} -func (*AddNodeOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{21} -} -func (m *AddNodeOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AddNodeOptions.Unmarshal(m, b) -} -func (m *AddNodeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AddNodeOptions.Marshal(b, m, deterministic) -} -func (dst *AddNodeOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddNodeOptions.Merge(dst, src) -} -func (m *AddNodeOptions) XXX_Size() int { - return xxx_messageInfo_AddNodeOptions.Size(m) -} -func (m *AddNodeOptions) XXX_DiscardUnknown() { - xxx_messageInfo_AddNodeOptions.DiscardUnknown(m) -} - -var xxx_messageInfo_AddNodeOptions proto.InternalMessageInfo + Nodename string `protobuf:"bytes,1,opt,name=nodename" json:"nodename,omitempty"` + Endpoint string `protobuf:"bytes,2,opt,name=endpoint" json:"endpoint,omitempty"` + Podname string `protobuf:"bytes,3,opt,name=podname" json:"podname,omitempty"` + Ca string `protobuf:"bytes,4,opt,name=ca" json:"ca,omitempty"` + Cert string `protobuf:"bytes,5,opt,name=cert" json:"cert,omitempty"` + Key string `protobuf:"bytes,6,opt,name=key" json:"key,omitempty"` + Cpu int32 `protobuf:"varint,7,opt,name=cpu" json:"cpu,omitempty"` + Share int64 `protobuf:"varint,8,opt,name=share" json:"share,omitempty"` + Memory int64 `protobuf:"varint,9,opt,name=memory" json:"memory,omitempty"` + Labels map[string]string `protobuf:"bytes,10,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` +} + +func (m *AddNodeOptions) Reset() { *m = AddNodeOptions{} } +func (m *AddNodeOptions) String() string { return proto.CompactTextString(m) } +func (*AddNodeOptions) ProtoMessage() {} +func (*AddNodeOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} } func (m *AddNodeOptions) GetNodename() string { if m != nil { @@ -1181,36 +749,14 @@ func (m *AddNodeOptions) GetLabels() map[string]string { } type RemoveNodeOptions struct { - Nodename string `protobuf:"bytes,1,opt,name=nodename,proto3" json:"nodename,omitempty"` - Podname string `protobuf:"bytes,2,opt,name=podname,proto3" json:"podname,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Nodename string `protobuf:"bytes,1,opt,name=nodename" json:"nodename,omitempty"` + Podname string `protobuf:"bytes,2,opt,name=podname" json:"podname,omitempty"` } -func (m *RemoveNodeOptions) Reset() { *m = RemoveNodeOptions{} } -func (m *RemoveNodeOptions) String() string { return proto.CompactTextString(m) } -func (*RemoveNodeOptions) ProtoMessage() {} -func (*RemoveNodeOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{22} -} -func (m *RemoveNodeOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RemoveNodeOptions.Unmarshal(m, b) -} -func (m *RemoveNodeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RemoveNodeOptions.Marshal(b, m, deterministic) -} -func (dst *RemoveNodeOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveNodeOptions.Merge(dst, src) -} -func (m *RemoveNodeOptions) XXX_Size() int { - return xxx_messageInfo_RemoveNodeOptions.Size(m) -} -func (m *RemoveNodeOptions) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveNodeOptions.DiscardUnknown(m) -} - -var xxx_messageInfo_RemoveNodeOptions proto.InternalMessageInfo +func (m *RemoveNodeOptions) Reset() { *m = RemoveNodeOptions{} } +func (m *RemoveNodeOptions) String() string { return proto.CompactTextString(m) } +func (*RemoveNodeOptions) ProtoMessage() {} +func (*RemoveNodeOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} } func (m *RemoveNodeOptions) GetNodename() string { if m != nil { @@ -1227,36 +773,14 @@ func (m *RemoveNodeOptions) GetPodname() string { } type GetNodeOptions struct { - Podname string `protobuf:"bytes,1,opt,name=podname,proto3" json:"podname,omitempty"` - Nodename string `protobuf:"bytes,2,opt,name=nodename,proto3" json:"nodename,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetNodeOptions) Reset() { *m = GetNodeOptions{} } -func (m *GetNodeOptions) String() string { return proto.CompactTextString(m) } -func (*GetNodeOptions) ProtoMessage() {} -func (*GetNodeOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{23} -} -func (m *GetNodeOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetNodeOptions.Unmarshal(m, b) -} -func (m *GetNodeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetNodeOptions.Marshal(b, m, deterministic) -} -func (dst *GetNodeOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetNodeOptions.Merge(dst, src) -} -func (m *GetNodeOptions) XXX_Size() int { - return xxx_messageInfo_GetNodeOptions.Size(m) -} -func (m *GetNodeOptions) XXX_DiscardUnknown() { - xxx_messageInfo_GetNodeOptions.DiscardUnknown(m) + Podname string `protobuf:"bytes,1,opt,name=podname" json:"podname,omitempty"` + Nodename string `protobuf:"bytes,2,opt,name=nodename" json:"nodename,omitempty"` } -var xxx_messageInfo_GetNodeOptions proto.InternalMessageInfo +func (m *GetNodeOptions) Reset() { *m = GetNodeOptions{} } +func (m *GetNodeOptions) String() string { return proto.CompactTextString(m) } +func (*GetNodeOptions) ProtoMessage() {} +func (*GetNodeOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} } func (m *GetNodeOptions) GetPodname() string { if m != nil { @@ -1273,36 +797,14 @@ func (m *GetNodeOptions) GetNodename() string { } type ListNodesOptions struct { - Podname string `protobuf:"bytes,1,opt,name=podname,proto3" json:"podname,omitempty"` - All bool `protobuf:"varint,2,opt,name=all,proto3" json:"all,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Podname string `protobuf:"bytes,1,opt,name=podname" json:"podname,omitempty"` + All bool `protobuf:"varint,2,opt,name=all" json:"all,omitempty"` } -func (m *ListNodesOptions) Reset() { *m = ListNodesOptions{} } -func (m *ListNodesOptions) String() string { return proto.CompactTextString(m) } -func (*ListNodesOptions) ProtoMessage() {} -func (*ListNodesOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{24} -} -func (m *ListNodesOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ListNodesOptions.Unmarshal(m, b) -} -func (m *ListNodesOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ListNodesOptions.Marshal(b, m, deterministic) -} -func (dst *ListNodesOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListNodesOptions.Merge(dst, src) -} -func (m *ListNodesOptions) XXX_Size() int { - return xxx_messageInfo_ListNodesOptions.Size(m) -} -func (m *ListNodesOptions) XXX_DiscardUnknown() { - xxx_messageInfo_ListNodesOptions.DiscardUnknown(m) -} - -var xxx_messageInfo_ListNodesOptions proto.InternalMessageInfo +func (m *ListNodesOptions) Reset() { *m = ListNodesOptions{} } +func (m *ListNodesOptions) String() string { return proto.CompactTextString(m) } +func (*ListNodesOptions) ProtoMessage() {} +func (*ListNodesOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} } func (m *ListNodesOptions) GetPodname() string { if m != nil { @@ -1319,45 +821,23 @@ func (m *ListNodesOptions) GetAll() bool { } type Build struct { - Base string `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` - Repo string `protobuf:"bytes,2,opt,name=repo,proto3" json:"repo,omitempty"` - Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` - Dir string `protobuf:"bytes,4,opt,name=dir,proto3" json:"dir,omitempty"` - Submodule bool `protobuf:"varint,5,opt,name=submodule,proto3" json:"submodule,omitempty"` - Commands []string `protobuf:"bytes,6,rep,name=commands,proto3" json:"commands,omitempty"` - Envs map[string]string `protobuf:"bytes,7,rep,name=envs,proto3" json:"envs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Args map[string]string `protobuf:"bytes,8,rep,name=args,proto3" json:"args,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Labels map[string]string `protobuf:"bytes,9,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Artifacts map[string]string `protobuf:"bytes,10,rep,name=artifacts,proto3" json:"artifacts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Cache map[string]string `protobuf:"bytes,11,rep,name=cache,proto3" json:"cache,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Build) Reset() { *m = Build{} } -func (m *Build) String() string { return proto.CompactTextString(m) } -func (*Build) ProtoMessage() {} -func (*Build) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{25} -} -func (m *Build) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Build.Unmarshal(m, b) -} -func (m *Build) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Build.Marshal(b, m, deterministic) -} -func (dst *Build) XXX_Merge(src proto.Message) { - xxx_messageInfo_Build.Merge(dst, src) -} -func (m *Build) XXX_Size() int { - return xxx_messageInfo_Build.Size(m) -} -func (m *Build) XXX_DiscardUnknown() { - xxx_messageInfo_Build.DiscardUnknown(m) -} - -var xxx_messageInfo_Build proto.InternalMessageInfo + Base string `protobuf:"bytes,1,opt,name=base" json:"base,omitempty"` + Repo string `protobuf:"bytes,2,opt,name=repo" json:"repo,omitempty"` + Version string `protobuf:"bytes,3,opt,name=version" json:"version,omitempty"` + Dir string `protobuf:"bytes,4,opt,name=dir" json:"dir,omitempty"` + Submodule bool `protobuf:"varint,5,opt,name=submodule" json:"submodule,omitempty"` + Commands []string `protobuf:"bytes,6,rep,name=commands" json:"commands,omitempty"` + Envs map[string]string `protobuf:"bytes,7,rep,name=envs" json:"envs,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Args map[string]string `protobuf:"bytes,8,rep,name=args" json:"args,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Labels map[string]string `protobuf:"bytes,9,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Artifacts map[string]string `protobuf:"bytes,10,rep,name=artifacts" json:"artifacts,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Cache map[string]string `protobuf:"bytes,11,rep,name=cache" json:"cache,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` +} + +func (m *Build) Reset() { *m = Build{} } +func (m *Build) String() string { return proto.CompactTextString(m) } +func (*Build) ProtoMessage() {} +func (*Build) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} } func (m *Build) GetBase() string { if m != nil { @@ -1437,36 +917,14 @@ func (m *Build) GetCache() map[string]string { } type Builds struct { - Stages []string `protobuf:"bytes,1,rep,name=stages,proto3" json:"stages,omitempty"` - Builds map[string]*Build `protobuf:"bytes,2,rep,name=builds,proto3" json:"builds,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Stages []string `protobuf:"bytes,1,rep,name=stages" json:"stages,omitempty"` + Builds map[string]*Build `protobuf:"bytes,2,rep,name=builds" json:"builds,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } -func (m *Builds) Reset() { *m = Builds{} } -func (m *Builds) String() string { return proto.CompactTextString(m) } -func (*Builds) ProtoMessage() {} -func (*Builds) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{26} -} -func (m *Builds) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Builds.Unmarshal(m, b) -} -func (m *Builds) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Builds.Marshal(b, m, deterministic) -} -func (dst *Builds) XXX_Merge(src proto.Message) { - xxx_messageInfo_Builds.Merge(dst, src) -} -func (m *Builds) XXX_Size() int { - return xxx_messageInfo_Builds.Size(m) -} -func (m *Builds) XXX_DiscardUnknown() { - xxx_messageInfo_Builds.DiscardUnknown(m) -} - -var xxx_messageInfo_Builds proto.InternalMessageInfo +func (m *Builds) Reset() { *m = Builds{} } +func (m *Builds) String() string { return proto.CompactTextString(m) } +func (*Builds) ProtoMessage() {} +func (*Builds) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} } func (m *Builds) GetStages() []string { if m != nil { @@ -1483,39 +941,17 @@ func (m *Builds) GetBuilds() map[string]*Build { } type BuildImageOptions struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - User string `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"` - Uid int32 `protobuf:"varint,3,opt,name=uid,proto3" json:"uid,omitempty"` - Tag string `protobuf:"bytes,4,opt,name=tag,proto3" json:"tag,omitempty"` - Builds *Builds `protobuf:"bytes,5,opt,name=builds,proto3" json:"builds,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *BuildImageOptions) Reset() { *m = BuildImageOptions{} } -func (m *BuildImageOptions) String() string { return proto.CompactTextString(m) } -func (*BuildImageOptions) ProtoMessage() {} -func (*BuildImageOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{27} -} -func (m *BuildImageOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_BuildImageOptions.Unmarshal(m, b) -} -func (m *BuildImageOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_BuildImageOptions.Marshal(b, m, deterministic) -} -func (dst *BuildImageOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_BuildImageOptions.Merge(dst, src) -} -func (m *BuildImageOptions) XXX_Size() int { - return xxx_messageInfo_BuildImageOptions.Size(m) -} -func (m *BuildImageOptions) XXX_DiscardUnknown() { - xxx_messageInfo_BuildImageOptions.DiscardUnknown(m) + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + User string `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"` + Uid int32 `protobuf:"varint,3,opt,name=uid" json:"uid,omitempty"` + Tag string `protobuf:"bytes,4,opt,name=tag" json:"tag,omitempty"` + Builds *Builds `protobuf:"bytes,5,opt,name=builds" json:"builds,omitempty"` } -var xxx_messageInfo_BuildImageOptions proto.InternalMessageInfo +func (m *BuildImageOptions) Reset() { *m = BuildImageOptions{} } +func (m *BuildImageOptions) String() string { return proto.CompactTextString(m) } +func (*BuildImageOptions) ProtoMessage() {} +func (*BuildImageOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} } func (m *BuildImageOptions) GetName() string { if m != nil { @@ -1553,37 +989,15 @@ func (m *BuildImageOptions) GetBuilds() *Builds { } type HookOptions struct { - AfterStart []string `protobuf:"bytes,1,rep,name=after_start,json=afterStart,proto3" json:"after_start,omitempty"` - BeforeStop []string `protobuf:"bytes,2,rep,name=before_stop,json=beforeStop,proto3" json:"before_stop,omitempty"` - Force bool `protobuf:"varint,3,opt,name=force,proto3" json:"force,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *HookOptions) Reset() { *m = HookOptions{} } -func (m *HookOptions) String() string { return proto.CompactTextString(m) } -func (*HookOptions) ProtoMessage() {} -func (*HookOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{28} -} -func (m *HookOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_HookOptions.Unmarshal(m, b) -} -func (m *HookOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_HookOptions.Marshal(b, m, deterministic) -} -func (dst *HookOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_HookOptions.Merge(dst, src) -} -func (m *HookOptions) XXX_Size() int { - return xxx_messageInfo_HookOptions.Size(m) -} -func (m *HookOptions) XXX_DiscardUnknown() { - xxx_messageInfo_HookOptions.DiscardUnknown(m) + AfterStart []string `protobuf:"bytes,1,rep,name=after_start,json=afterStart" json:"after_start,omitempty"` + BeforeStop []string `protobuf:"bytes,2,rep,name=before_stop,json=beforeStop" json:"before_stop,omitempty"` + Force bool `protobuf:"varint,3,opt,name=force" json:"force,omitempty"` } -var xxx_messageInfo_HookOptions proto.InternalMessageInfo +func (m *HookOptions) Reset() { *m = HookOptions{} } +func (m *HookOptions) String() string { return proto.CompactTextString(m) } +func (*HookOptions) ProtoMessage() {} +func (*HookOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} } func (m *HookOptions) GetAfterStart() []string { if m != nil { @@ -1607,38 +1021,16 @@ func (m *HookOptions) GetForce() bool { } type HealthCheckOptions struct { - TcpPorts []string `protobuf:"bytes,1,rep,name=tcp_ports,json=tcpPorts,proto3" json:"tcp_ports,omitempty"` - HttpPort string `protobuf:"bytes,2,opt,name=http_port,json=httpPort,proto3" json:"http_port,omitempty"` - Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` - Code int32 `protobuf:"varint,4,opt,name=code,proto3" json:"code,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *HealthCheckOptions) Reset() { *m = HealthCheckOptions{} } -func (m *HealthCheckOptions) String() string { return proto.CompactTextString(m) } -func (*HealthCheckOptions) ProtoMessage() {} -func (*HealthCheckOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{29} -} -func (m *HealthCheckOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_HealthCheckOptions.Unmarshal(m, b) -} -func (m *HealthCheckOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_HealthCheckOptions.Marshal(b, m, deterministic) -} -func (dst *HealthCheckOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_HealthCheckOptions.Merge(dst, src) -} -func (m *HealthCheckOptions) XXX_Size() int { - return xxx_messageInfo_HealthCheckOptions.Size(m) -} -func (m *HealthCheckOptions) XXX_DiscardUnknown() { - xxx_messageInfo_HealthCheckOptions.DiscardUnknown(m) + TcpPorts []string `protobuf:"bytes,1,rep,name=tcp_ports,json=tcpPorts" json:"tcp_ports,omitempty"` + HttpPort string `protobuf:"bytes,2,opt,name=http_port,json=httpPort" json:"http_port,omitempty"` + Url string `protobuf:"bytes,3,opt,name=url" json:"url,omitempty"` + Code int32 `protobuf:"varint,4,opt,name=code" json:"code,omitempty"` } -var xxx_messageInfo_HealthCheckOptions proto.InternalMessageInfo +func (m *HealthCheckOptions) Reset() { *m = HealthCheckOptions{} } +func (m *HealthCheckOptions) String() string { return proto.CompactTextString(m) } +func (*HealthCheckOptions) ProtoMessage() {} +func (*HealthCheckOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} } func (m *HealthCheckOptions) GetTcpPorts() []string { if m != nil { @@ -1669,43 +1061,21 @@ func (m *HealthCheckOptions) GetCode() int32 { } type EntrypointOptions struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Command string `protobuf:"bytes,2,opt,name=command,proto3" json:"command,omitempty"` - Privileged bool `protobuf:"varint,3,opt,name=privileged,proto3" json:"privileged,omitempty"` - Dir string `protobuf:"bytes,4,opt,name=dir,proto3" json:"dir,omitempty"` - LogConfig string `protobuf:"bytes,5,opt,name=log_config,json=logConfig,proto3" json:"log_config,omitempty"` - Publish []string `protobuf:"bytes,6,rep,name=publish,proto3" json:"publish,omitempty"` - Healthcheck *HealthCheckOptions `protobuf:"bytes,7,opt,name=healthcheck,proto3" json:"healthcheck,omitempty"` - Hook *HookOptions `protobuf:"bytes,8,opt,name=hook,proto3" json:"hook,omitempty"` - RestartPolicy string `protobuf:"bytes,9,opt,name=restart_policy,json=restartPolicy,proto3" json:"restart_policy,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *EntrypointOptions) Reset() { *m = EntrypointOptions{} } -func (m *EntrypointOptions) String() string { return proto.CompactTextString(m) } -func (*EntrypointOptions) ProtoMessage() {} -func (*EntrypointOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{30} -} -func (m *EntrypointOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EntrypointOptions.Unmarshal(m, b) -} -func (m *EntrypointOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EntrypointOptions.Marshal(b, m, deterministic) -} -func (dst *EntrypointOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_EntrypointOptions.Merge(dst, src) -} -func (m *EntrypointOptions) XXX_Size() int { - return xxx_messageInfo_EntrypointOptions.Size(m) -} -func (m *EntrypointOptions) XXX_DiscardUnknown() { - xxx_messageInfo_EntrypointOptions.DiscardUnknown(m) -} - -var xxx_messageInfo_EntrypointOptions proto.InternalMessageInfo + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Command string `protobuf:"bytes,2,opt,name=command" json:"command,omitempty"` + Privileged bool `protobuf:"varint,3,opt,name=privileged" json:"privileged,omitempty"` + Dir string `protobuf:"bytes,4,opt,name=dir" json:"dir,omitempty"` + LogConfig string `protobuf:"bytes,5,opt,name=log_config,json=logConfig" json:"log_config,omitempty"` + Publish []string `protobuf:"bytes,6,rep,name=publish" json:"publish,omitempty"` + Healthcheck *HealthCheckOptions `protobuf:"bytes,7,opt,name=healthcheck" json:"healthcheck,omitempty"` + Hook *HookOptions `protobuf:"bytes,8,opt,name=hook" json:"hook,omitempty"` + RestartPolicy string `protobuf:"bytes,9,opt,name=restart_policy,json=restartPolicy" json:"restart_policy,omitempty"` +} + +func (m *EntrypointOptions) Reset() { *m = EntrypointOptions{} } +func (m *EntrypointOptions) String() string { return proto.CompactTextString(m) } +func (*EntrypointOptions) ProtoMessage() {} +func (*EntrypointOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} } func (m *EntrypointOptions) GetName() string { if m != nil { @@ -1771,56 +1141,34 @@ func (m *EntrypointOptions) GetRestartPolicy() string { } type DeployOptions struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Entrypoint *EntrypointOptions `protobuf:"bytes,2,opt,name=entrypoint,proto3" json:"entrypoint,omitempty"` - Podname string `protobuf:"bytes,3,opt,name=podname,proto3" json:"podname,omitempty"` - Nodename string `protobuf:"bytes,4,opt,name=nodename,proto3" json:"nodename,omitempty"` - Image string `protobuf:"bytes,5,opt,name=image,proto3" json:"image,omitempty"` - ExtraArgs string `protobuf:"bytes,6,opt,name=extra_args,json=extraArgs,proto3" json:"extra_args,omitempty"` - CpuQuota float64 `protobuf:"fixed64,7,opt,name=cpu_quota,json=cpuQuota,proto3" json:"cpu_quota,omitempty"` - Memory int64 `protobuf:"varint,8,opt,name=memory,proto3" json:"memory,omitempty"` - Count int32 `protobuf:"varint,9,opt,name=count,proto3" json:"count,omitempty"` - Env []string `protobuf:"bytes,10,rep,name=env,proto3" json:"env,omitempty"` - Dns []string `protobuf:"bytes,11,rep,name=dns,proto3" json:"dns,omitempty"` - ExtraHosts []string `protobuf:"bytes,12,rep,name=extra_hosts,json=extraHosts,proto3" json:"extra_hosts,omitempty"` - Volumes []string `protobuf:"bytes,13,rep,name=volumes,proto3" json:"volumes,omitempty"` - Networks map[string]string `protobuf:"bytes,14,rep,name=networks,proto3" json:"networks,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Networkmode string `protobuf:"bytes,15,opt,name=networkmode,proto3" json:"networkmode,omitempty"` - User string `protobuf:"bytes,16,opt,name=user,proto3" json:"user,omitempty"` - Debug bool `protobuf:"varint,17,opt,name=debug,proto3" json:"debug,omitempty"` - OpenStdin bool `protobuf:"varint,18,opt,name=openStdin,proto3" json:"openStdin,omitempty"` - Meta map[string]string `protobuf:"bytes,19,rep,name=meta,proto3" json:"meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Nodelabels map[string]string `protobuf:"bytes,20,rep,name=nodelabels,proto3" json:"nodelabels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - DeployMethod string `protobuf:"bytes,21,opt,name=deploy_method,json=deployMethod,proto3" json:"deploy_method,omitempty"` - Data map[string][]byte `protobuf:"bytes,22,rep,name=data,proto3" json:"data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DeployOptions) Reset() { *m = DeployOptions{} } -func (m *DeployOptions) String() string { return proto.CompactTextString(m) } -func (*DeployOptions) ProtoMessage() {} -func (*DeployOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{31} -} -func (m *DeployOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeployOptions.Unmarshal(m, b) -} -func (m *DeployOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeployOptions.Marshal(b, m, deterministic) -} -func (dst *DeployOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeployOptions.Merge(dst, src) -} -func (m *DeployOptions) XXX_Size() int { - return xxx_messageInfo_DeployOptions.Size(m) -} -func (m *DeployOptions) XXX_DiscardUnknown() { - xxx_messageInfo_DeployOptions.DiscardUnknown(m) -} - -var xxx_messageInfo_DeployOptions proto.InternalMessageInfo + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Entrypoint *EntrypointOptions `protobuf:"bytes,2,opt,name=entrypoint" json:"entrypoint,omitempty"` + Podname string `protobuf:"bytes,3,opt,name=podname" json:"podname,omitempty"` + Nodename string `protobuf:"bytes,4,opt,name=nodename" json:"nodename,omitempty"` + Image string `protobuf:"bytes,5,opt,name=image" json:"image,omitempty"` + ExtraArgs string `protobuf:"bytes,6,opt,name=extra_args,json=extraArgs" json:"extra_args,omitempty"` + CpuQuota float64 `protobuf:"fixed64,7,opt,name=cpu_quota,json=cpuQuota" json:"cpu_quota,omitempty"` + Memory int64 `protobuf:"varint,8,opt,name=memory" json:"memory,omitempty"` + Count int32 `protobuf:"varint,9,opt,name=count" json:"count,omitempty"` + Env []string `protobuf:"bytes,10,rep,name=env" json:"env,omitempty"` + Dns []string `protobuf:"bytes,11,rep,name=dns" json:"dns,omitempty"` + ExtraHosts []string `protobuf:"bytes,12,rep,name=extra_hosts,json=extraHosts" json:"extra_hosts,omitempty"` + Volumes []string `protobuf:"bytes,13,rep,name=volumes" json:"volumes,omitempty"` + Networks map[string]string `protobuf:"bytes,14,rep,name=networks" json:"networks,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Networkmode string `protobuf:"bytes,15,opt,name=networkmode" json:"networkmode,omitempty"` + User string `protobuf:"bytes,16,opt,name=user" json:"user,omitempty"` + Debug bool `protobuf:"varint,17,opt,name=debug" json:"debug,omitempty"` + OpenStdin bool `protobuf:"varint,18,opt,name=openStdin" json:"openStdin,omitempty"` + Meta map[string]string `protobuf:"bytes,19,rep,name=meta" json:"meta,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Nodelabels map[string]string `protobuf:"bytes,20,rep,name=nodelabels" json:"nodelabels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + DeployMethod string `protobuf:"bytes,21,opt,name=deploy_method,json=deployMethod" json:"deploy_method,omitempty"` + Data map[string][]byte `protobuf:"bytes,22,rep,name=data" json:"data,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"` +} + +func (m *DeployOptions) Reset() { *m = DeployOptions{} } +func (m *DeployOptions) String() string { return proto.CompactTextString(m) } +func (*DeployOptions) ProtoMessage() {} +func (*DeployOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} } func (m *DeployOptions) GetName() string { if m != nil { @@ -1977,37 +1325,15 @@ func (m *DeployOptions) GetData() map[string][]byte { } type RemoveImageOptions struct { - Podname string `protobuf:"bytes,1,opt,name=podname,proto3" json:"podname,omitempty"` - Nodename string `protobuf:"bytes,2,opt,name=nodename,proto3" json:"nodename,omitempty"` - Images []string `protobuf:"bytes,3,rep,name=images,proto3" json:"images,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Podname string `protobuf:"bytes,1,opt,name=podname" json:"podname,omitempty"` + Nodename string `protobuf:"bytes,2,opt,name=nodename" json:"nodename,omitempty"` + Images []string `protobuf:"bytes,3,rep,name=images" json:"images,omitempty"` } -func (m *RemoveImageOptions) Reset() { *m = RemoveImageOptions{} } -func (m *RemoveImageOptions) String() string { return proto.CompactTextString(m) } -func (*RemoveImageOptions) ProtoMessage() {} -func (*RemoveImageOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{32} -} -func (m *RemoveImageOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RemoveImageOptions.Unmarshal(m, b) -} -func (m *RemoveImageOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RemoveImageOptions.Marshal(b, m, deterministic) -} -func (dst *RemoveImageOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveImageOptions.Merge(dst, src) -} -func (m *RemoveImageOptions) XXX_Size() int { - return xxx_messageInfo_RemoveImageOptions.Size(m) -} -func (m *RemoveImageOptions) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveImageOptions.DiscardUnknown(m) -} - -var xxx_messageInfo_RemoveImageOptions proto.InternalMessageInfo +func (m *RemoveImageOptions) Reset() { *m = RemoveImageOptions{} } +func (m *RemoveImageOptions) String() string { return proto.CompactTextString(m) } +func (*RemoveImageOptions) ProtoMessage() {} +func (*RemoveImageOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} } func (m *RemoveImageOptions) GetPodname() string { if m != nil { @@ -2031,35 +1357,13 @@ func (m *RemoveImageOptions) GetImages() []string { } type CopyPaths struct { - Paths []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Paths []string `protobuf:"bytes,1,rep,name=paths" json:"paths,omitempty"` } -func (m *CopyPaths) Reset() { *m = CopyPaths{} } -func (m *CopyPaths) String() string { return proto.CompactTextString(m) } -func (*CopyPaths) ProtoMessage() {} -func (*CopyPaths) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{33} -} -func (m *CopyPaths) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CopyPaths.Unmarshal(m, b) -} -func (m *CopyPaths) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CopyPaths.Marshal(b, m, deterministic) -} -func (dst *CopyPaths) XXX_Merge(src proto.Message) { - xxx_messageInfo_CopyPaths.Merge(dst, src) -} -func (m *CopyPaths) XXX_Size() int { - return xxx_messageInfo_CopyPaths.Size(m) -} -func (m *CopyPaths) XXX_DiscardUnknown() { - xxx_messageInfo_CopyPaths.DiscardUnknown(m) -} - -var xxx_messageInfo_CopyPaths proto.InternalMessageInfo +func (m *CopyPaths) Reset() { *m = CopyPaths{} } +func (m *CopyPaths) String() string { return proto.CompactTextString(m) } +func (*CopyPaths) ProtoMessage() {} +func (*CopyPaths) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} } func (m *CopyPaths) GetPaths() []string { if m != nil { @@ -2069,35 +1373,13 @@ func (m *CopyPaths) GetPaths() []string { } type CopyOptions struct { - Targets map[string]*CopyPaths `protobuf:"bytes,1,rep,name=targets,proto3" json:"targets,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CopyOptions) Reset() { *m = CopyOptions{} } -func (m *CopyOptions) String() string { return proto.CompactTextString(m) } -func (*CopyOptions) ProtoMessage() {} -func (*CopyOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{34} -} -func (m *CopyOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CopyOptions.Unmarshal(m, b) -} -func (m *CopyOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CopyOptions.Marshal(b, m, deterministic) -} -func (dst *CopyOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_CopyOptions.Merge(dst, src) -} -func (m *CopyOptions) XXX_Size() int { - return xxx_messageInfo_CopyOptions.Size(m) -} -func (m *CopyOptions) XXX_DiscardUnknown() { - xxx_messageInfo_CopyOptions.DiscardUnknown(m) + Targets map[string]*CopyPaths `protobuf:"bytes,1,rep,name=targets" json:"targets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } -var xxx_messageInfo_CopyOptions proto.InternalMessageInfo +func (m *CopyOptions) Reset() { *m = CopyOptions{} } +func (m *CopyOptions) String() string { return proto.CompactTextString(m) } +func (*CopyOptions) ProtoMessage() {} +func (*CopyOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} } func (m *CopyOptions) GetTargets() map[string]*CopyPaths { if m != nil { @@ -2107,36 +1389,14 @@ func (m *CopyOptions) GetTargets() map[string]*CopyPaths { } type ErrorDetail struct { - Code int64 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Code int64 `protobuf:"varint,1,opt,name=code" json:"code,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"` } -func (m *ErrorDetail) Reset() { *m = ErrorDetail{} } -func (m *ErrorDetail) String() string { return proto.CompactTextString(m) } -func (*ErrorDetail) ProtoMessage() {} -func (*ErrorDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{35} -} -func (m *ErrorDetail) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ErrorDetail.Unmarshal(m, b) -} -func (m *ErrorDetail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ErrorDetail.Marshal(b, m, deterministic) -} -func (dst *ErrorDetail) XXX_Merge(src proto.Message) { - xxx_messageInfo_ErrorDetail.Merge(dst, src) -} -func (m *ErrorDetail) XXX_Size() int { - return xxx_messageInfo_ErrorDetail.Size(m) -} -func (m *ErrorDetail) XXX_DiscardUnknown() { - xxx_messageInfo_ErrorDetail.DiscardUnknown(m) -} - -var xxx_messageInfo_ErrorDetail proto.InternalMessageInfo +func (m *ErrorDetail) Reset() { *m = ErrorDetail{} } +func (m *ErrorDetail) String() string { return proto.CompactTextString(m) } +func (*ErrorDetail) ProtoMessage() {} +func (*ErrorDetail) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} } func (m *ErrorDetail) GetCode() int64 { if m != nil { @@ -2153,40 +1413,18 @@ func (m *ErrorDetail) GetMessage() string { } type BuildImageMessage struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Status string `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - Progress string `protobuf:"bytes,3,opt,name=progress,proto3" json:"progress,omitempty"` - Error string `protobuf:"bytes,4,opt,name=error,proto3" json:"error,omitempty"` - Stream string `protobuf:"bytes,5,opt,name=stream,proto3" json:"stream,omitempty"` - ErrorDetail *ErrorDetail `protobuf:"bytes,6,opt,name=error_detail,json=errorDetail,proto3" json:"error_detail,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + Status string `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` + Progress string `protobuf:"bytes,3,opt,name=progress" json:"progress,omitempty"` + Error string `protobuf:"bytes,4,opt,name=error" json:"error,omitempty"` + Stream string `protobuf:"bytes,5,opt,name=stream" json:"stream,omitempty"` + ErrorDetail *ErrorDetail `protobuf:"bytes,6,opt,name=error_detail,json=errorDetail" json:"error_detail,omitempty"` } -func (m *BuildImageMessage) Reset() { *m = BuildImageMessage{} } -func (m *BuildImageMessage) String() string { return proto.CompactTextString(m) } -func (*BuildImageMessage) ProtoMessage() {} -func (*BuildImageMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{36} -} -func (m *BuildImageMessage) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_BuildImageMessage.Unmarshal(m, b) -} -func (m *BuildImageMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_BuildImageMessage.Marshal(b, m, deterministic) -} -func (dst *BuildImageMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_BuildImageMessage.Merge(dst, src) -} -func (m *BuildImageMessage) XXX_Size() int { - return xxx_messageInfo_BuildImageMessage.Size(m) -} -func (m *BuildImageMessage) XXX_DiscardUnknown() { - xxx_messageInfo_BuildImageMessage.DiscardUnknown(m) -} - -var xxx_messageInfo_BuildImageMessage proto.InternalMessageInfo +func (m *BuildImageMessage) Reset() { *m = BuildImageMessage{} } +func (m *BuildImageMessage) String() string { return proto.CompactTextString(m) } +func (*BuildImageMessage) ProtoMessage() {} +func (*BuildImageMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} } func (m *BuildImageMessage) GetId() string { if m != nil { @@ -2231,45 +1469,23 @@ func (m *BuildImageMessage) GetErrorDetail() *ErrorDetail { } type CreateContainerMessage struct { - Podname string `protobuf:"bytes,1,opt,name=podname,proto3" json:"podname,omitempty"` - Nodename string `protobuf:"bytes,2,opt,name=nodename,proto3" json:"nodename,omitempty"` - Id string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` - Error string `protobuf:"bytes,5,opt,name=error,proto3" json:"error,omitempty"` - Success bool `protobuf:"varint,6,opt,name=success,proto3" json:"success,omitempty"` - Cpu map[string]int64 `protobuf:"bytes,7,rep,name=cpu,proto3" json:"cpu,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` - Quota float64 `protobuf:"fixed64,8,opt,name=quota,proto3" json:"quota,omitempty"` - Memory int64 `protobuf:"varint,9,opt,name=memory,proto3" json:"memory,omitempty"` - Publish map[string]string `protobuf:"bytes,10,rep,name=publish,proto3" json:"publish,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Hook []byte `protobuf:"bytes,11,opt,name=hook,proto3" json:"hook,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CreateContainerMessage) Reset() { *m = CreateContainerMessage{} } -func (m *CreateContainerMessage) String() string { return proto.CompactTextString(m) } -func (*CreateContainerMessage) ProtoMessage() {} -func (*CreateContainerMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{37} -} -func (m *CreateContainerMessage) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CreateContainerMessage.Unmarshal(m, b) -} -func (m *CreateContainerMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CreateContainerMessage.Marshal(b, m, deterministic) -} -func (dst *CreateContainerMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateContainerMessage.Merge(dst, src) -} -func (m *CreateContainerMessage) XXX_Size() int { - return xxx_messageInfo_CreateContainerMessage.Size(m) -} -func (m *CreateContainerMessage) XXX_DiscardUnknown() { - xxx_messageInfo_CreateContainerMessage.DiscardUnknown(m) -} - -var xxx_messageInfo_CreateContainerMessage proto.InternalMessageInfo + Podname string `protobuf:"bytes,1,opt,name=podname" json:"podname,omitempty"` + Nodename string `protobuf:"bytes,2,opt,name=nodename" json:"nodename,omitempty"` + Id string `protobuf:"bytes,3,opt,name=id" json:"id,omitempty"` + Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"` + Error string `protobuf:"bytes,5,opt,name=error" json:"error,omitempty"` + Success bool `protobuf:"varint,6,opt,name=success" json:"success,omitempty"` + Cpu map[string]int64 `protobuf:"bytes,7,rep,name=cpu" json:"cpu,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + Quota float64 `protobuf:"fixed64,8,opt,name=quota" json:"quota,omitempty"` + Memory int64 `protobuf:"varint,9,opt,name=memory" json:"memory,omitempty"` + Publish map[string]string `protobuf:"bytes,10,rep,name=publish" json:"publish,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Hook []byte `protobuf:"bytes,11,opt,name=hook,proto3" json:"hook,omitempty"` +} + +func (m *CreateContainerMessage) Reset() { *m = CreateContainerMessage{} } +func (m *CreateContainerMessage) String() string { return proto.CompactTextString(m) } +func (*CreateContainerMessage) ProtoMessage() {} +func (*CreateContainerMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} } func (m *CreateContainerMessage) GetPodname() string { if m != nil { @@ -2349,36 +1565,14 @@ func (m *CreateContainerMessage) GetHook() []byte { } type RunAndWaitMessage struct { - ContainerId string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` - Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ContainerId string `protobuf:"bytes,1,opt,name=container_id,json=containerId" json:"container_id,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` } -func (m *RunAndWaitMessage) Reset() { *m = RunAndWaitMessage{} } -func (m *RunAndWaitMessage) String() string { return proto.CompactTextString(m) } -func (*RunAndWaitMessage) ProtoMessage() {} -func (*RunAndWaitMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{38} -} -func (m *RunAndWaitMessage) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RunAndWaitMessage.Unmarshal(m, b) -} -func (m *RunAndWaitMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RunAndWaitMessage.Marshal(b, m, deterministic) -} -func (dst *RunAndWaitMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_RunAndWaitMessage.Merge(dst, src) -} -func (m *RunAndWaitMessage) XXX_Size() int { - return xxx_messageInfo_RunAndWaitMessage.Size(m) -} -func (m *RunAndWaitMessage) XXX_DiscardUnknown() { - xxx_messageInfo_RunAndWaitMessage.DiscardUnknown(m) -} - -var xxx_messageInfo_RunAndWaitMessage proto.InternalMessageInfo +func (m *RunAndWaitMessage) Reset() { *m = RunAndWaitMessage{} } +func (m *RunAndWaitMessage) String() string { return proto.CompactTextString(m) } +func (*RunAndWaitMessage) ProtoMessage() {} +func (*RunAndWaitMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} } func (m *RunAndWaitMessage) GetContainerId() string { if m != nil { @@ -2395,37 +1589,15 @@ func (m *RunAndWaitMessage) GetData() []byte { } type RemoveImageMessage struct { - Image string `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` - Messages []string `protobuf:"bytes,3,rep,name=messages,proto3" json:"messages,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *RemoveImageMessage) Reset() { *m = RemoveImageMessage{} } -func (m *RemoveImageMessage) String() string { return proto.CompactTextString(m) } -func (*RemoveImageMessage) ProtoMessage() {} -func (*RemoveImageMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{39} -} -func (m *RemoveImageMessage) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RemoveImageMessage.Unmarshal(m, b) -} -func (m *RemoveImageMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RemoveImageMessage.Marshal(b, m, deterministic) -} -func (dst *RemoveImageMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveImageMessage.Merge(dst, src) -} -func (m *RemoveImageMessage) XXX_Size() int { - return xxx_messageInfo_RemoveImageMessage.Size(m) -} -func (m *RemoveImageMessage) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveImageMessage.DiscardUnknown(m) + Image string `protobuf:"bytes,1,opt,name=image" json:"image,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` + Messages []string `protobuf:"bytes,3,rep,name=messages" json:"messages,omitempty"` } -var xxx_messageInfo_RemoveImageMessage proto.InternalMessageInfo +func (m *RemoveImageMessage) Reset() { *m = RemoveImageMessage{} } +func (m *RemoveImageMessage) String() string { return proto.CompactTextString(m) } +func (*RemoveImageMessage) ProtoMessage() {} +func (*RemoveImageMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} } func (m *RemoveImageMessage) GetImage() string { if m != nil { @@ -2449,37 +1621,15 @@ func (m *RemoveImageMessage) GetMessages() []string { } type RemoveContainerMessage struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` - Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` + Message string `protobuf:"bytes,3,opt,name=message" json:"message,omitempty"` } -func (m *RemoveContainerMessage) Reset() { *m = RemoveContainerMessage{} } -func (m *RemoveContainerMessage) String() string { return proto.CompactTextString(m) } -func (*RemoveContainerMessage) ProtoMessage() {} -func (*RemoveContainerMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{40} -} -func (m *RemoveContainerMessage) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RemoveContainerMessage.Unmarshal(m, b) -} -func (m *RemoveContainerMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RemoveContainerMessage.Marshal(b, m, deterministic) -} -func (dst *RemoveContainerMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveContainerMessage.Merge(dst, src) -} -func (m *RemoveContainerMessage) XXX_Size() int { - return xxx_messageInfo_RemoveContainerMessage.Size(m) -} -func (m *RemoveContainerMessage) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveContainerMessage.DiscardUnknown(m) -} - -var xxx_messageInfo_RemoveContainerMessage proto.InternalMessageInfo +func (m *RemoveContainerMessage) Reset() { *m = RemoveContainerMessage{} } +func (m *RemoveContainerMessage) String() string { return proto.CompactTextString(m) } +func (*RemoveContainerMessage) ProtoMessage() {} +func (*RemoveContainerMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} } func (m *RemoveContainerMessage) GetId() string { if m != nil { @@ -2503,36 +1653,14 @@ func (m *RemoveContainerMessage) GetMessage() string { } type ReallocResourceMessage struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ReallocResourceMessage) Reset() { *m = ReallocResourceMessage{} } -func (m *ReallocResourceMessage) String() string { return proto.CompactTextString(m) } -func (*ReallocResourceMessage) ProtoMessage() {} -func (*ReallocResourceMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{41} -} -func (m *ReallocResourceMessage) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ReallocResourceMessage.Unmarshal(m, b) -} -func (m *ReallocResourceMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ReallocResourceMessage.Marshal(b, m, deterministic) -} -func (dst *ReallocResourceMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReallocResourceMessage.Merge(dst, src) -} -func (m *ReallocResourceMessage) XXX_Size() int { - return xxx_messageInfo_ReallocResourceMessage.Size(m) -} -func (m *ReallocResourceMessage) XXX_DiscardUnknown() { - xxx_messageInfo_ReallocResourceMessage.DiscardUnknown(m) + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` } -var xxx_messageInfo_ReallocResourceMessage proto.InternalMessageInfo +func (m *ReallocResourceMessage) Reset() { *m = ReallocResourceMessage{} } +func (m *ReallocResourceMessage) String() string { return proto.CompactTextString(m) } +func (*ReallocResourceMessage) ProtoMessage() {} +func (*ReallocResourceMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} } func (m *ReallocResourceMessage) GetId() string { if m != nil { @@ -2549,40 +1677,18 @@ func (m *ReallocResourceMessage) GetSuccess() bool { } type CopyMessage struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Status string `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Path string `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"` - Error string `protobuf:"bytes,5,opt,name=error,proto3" json:"error,omitempty"` - Data []byte `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CopyMessage) Reset() { *m = CopyMessage{} } -func (m *CopyMessage) String() string { return proto.CompactTextString(m) } -func (*CopyMessage) ProtoMessage() {} -func (*CopyMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{42} -} -func (m *CopyMessage) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CopyMessage.Unmarshal(m, b) -} -func (m *CopyMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CopyMessage.Marshal(b, m, deterministic) -} -func (dst *CopyMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_CopyMessage.Merge(dst, src) -} -func (m *CopyMessage) XXX_Size() int { - return xxx_messageInfo_CopyMessage.Size(m) -} -func (m *CopyMessage) XXX_DiscardUnknown() { - xxx_messageInfo_CopyMessage.DiscardUnknown(m) + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + Status string `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` + Path string `protobuf:"bytes,4,opt,name=path" json:"path,omitempty"` + Error string `protobuf:"bytes,5,opt,name=error" json:"error,omitempty"` + Data []byte `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"` } -var xxx_messageInfo_CopyMessage proto.InternalMessageInfo +func (m *CopyMessage) Reset() { *m = CopyMessage{} } +func (m *CopyMessage) String() string { return proto.CompactTextString(m) } +func (*CopyMessage) ProtoMessage() {} +func (*CopyMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{42} } func (m *CopyMessage) GetId() string { if m != nil { @@ -2627,36 +1733,14 @@ func (m *CopyMessage) GetData() []byte { } type RunAndWaitOptions struct { - DeployOptions *DeployOptions `protobuf:"bytes,1,opt,name=DeployOptions,proto3" json:"DeployOptions,omitempty"` - Cmd []byte `protobuf:"bytes,2,opt,name=Cmd,proto3" json:"Cmd,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DeployOptions *DeployOptions `protobuf:"bytes,1,opt,name=DeployOptions" json:"DeployOptions,omitempty"` + Cmd []byte `protobuf:"bytes,2,opt,name=Cmd,proto3" json:"Cmd,omitempty"` } -func (m *RunAndWaitOptions) Reset() { *m = RunAndWaitOptions{} } -func (m *RunAndWaitOptions) String() string { return proto.CompactTextString(m) } -func (*RunAndWaitOptions) ProtoMessage() {} -func (*RunAndWaitOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_915263ad1e2c0c7f, []int{43} -} -func (m *RunAndWaitOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_RunAndWaitOptions.Unmarshal(m, b) -} -func (m *RunAndWaitOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_RunAndWaitOptions.Marshal(b, m, deterministic) -} -func (dst *RunAndWaitOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_RunAndWaitOptions.Merge(dst, src) -} -func (m *RunAndWaitOptions) XXX_Size() int { - return xxx_messageInfo_RunAndWaitOptions.Size(m) -} -func (m *RunAndWaitOptions) XXX_DiscardUnknown() { - xxx_messageInfo_RunAndWaitOptions.DiscardUnknown(m) -} - -var xxx_messageInfo_RunAndWaitOptions proto.InternalMessageInfo +func (m *RunAndWaitOptions) Reset() { *m = RunAndWaitOptions{} } +func (m *RunAndWaitOptions) String() string { return proto.CompactTextString(m) } +func (*RunAndWaitOptions) ProtoMessage() {} +func (*RunAndWaitOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{43} } func (m *RunAndWaitOptions) GetDeployOptions() *DeployOptions { if m != nil { @@ -2682,8 +1766,6 @@ func init() { proto.RegisterType((*Network)(nil), "pb.Network") proto.RegisterType((*Networks)(nil), "pb.Networks") proto.RegisterType((*Node)(nil), "pb.Node") - proto.RegisterMapType((map[string]int64)(nil), "pb.Node.CpuEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.Node.LabelsEntry") proto.RegisterType((*Nodes)(nil), "pb.Nodes") proto.RegisterType((*NodeAvailable)(nil), "pb.NodeAvailable") proto.RegisterType((*Container)(nil), "pb.Container") @@ -2697,36 +1779,22 @@ func init() { proto.RegisterType((*RemovePodOptions)(nil), "pb.RemovePodOptions") proto.RegisterType((*GetPodOptions)(nil), "pb.GetPodOptions") proto.RegisterType((*AddNodeOptions)(nil), "pb.AddNodeOptions") - proto.RegisterMapType((map[string]string)(nil), "pb.AddNodeOptions.LabelsEntry") proto.RegisterType((*RemoveNodeOptions)(nil), "pb.RemoveNodeOptions") proto.RegisterType((*GetNodeOptions)(nil), "pb.GetNodeOptions") proto.RegisterType((*ListNodesOptions)(nil), "pb.ListNodesOptions") proto.RegisterType((*Build)(nil), "pb.Build") - proto.RegisterMapType((map[string]string)(nil), "pb.Build.ArgsEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.Build.ArtifactsEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.Build.CacheEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.Build.EnvsEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.Build.LabelsEntry") proto.RegisterType((*Builds)(nil), "pb.Builds") - proto.RegisterMapType((map[string]*Build)(nil), "pb.Builds.BuildsEntry") proto.RegisterType((*BuildImageOptions)(nil), "pb.BuildImageOptions") proto.RegisterType((*HookOptions)(nil), "pb.HookOptions") proto.RegisterType((*HealthCheckOptions)(nil), "pb.HealthCheckOptions") proto.RegisterType((*EntrypointOptions)(nil), "pb.EntrypointOptions") proto.RegisterType((*DeployOptions)(nil), "pb.DeployOptions") - proto.RegisterMapType((map[string][]byte)(nil), "pb.DeployOptions.DataEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.DeployOptions.MetaEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.DeployOptions.NetworksEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.DeployOptions.NodelabelsEntry") proto.RegisterType((*RemoveImageOptions)(nil), "pb.RemoveImageOptions") proto.RegisterType((*CopyPaths)(nil), "pb.CopyPaths") proto.RegisterType((*CopyOptions)(nil), "pb.CopyOptions") - proto.RegisterMapType((map[string]*CopyPaths)(nil), "pb.CopyOptions.TargetsEntry") proto.RegisterType((*ErrorDetail)(nil), "pb.ErrorDetail") proto.RegisterType((*BuildImageMessage)(nil), "pb.BuildImageMessage") proto.RegisterType((*CreateContainerMessage)(nil), "pb.CreateContainerMessage") - proto.RegisterMapType((map[string]int64)(nil), "pb.CreateContainerMessage.CpuEntry") - proto.RegisterMapType((map[string]string)(nil), "pb.CreateContainerMessage.PublishEntry") proto.RegisterType((*RunAndWaitMessage)(nil), "pb.RunAndWaitMessage") proto.RegisterType((*RemoveImageMessage)(nil), "pb.RemoveImageMessage") proto.RegisterType((*RemoveContainerMessage)(nil), "pb.RemoveContainerMessage") @@ -2743,9 +1811,8 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// CoreRPCClient is the client API for CoreRPC service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for CoreRPC service + type CoreRPCClient interface { ListPods(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Pods, error) AddPod(ctx context.Context, in *AddPodOptions, opts ...grpc.CallOption) (*Pod, error) @@ -2782,7 +1849,7 @@ func NewCoreRPCClient(cc *grpc.ClientConn) CoreRPCClient { func (c *coreRPCClient) ListPods(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Pods, error) { out := new(Pods) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/ListPods", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/ListPods", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2791,7 +1858,7 @@ func (c *coreRPCClient) ListPods(ctx context.Context, in *Empty, opts ...grpc.Ca func (c *coreRPCClient) AddPod(ctx context.Context, in *AddPodOptions, opts ...grpc.CallOption) (*Pod, error) { out := new(Pod) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/AddPod", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/AddPod", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2800,7 +1867,7 @@ func (c *coreRPCClient) AddPod(ctx context.Context, in *AddPodOptions, opts ...g func (c *coreRPCClient) RemovePod(ctx context.Context, in *RemovePodOptions, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/RemovePod", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/RemovePod", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2809,7 +1876,7 @@ func (c *coreRPCClient) RemovePod(ctx context.Context, in *RemovePodOptions, opt func (c *coreRPCClient) GetPod(ctx context.Context, in *GetPodOptions, opts ...grpc.CallOption) (*Pod, error) { out := new(Pod) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/GetPod", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/GetPod", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2818,7 +1885,7 @@ func (c *coreRPCClient) GetPod(ctx context.Context, in *GetPodOptions, opts ...g func (c *coreRPCClient) AddNode(ctx context.Context, in *AddNodeOptions, opts ...grpc.CallOption) (*Node, error) { out := new(Node) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/AddNode", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/AddNode", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2827,7 +1894,7 @@ func (c *coreRPCClient) AddNode(ctx context.Context, in *AddNodeOptions, opts .. func (c *coreRPCClient) RemoveNode(ctx context.Context, in *RemoveNodeOptions, opts ...grpc.CallOption) (*Pod, error) { out := new(Pod) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/RemoveNode", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/RemoveNode", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2836,7 +1903,7 @@ func (c *coreRPCClient) RemoveNode(ctx context.Context, in *RemoveNodeOptions, o func (c *coreRPCClient) SetNodeAvailable(ctx context.Context, in *NodeAvailable, opts ...grpc.CallOption) (*Node, error) { out := new(Node) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/SetNodeAvailable", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/SetNodeAvailable", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2845,7 +1912,7 @@ func (c *coreRPCClient) SetNodeAvailable(ctx context.Context, in *NodeAvailable, func (c *coreRPCClient) GetNode(ctx context.Context, in *GetNodeOptions, opts ...grpc.CallOption) (*Node, error) { out := new(Node) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/GetNode", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/GetNode", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2854,7 +1921,7 @@ func (c *coreRPCClient) GetNode(ctx context.Context, in *GetNodeOptions, opts .. func (c *coreRPCClient) GetContainer(ctx context.Context, in *ContainerID, opts ...grpc.CallOption) (*Container, error) { out := new(Container) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/GetContainer", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/GetContainer", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2863,7 +1930,7 @@ func (c *coreRPCClient) GetContainer(ctx context.Context, in *ContainerID, opts func (c *coreRPCClient) GetContainers(ctx context.Context, in *ContainerIDs, opts ...grpc.CallOption) (*Containers, error) { out := new(Containers) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/GetContainers", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/GetContainers", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2872,7 +1939,7 @@ func (c *coreRPCClient) GetContainers(ctx context.Context, in *ContainerIDs, opt func (c *coreRPCClient) GetNodeByName(ctx context.Context, in *GetNodeOptions, opts ...grpc.CallOption) (*Node, error) { out := new(Node) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/GetNodeByName", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/GetNodeByName", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2881,7 +1948,7 @@ func (c *coreRPCClient) GetNodeByName(ctx context.Context, in *GetNodeOptions, o func (c *coreRPCClient) ListPodNodes(ctx context.Context, in *ListNodesOptions, opts ...grpc.CallOption) (*Nodes, error) { out := new(Nodes) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/ListPodNodes", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/ListPodNodes", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2890,7 +1957,7 @@ func (c *coreRPCClient) ListPodNodes(ctx context.Context, in *ListNodesOptions, func (c *coreRPCClient) ListNetworks(ctx context.Context, in *ListNetworkOptions, opts ...grpc.CallOption) (*Networks, error) { out := new(Networks) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/ListNetworks", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/ListNetworks", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2899,7 +1966,7 @@ func (c *coreRPCClient) ListNetworks(ctx context.Context, in *ListNetworkOptions func (c *coreRPCClient) ListContainers(ctx context.Context, in *DeployStatusOptions, opts ...grpc.CallOption) (*Containers, error) { out := new(Containers) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/ListContainers", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/ListContainers", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2908,7 +1975,7 @@ func (c *coreRPCClient) ListContainers(ctx context.Context, in *DeployStatusOpti func (c *coreRPCClient) ContainerDeployed(ctx context.Context, in *ContainerDeployedOptions, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/pb.CoreRPC/ContainerDeployed", in, out, opts...) + err := grpc.Invoke(ctx, "/pb.CoreRPC/ContainerDeployed", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -2916,7 +1983,7 @@ func (c *coreRPCClient) ContainerDeployed(ctx context.Context, in *ContainerDepl } func (c *coreRPCClient) Copy(ctx context.Context, in *CopyOptions, opts ...grpc.CallOption) (CoreRPC_CopyClient, error) { - stream, err := c.cc.NewStream(ctx, &_CoreRPC_serviceDesc.Streams[0], "/pb.CoreRPC/Copy", opts...) + stream, err := grpc.NewClientStream(ctx, &_CoreRPC_serviceDesc.Streams[0], c.cc, "/pb.CoreRPC/Copy", opts...) if err != nil { return nil, err } @@ -2948,7 +2015,7 @@ func (x *coreRPCCopyClient) Recv() (*CopyMessage, error) { } func (c *coreRPCClient) BuildImage(ctx context.Context, in *BuildImageOptions, opts ...grpc.CallOption) (CoreRPC_BuildImageClient, error) { - stream, err := c.cc.NewStream(ctx, &_CoreRPC_serviceDesc.Streams[1], "/pb.CoreRPC/BuildImage", opts...) + stream, err := grpc.NewClientStream(ctx, &_CoreRPC_serviceDesc.Streams[1], c.cc, "/pb.CoreRPC/BuildImage", opts...) if err != nil { return nil, err } @@ -2980,7 +2047,7 @@ func (x *coreRPCBuildImageClient) Recv() (*BuildImageMessage, error) { } func (c *coreRPCClient) RemoveImage(ctx context.Context, in *RemoveImageOptions, opts ...grpc.CallOption) (CoreRPC_RemoveImageClient, error) { - stream, err := c.cc.NewStream(ctx, &_CoreRPC_serviceDesc.Streams[2], "/pb.CoreRPC/RemoveImage", opts...) + stream, err := grpc.NewClientStream(ctx, &_CoreRPC_serviceDesc.Streams[2], c.cc, "/pb.CoreRPC/RemoveImage", opts...) if err != nil { return nil, err } @@ -3012,7 +2079,7 @@ func (x *coreRPCRemoveImageClient) Recv() (*RemoveImageMessage, error) { } func (c *coreRPCClient) DeployStatus(ctx context.Context, in *DeployStatusOptions, opts ...grpc.CallOption) (CoreRPC_DeployStatusClient, error) { - stream, err := c.cc.NewStream(ctx, &_CoreRPC_serviceDesc.Streams[3], "/pb.CoreRPC/DeployStatus", opts...) + stream, err := grpc.NewClientStream(ctx, &_CoreRPC_serviceDesc.Streams[3], c.cc, "/pb.CoreRPC/DeployStatus", opts...) if err != nil { return nil, err } @@ -3044,7 +2111,7 @@ func (x *coreRPCDeployStatusClient) Recv() (*DeployStatusMessage, error) { } func (c *coreRPCClient) RunAndWait(ctx context.Context, opts ...grpc.CallOption) (CoreRPC_RunAndWaitClient, error) { - stream, err := c.cc.NewStream(ctx, &_CoreRPC_serviceDesc.Streams[4], "/pb.CoreRPC/RunAndWait", opts...) + stream, err := grpc.NewClientStream(ctx, &_CoreRPC_serviceDesc.Streams[4], c.cc, "/pb.CoreRPC/RunAndWait", opts...) if err != nil { return nil, err } @@ -3075,7 +2142,7 @@ func (x *coreRPCRunAndWaitClient) Recv() (*RunAndWaitMessage, error) { } func (c *coreRPCClient) CreateContainer(ctx context.Context, in *DeployOptions, opts ...grpc.CallOption) (CoreRPC_CreateContainerClient, error) { - stream, err := c.cc.NewStream(ctx, &_CoreRPC_serviceDesc.Streams[5], "/pb.CoreRPC/CreateContainer", opts...) + stream, err := grpc.NewClientStream(ctx, &_CoreRPC_serviceDesc.Streams[5], c.cc, "/pb.CoreRPC/CreateContainer", opts...) if err != nil { return nil, err } @@ -3107,7 +2174,7 @@ func (x *coreRPCCreateContainerClient) Recv() (*CreateContainerMessage, error) { } func (c *coreRPCClient) RemoveContainer(ctx context.Context, in *RemoveContainerOptions, opts ...grpc.CallOption) (CoreRPC_RemoveContainerClient, error) { - stream, err := c.cc.NewStream(ctx, &_CoreRPC_serviceDesc.Streams[6], "/pb.CoreRPC/RemoveContainer", opts...) + stream, err := grpc.NewClientStream(ctx, &_CoreRPC_serviceDesc.Streams[6], c.cc, "/pb.CoreRPC/RemoveContainer", opts...) if err != nil { return nil, err } @@ -3139,7 +2206,7 @@ func (x *coreRPCRemoveContainerClient) Recv() (*RemoveContainerMessage, error) { } func (c *coreRPCClient) ReallocResource(ctx context.Context, in *ReallocOptions, opts ...grpc.CallOption) (CoreRPC_ReallocResourceClient, error) { - stream, err := c.cc.NewStream(ctx, &_CoreRPC_serviceDesc.Streams[7], "/pb.CoreRPC/ReallocResource", opts...) + stream, err := grpc.NewClientStream(ctx, &_CoreRPC_serviceDesc.Streams[7], c.cc, "/pb.CoreRPC/ReallocResource", opts...) if err != nil { return nil, err } @@ -3170,7 +2237,8 @@ func (x *coreRPCReallocResourceClient) Recv() (*ReallocResourceMessage, error) { return m, nil } -// CoreRPCServer is the server API for CoreRPC service. +// Server API for CoreRPC service + type CoreRPCServer interface { ListPods(context.Context, *Empty) (*Pods, error) AddPod(context.Context, *AddPodOptions) (*Pod, error) @@ -3755,9 +2823,9 @@ var _CoreRPC_serviceDesc = grpc.ServiceDesc{ Metadata: "core.proto", } -func init() { proto.RegisterFile("core.proto", fileDescriptor_core_915263ad1e2c0c7f) } +func init() { proto.RegisterFile("core.proto", fileDescriptor0) } -var fileDescriptor_core_915263ad1e2c0c7f = []byte{ +var fileDescriptor0 = []byte{ // 2446 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4b, 0x73, 0x1c, 0x49, 0xf1, 0xf7, 0xbc, 0x34, 0x33, 0x39, 0xa3, 0x57, 0xad, 0x56, 0xff, 0x8e, 0xde, 0x97, 0xdc, 0x8a, diff --git a/source/common/common.go b/source/common/common.go index 53c1d7bc4..83026edf3 100644 --- a/source/common/common.go +++ b/source/common/common.go @@ -13,7 +13,7 @@ import ( "github.com/projecteru2/core/types" log "github.com/sirupsen/logrus" - git "gopkg.in/libgit2/git2go.v26" + git "gopkg.in/libgit2/git2go.v27" ) // GitScm is gitlab or github source code manager