diff --git a/cluster/calcium/create_container.go b/cluster/calcium/create_container.go index cac7326d2..41086a89d 100644 --- a/cluster/calcium/create_container.go +++ b/cluster/calcium/create_container.go @@ -300,9 +300,9 @@ func (c *Calcium) makeContainerOptions(index int, quota types.CPUMap, opts *type var resource enginecontainer.Resources if favor == scheduler.CPU_PRIOR { - resource = makeCPUPriorSetting(c.config.Scheduler.ShareBase, quota, opts.Memory) + resource = makeCPUPriorSetting(c.config.Scheduler.ShareBase, quota, opts.Memory, opts.SoftLimit) } else if favor == scheduler.MEMORY_PRIOR { - resource = makeMemoryPriorSetting(opts.Memory, opts.CPUQuota) + resource = makeMemoryPriorSetting(opts.Memory, opts.CPUQuota, opts.SoftLimit) } else { return nil, nil, nil, "", fmt.Errorf("favor not support %s", favor) } @@ -357,6 +357,7 @@ func (c *Calcium) createAndStartContainer( Hook: opts.Entrypoint.Hook, Privileged: opts.Entrypoint.Privileged, Engine: node.Engine, + SoftLimit: opts.SoftLimit, } createContainerMessage := &types.CreateContainerMessage{ Podname: container.Podname, diff --git a/cluster/calcium/helper.go b/cluster/calcium/helper.go index c37eeb106..fdd43a593 100644 --- a/cluster/calcium/helper.go +++ b/cluster/calcium/helper.go @@ -41,18 +41,22 @@ func (c *Calcium) Lock(ctx context.Context, name string, timeout int) (lock.Dist } // create container begin -func makeMemoryPriorSetting(memory int64, cpu float64) enginecontainer.Resources { +func makeMemoryPriorSetting(memory int64, cpu float64, softlimit bool) enginecontainer.Resources { resource := enginecontainer.Resources{} if cpu > 0 { resource.CPUPeriod = cluster.CPUPeriodBase resource.CPUQuota = int64(cpu * float64(cluster.CPUPeriodBase)) } - resource.Memory = memory - resource.MemorySwap = memory + if softlimit { + resource.MemoryReservation = memory + } else { + resource.Memory = memory + resource.MemorySwap = memory + } return resource } -func makeCPUPriorSetting(shareBase int, quota types.CPUMap, memory int64) enginecontainer.Resources { +func makeCPUPriorSetting(shareBase int, quota types.CPUMap, memory int64, softlimit bool) enginecontainer.Resources { // calculate CPUShares and CPUSet // scheduler won't return more than 1 share quota // so the smallest share is the share numerator @@ -66,11 +70,16 @@ func makeCPUPriorSetting(shareBase int, quota types.CPUMap, memory int64) engine } cpuShares := int64(float64(shareQuota) / float64(shareBase) * float64(cluster.CPUShareBase)) cpuSetCpus := strings.Join(cpuIDs, ",") - log.Debugf("[makeCPUPriorSetting] CPU core %v CPU share %v Memory soft limit %v", cpuSetCpus, cpuShares, memory) + log.Debugf("[makeCPUPriorSetting] CPU core %v CPU share %v Memory limit %v", cpuSetCpus, cpuShares, memory) resource := enginecontainer.Resources{ - CPUShares: cpuShares, - CpusetCpus: cpuSetCpus, - MemoryReservation: memory, + CPUShares: cpuShares, + CpusetCpus: cpuSetCpus, + } + if softlimit { + resource.MemoryReservation = memory + } else { + resource.Memory = memory + resource.MemorySwap = memory } return resource } diff --git a/cluster/calcium/mock_test.go b/cluster/calcium/mock_test.go index a0c9dfdbf..7194e8855 100644 --- a/cluster/calcium/mock_test.go +++ b/cluster/calcium/mock_test.go @@ -488,6 +488,7 @@ func initMockConfig() { Nodename: updatenodename, Name: "hello_hi_123", CPU: coretypes.CPUMap{"0": 10}, + Quota: 1.0, Memory: appmemory, } rContainers = append(rContainers, rContainer) diff --git a/cluster/calcium/realloc.go b/cluster/calcium/realloc.go index e07d4fb9d..dde9fd470 100644 --- a/cluster/calcium/realloc.go +++ b/cluster/calcium/realloc.go @@ -6,7 +6,6 @@ import ( "sync" enginecontainer "github.com/docker/docker/api/types/container" - "github.com/projecteru2/core/cluster" "github.com/projecteru2/core/scheduler" "github.com/projecteru2/core/types" log "github.com/sirupsen/logrus" @@ -160,35 +159,27 @@ func (c *Calcium) doUpdateContainerWithMemoryPrior( cpu float64, memory int64) { for _, container := range containers { - containerJSON, err := container.Inspect(ctx) - if err != nil { - log.Errorf("[doUpdateContainerWithMemoryPrior] get container failed %v", err) - ch <- &types.ReallocResourceMessage{ContainerID: containerJSON.ID, Success: false} - continue - } + newCPU := container.Quota + cpu + newMemory := container.Memory + memory - cpuQuota := int64(cpu * float64(cluster.CPUPeriodBase)) - newCPUQuota := containerJSON.HostConfig.CPUQuota + cpuQuota - newMemory := containerJSON.HostConfig.Memory + memory // 内存不能低于 4MB - if newCPUQuota <= 0 || newMemory <= minMemory { - log.Warnf("[doUpdateContainerWithMemoryPrior] new resource invaild %s, %d, %d", containerJSON.ID, newCPUQuota, newMemory) - ch <- &types.ReallocResourceMessage{ContainerID: containerJSON.ID, Success: false} + if newCPU <= 0 || newMemory <= minMemory { + log.Errorf("[doUpdateContainerWithMemoryPrior] new resource invaild %s, %f, %d", container.ID, newCPU, newMemory) + ch <- &types.ReallocResourceMessage{ContainerID: container.ID, Success: false} continue } - newCPU := float64(newCPUQuota) / float64(cluster.CPUPeriodBase) - log.Debugf("[doUpdateContainerWithMemoryPrior] quota:%d, cpu: %f, mem: %d", newCPUQuota, newCPU, newMemory) + log.Debugf("[doUpdateContainerWithMemoryPrior] cpu: %f, mem: %d", newCPU, newMemory) // CPUQuota not cpu - newResource := makeMemoryPriorSetting(newMemory, newCPU) + newResource := makeMemoryPriorSetting(newMemory, newCPU, container.SoftLimit) updateConfig := enginecontainer.UpdateConfig{Resources: newResource} - if err := updateContainer(ctx, containerJSON.ID, node, updateConfig); err != nil { - log.Errorf("[doUpdateContainerWithMemoryPrior] update container failed %v, %s", err, containerJSON.ID) - ch <- &types.ReallocResourceMessage{ContainerID: containerJSON.ID, Success: false} + if err := updateContainer(ctx, container.ID, node, updateConfig); err != nil { + log.Errorf("[doUpdateContainerWithMemoryPrior] update container failed %v, %s", err, container.ID) + ch <- &types.ReallocResourceMessage{ContainerID: container.ID, Success: false} // 如果是增加内存，失败的时候应该把内存还回去 if memory > 0 { if err := c.store.UpdateNodeResource(ctx, podname, node.Name, types.CPUMap{}, memory, "+"); err != nil { - log.Errorf("[doUpdateContainerWithMemoryPrior] failed to set mem back %s", containerJSON.ID) + log.Errorf("[doUpdateContainerWithMemoryPrior] failed to set mem back %s", container.ID) } } continue @@ -196,7 +187,7 @@ func (c *Calcium) doUpdateContainerWithMemoryPrior( // 如果是要降低内存，当执行成功的时候需要把内存还回去 if memory < 0 { if err := c.store.UpdateNodeResource(ctx, podname, node.Name, types.CPUMap{}, -memory, "+"); err != nil { - log.Errorf("[doUpdateContainerWithMemoryPrior] failed to set mem back %s", containerJSON.ID) + log.Errorf("[doUpdateContainerWithMemoryPrior] failed to set mem back %s", container.ID) } } @@ -208,7 +199,7 @@ func (c *Calcium) doUpdateContainerWithMemoryPrior( ch <- &types.ReallocResourceMessage{ContainerID: container.ID, Success: false} return } - ch <- &types.ReallocResourceMessage{ContainerID: containerJSON.ID, Success: true} + ch <- &types.ReallocResourceMessage{ContainerID: container.ID, Success: true} } } @@ -337,7 +328,7 @@ func (c *Calcium) doReallocContainersWithCPUPrior( containers := nodeContainers[node] for index, container := range containers { cpuPlan := cpuset[index] - resource := makeCPUPriorSetting(c.config.Scheduler.ShareBase, cpuPlan, requireMemory) + resource := makeCPUPriorSetting(c.config.Scheduler.ShareBase, cpuPlan, requireMemory, container.SoftLimit) updateConfig := enginecontainer.UpdateConfig{Resources: resource} if err := updateContainer(ctx, container.ID, node, updateConfig); err != nil { log.Errorf("[doReallocContainersWithCPUPrior] update container failed %v", err) diff --git a/rpc/gen/core.pb.go b/rpc/gen/core.pb.go index db9b95f62..8df836cfe 100644 --- a/rpc/gen/core.pb.go +++ b/rpc/gen/core.pb.go @@ -33,7 +33,7 @@ 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_afab75e32ef334da, []int{0} + return fileDescriptor_core_44df2169fdb40de1, []int{0} } func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) @@ -66,7 +66,7 @@ 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_afab75e32ef334da, []int{1} + return fileDescriptor_core_44df2169fdb40de1, []int{1} } func (m *DeployStatusOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeployStatusOptions.Unmarshal(m, b) @@ -123,7 +123,7 @@ 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_afab75e32ef334da, []int{2} + return fileDescriptor_core_44df2169fdb40de1, []int{2} } func (m *DeployStatusMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeployStatusMessage.Unmarshal(m, b) @@ -198,7 +198,7 @@ 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_afab75e32ef334da, []int{3} + return fileDescriptor_core_44df2169fdb40de1, []int{3} } func (m *Pod) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Pod.Unmarshal(m, b) @@ -243,7 +243,7 @@ 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_afab75e32ef334da, []int{4} + return fileDescriptor_core_44df2169fdb40de1, []int{4} } func (m *Pods) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Pods.Unmarshal(m, b) @@ -282,7 +282,7 @@ 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_afab75e32ef334da, []int{5} + return fileDescriptor_core_44df2169fdb40de1, []int{5} } func (m *ListNetworkOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListNetworkOptions.Unmarshal(m, b) @@ -328,7 +328,7 @@ 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_afab75e32ef334da, []int{6} + return fileDescriptor_core_44df2169fdb40de1, []int{6} } func (m *Network) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Network.Unmarshal(m, b) @@ -373,7 +373,7 @@ 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_afab75e32ef334da, []int{7} + return fileDescriptor_core_44df2169fdb40de1, []int{7} } func (m *Networks) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Networks.Unmarshal(m, b) @@ -418,7 +418,7 @@ 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_afab75e32ef334da, []int{8} + return fileDescriptor_core_44df2169fdb40de1, []int{8} } func (m *Node) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Node.Unmarshal(m, b) @@ -505,7 +505,7 @@ 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_afab75e32ef334da, []int{9} + return fileDescriptor_core_44df2169fdb40de1, []int{9} } func (m *Nodes) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Nodes.Unmarshal(m, b) @@ -545,7 +545,7 @@ 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_afab75e32ef334da, []int{10} + return fileDescriptor_core_44df2169fdb40de1, []int{10} } func (m *NodeAvailable) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NodeAvailable.Unmarshal(m, b) @@ -605,7 +605,7 @@ 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_afab75e32ef334da, []int{11} + return fileDescriptor_core_44df2169fdb40de1, []int{11} } func (m *Container) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Container.Unmarshal(m, b) @@ -703,7 +703,7 @@ func (m *ContainerDeployedOptions) Reset() { *m = ContainerDeployedOptio func (m *ContainerDeployedOptions) String() string { return proto.CompactTextString(m) } func (*ContainerDeployedOptions) ProtoMessage() {} func (*ContainerDeployedOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_afab75e32ef334da, []int{12} + return fileDescriptor_core_44df2169fdb40de1, []int{12} } func (m *ContainerDeployedOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ContainerDeployedOptions.Unmarshal(m, b) @@ -769,7 +769,7 @@ 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_afab75e32ef334da, []int{13} + return fileDescriptor_core_44df2169fdb40de1, []int{13} } func (m *Containers) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Containers.Unmarshal(m, b) @@ -807,7 +807,7 @@ 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_afab75e32ef334da, []int{14} + return fileDescriptor_core_44df2169fdb40de1, []int{14} } func (m *ContainerID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ContainerID.Unmarshal(m, b) @@ -845,7 +845,7 @@ 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_afab75e32ef334da, []int{15} + return fileDescriptor_core_44df2169fdb40de1, []int{15} } func (m *ContainerIDs) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ContainerIDs.Unmarshal(m, b) @@ -884,7 +884,7 @@ 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_afab75e32ef334da, []int{16} + return fileDescriptor_core_44df2169fdb40de1, []int{16} } func (m *RemoveContainerOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveContainerOptions.Unmarshal(m, b) @@ -931,7 +931,7 @@ 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_afab75e32ef334da, []int{17} + return fileDescriptor_core_44df2169fdb40de1, []int{17} } func (m *ReallocOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReallocOptions.Unmarshal(m, b) @@ -985,7 +985,7 @@ 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_afab75e32ef334da, []int{18} + return fileDescriptor_core_44df2169fdb40de1, []int{18} } func (m *AddPodOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddPodOptions.Unmarshal(m, b) @@ -1037,7 +1037,7 @@ 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_afab75e32ef334da, []int{19} + return fileDescriptor_core_44df2169fdb40de1, []int{19} } func (m *RemovePodOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemovePodOptions.Unmarshal(m, b) @@ -1075,7 +1075,7 @@ 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_afab75e32ef334da, []int{20} + return fileDescriptor_core_44df2169fdb40de1, []int{20} } func (m *GetPodOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetPodOptions.Unmarshal(m, b) @@ -1122,7 +1122,7 @@ 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_afab75e32ef334da, []int{21} + return fileDescriptor_core_44df2169fdb40de1, []int{21} } func (m *AddNodeOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddNodeOptions.Unmarshal(m, b) @@ -1224,7 +1224,7 @@ 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_afab75e32ef334da, []int{22} + return fileDescriptor_core_44df2169fdb40de1, []int{22} } func (m *RemoveNodeOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveNodeOptions.Unmarshal(m, b) @@ -1270,7 +1270,7 @@ 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_afab75e32ef334da, []int{23} + return fileDescriptor_core_44df2169fdb40de1, []int{23} } func (m *GetNodeOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetNodeOptions.Unmarshal(m, b) @@ -1316,7 +1316,7 @@ 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_afab75e32ef334da, []int{24} + return fileDescriptor_core_44df2169fdb40de1, []int{24} } func (m *ListNodesOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListNodesOptions.Unmarshal(m, b) @@ -1371,7 +1371,7 @@ 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_afab75e32ef334da, []int{25} + return fileDescriptor_core_44df2169fdb40de1, []int{25} } func (m *Build) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Build.Unmarshal(m, b) @@ -1480,7 +1480,7 @@ 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_afab75e32ef334da, []int{26} + return fileDescriptor_core_44df2169fdb40de1, []int{26} } func (m *Builds) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Builds.Unmarshal(m, b) @@ -1529,7 +1529,7 @@ 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_afab75e32ef334da, []int{27} + return fileDescriptor_core_44df2169fdb40de1, []int{27} } func (m *BuildImageOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BuildImageOptions.Unmarshal(m, b) @@ -1597,7 +1597,7 @@ 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_afab75e32ef334da, []int{28} + return fileDescriptor_core_44df2169fdb40de1, []int{28} } func (m *HookOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HookOptions.Unmarshal(m, b) @@ -1652,7 +1652,7 @@ 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_afab75e32ef334da, []int{29} + return fileDescriptor_core_44df2169fdb40de1, []int{29} } func (m *HealthCheckOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HealthCheckOptions.Unmarshal(m, b) @@ -1712,7 +1712,7 @@ func (m *LogOptions) Reset() { *m = LogOptions{} } func (m *LogOptions) String() string { return proto.CompactTextString(m) } func (*LogOptions) ProtoMessage() {} func (*LogOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_core_afab75e32ef334da, []int{30} + return fileDescriptor_core_44df2169fdb40de1, []int{30} } func (m *LogOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LogOptions.Unmarshal(m, b) @@ -1765,7 +1765,7 @@ 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_afab75e32ef334da, []int{31} + return fileDescriptor_core_44df2169fdb40de1, []int{31} } func (m *EntrypointOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EntrypointOptions.Unmarshal(m, b) @@ -1871,6 +1871,7 @@ type DeployOptions struct { 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"` + Softlimit bool `protobuf:"varint,23,opt,name=softlimit,proto3" json:"softlimit,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1880,7 +1881,7 @@ 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_afab75e32ef334da, []int{32} + return fileDescriptor_core_44df2169fdb40de1, []int{32} } func (m *DeployOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeployOptions.Unmarshal(m, b) @@ -2054,6 +2055,13 @@ func (m *DeployOptions) GetData() map[string][]byte { return nil } +func (m *DeployOptions) GetSoftlimit() bool { + if m != nil { + return m.Softlimit + } + return false +} + 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"` @@ -2067,7 +2075,7 @@ 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_afab75e32ef334da, []int{33} + return fileDescriptor_core_44df2169fdb40de1, []int{33} } func (m *RemoveImageOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveImageOptions.Unmarshal(m, b) @@ -2119,7 +2127,7 @@ 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_afab75e32ef334da, []int{34} + return fileDescriptor_core_44df2169fdb40de1, []int{34} } func (m *CopyPaths) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CopyPaths.Unmarshal(m, b) @@ -2157,7 +2165,7 @@ 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_afab75e32ef334da, []int{35} + return fileDescriptor_core_44df2169fdb40de1, []int{35} } func (m *CopyOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CopyOptions.Unmarshal(m, b) @@ -2196,7 +2204,7 @@ 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_afab75e32ef334da, []int{36} + return fileDescriptor_core_44df2169fdb40de1, []int{36} } func (m *ErrorDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ErrorDetail.Unmarshal(m, b) @@ -2246,7 +2254,7 @@ 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_afab75e32ef334da, []int{37} + return fileDescriptor_core_44df2169fdb40de1, []int{37} } func (m *BuildImageMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BuildImageMessage.Unmarshal(m, b) @@ -2329,7 +2337,7 @@ 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_afab75e32ef334da, []int{38} + return fileDescriptor_core_44df2169fdb40de1, []int{38} } func (m *CreateContainerMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateContainerMessage.Unmarshal(m, b) @@ -2438,7 +2446,7 @@ 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_afab75e32ef334da, []int{39} + return fileDescriptor_core_44df2169fdb40de1, []int{39} } func (m *RunAndWaitMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RunAndWaitMessage.Unmarshal(m, b) @@ -2485,7 +2493,7 @@ 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_afab75e32ef334da, []int{40} + return fileDescriptor_core_44df2169fdb40de1, []int{40} } func (m *RemoveImageMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveImageMessage.Unmarshal(m, b) @@ -2539,7 +2547,7 @@ 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_afab75e32ef334da, []int{41} + return fileDescriptor_core_44df2169fdb40de1, []int{41} } func (m *RemoveContainerMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveContainerMessage.Unmarshal(m, b) @@ -2592,7 +2600,7 @@ 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_afab75e32ef334da, []int{42} + return fileDescriptor_core_44df2169fdb40de1, []int{42} } func (m *ReallocResourceMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReallocResourceMessage.Unmarshal(m, b) @@ -2642,7 +2650,7 @@ 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_afab75e32ef334da, []int{43} + return fileDescriptor_core_44df2169fdb40de1, []int{43} } func (m *CopyMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CopyMessage.Unmarshal(m, b) @@ -2716,7 +2724,7 @@ 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_afab75e32ef334da, []int{44} + return fileDescriptor_core_44df2169fdb40de1, []int{44} } func (m *RunAndWaitOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RunAndWaitOptions.Unmarshal(m, b) @@ -3869,167 +3877,168 @@ var _CoreRPC_serviceDesc = grpc.ServiceDesc{ Metadata: "core.proto", } -func init() { proto.RegisterFile("core.proto", fileDescriptor_core_afab75e32ef334da) } - -var fileDescriptor_core_afab75e32ef334da = []byte{ - // 2536 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x39, 0x4b, 0x73, 0x1c, 0x49, - 0xd1, 0x9e, 0xe9, 0x19, 0xcd, 0x4c, 0xce, 0xe8, 0x55, 0xab, 0xd5, 0xd7, 0xd1, 0xbb, 0x6b, 0xcb, - 0xad, 0xf8, 0xd6, 0x5a, 0x62, 0xad, 0xdd, 0x95, 0x63, 0x6d, 0x63, 0x83, 0x63, 0x65, 0x49, 0x6b, - 0x8b, 0xb0, 0x8d, 0x68, 0x13, 0xc1, 0x85, 0x40, 0xf4, 0x74, 0x97, 0x46, 0x1d, 0x9e, 0x99, 0x6a, - 0xba, 0x6b, 0x04, 0x3a, 0x73, 0xe0, 0x08, 0x07, 0x82, 0x2b, 0x47, 0x8e, 0x9c, 0x20, 0x82, 0xdf, - 0x40, 0x04, 0x07, 0x7e, 0x01, 0x3f, 0x85, 0xc8, 0xac, 0xea, 0xea, 0xea, 0x79, 0xc8, 0x48, 0x04, - 0xa7, 0xae, 0xcc, 0x7a, 0xe5, 0x3b, 0xb3, 0xb2, 0x01, 0x22, 0x91, 0xf1, 0xdd, 0x34, 0x13, 0x52, - 0xb0, 0x7a, 0xda, 0xf7, 0x5b, 0xd0, 0x3c, 0x1a, 0xa5, 0xf2, 0xd2, 0x7f, 0x07, 0x1f, 0x1c, 0xf2, - 0x74, 0x28, 0x2e, 0xdf, 0xca, 0x50, 0x4e, 0xf2, 0x1f, 0xa6, 0x32, 0x11, 0xe3, 0x9c, 0xb9, 0xd0, - 0x0a, 0xd3, 0x74, 0x1c, 0x8e, 0xb8, 0x5b, 0xdb, 0xaa, 0xed, 0x74, 0x82, 0x02, 0x64, 0xb7, 0x01, - 0xf8, 0x58, 0x66, 0x97, 0xa9, 0x48, 0xc6, 0xd2, 0xad, 0xd3, 0xa4, 0x85, 0x61, 0x1e, 0xb4, 0xc7, - 0x22, 0xe6, 0xb4, 0xd5, 0xa1, 0x59, 0x03, 0xfb, 0x7f, 0xaa, 0x55, 0x6f, 0x7b, 0xcd, 0xf3, 0x3c, - 0x1c, 0x70, 0xb6, 0x09, 0x4b, 0x61, 0x84, 0x17, 0xeb, 0xcb, 0x34, 0x64, 0x53, 0x51, 0xbf, 0x8a, - 0x0a, 0xe7, 0x4a, 0x2a, 0x1a, 0x55, 0x2a, 0xd8, 0x0a, 0xd4, 0x93, 0xd8, 0x6d, 0x12, 0xb6, 0x9e, - 0xc4, 0x8c, 0x41, 0x23, 0x0e, 0x65, 0xe8, 0x2e, 0x6d, 0xd5, 0x76, 0x7a, 0x01, 0x8d, 0xfd, 0xfb, - 0xe0, 0x9c, 0x08, 0x9a, 0xb2, 0x64, 0x40, 0x63, 0x5a, 0xce, 0xf3, 0x48, 0x53, 0x44, 0x63, 0x7f, - 0x1b, 0x1a, 0x27, 0x22, 0xce, 0xd9, 0x47, 0xd0, 0x48, 0x45, 0x9c, 0xbb, 0xb5, 0x2d, 0x67, 0xa7, - 0xbb, 0xd7, 0xda, 0x4d, 0xfb, 0xbb, 0x27, 0x22, 0x0e, 0x08, 0xe9, 0x7f, 0x0b, 0xec, 0x55, 0x92, - 0xcb, 0x37, 0x5c, 0xfe, 0x52, 0x64, 0xef, 0x2c, 0x49, 0xa7, 0x22, 0xb6, 0x25, 0xad, 0x41, 0x94, - 0x4a, 0x9c, 0x25, 0x17, 0x3c, 0xd3, 0x57, 0x69, 0xc8, 0x7f, 0x04, 0x2d, 0x7d, 0xc6, 0x5c, 0xfa, - 0x5c, 0x68, 0xe5, 0x93, 0xfe, 0x98, 0xcb, 0xdc, 0xad, 0x6f, 0x39, 0x78, 0xa0, 0x06, 0xfd, 0x07, - 0xd0, 0xd6, 0x1b, 0x73, 0x76, 0x0f, 0xda, 0x63, 0x3d, 0xd6, 0xd4, 0x76, 0x91, 0x5a, 0x3d, 0x1f, - 0x98, 0x49, 0xff, 0x5f, 0x75, 0x68, 0xbc, 0x11, 0x31, 0x9f, 0x7b, 0x97, 0x07, 0x6d, 0x3e, 0x8e, - 0x6d, 0x53, 0x30, 0xb0, 0xcd, 0x98, 0x53, 0x65, 0x6c, 0x1b, 0x9c, 0x28, 0x9d, 0xb8, 0x0d, 0xba, - 0x76, 0x9d, 0xae, 0x15, 0x31, 0xdf, 0x3d, 0x48, 0x27, 0x47, 0xa8, 0xc1, 0x00, 0x67, 0x91, 0xfb, - 0x11, 0x1f, 0x89, 0xec, 0x92, 0x34, 0xe5, 0x04, 0x1a, 0x42, 0x32, 0x92, 0xf1, 0x99, 0x20, 0x6d, - 0x75, 0x02, 0x1a, 0xb3, 0x8f, 0xa1, 0x13, 0x5e, 0x84, 0xc9, 0x30, 0xec, 0x0f, 0xb9, 0xdb, 0xda, +func init() { proto.RegisterFile("core.proto", fileDescriptor_core_44df2169fdb40de1) } + +var fileDescriptor_core_44df2169fdb40de1 = []byte{ + // 2551 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x19, 0x4d, 0x73, 0x1b, 0x49, + 0x35, 0xd2, 0x48, 0x96, 0xf4, 0x24, 0x7f, 0xf5, 0x7a, 0xbd, 0x53, 0xb3, 0xbb, 0x59, 0x67, 0x5c, + 0x6c, 0xbc, 0xd4, 0xc6, 0xbb, 0xeb, 0xd4, 0x26, 0x21, 0x81, 0xd4, 0x3a, 0xb6, 0x37, 0x31, 0x95, + 0x04, 0x33, 0xa1, 0x8a, 0x0b, 0x85, 0x19, 0xcd, 0xb4, 0xe5, 0xa9, 0x48, 0xea, 0x61, 0xa6, 0x65, + 0xf0, 0x99, 0x03, 0x47, 0x38, 0x50, 0x5c, 0x39, 0x72, 0xe4, 0x04, 0x55, 0xfc, 0x06, 0x6e, 0xfc, + 0x02, 0x7e, 0x00, 0x3f, 0x82, 0x7a, 0xaf, 0x7b, 0x7a, 0x7a, 0xf4, 0xe1, 0x60, 0x53, 0x9c, 0xd4, + 0xef, 0xf5, 0xeb, 0xee, 0xf7, 0xfd, 0xde, 0x3c, 0x01, 0x44, 0x22, 0xe3, 0xbb, 0x69, 0x26, 0xa4, + 0x60, 0xf5, 0xb4, 0xef, 0xb7, 0xa0, 0x79, 0x34, 0x4a, 0xe5, 0xa5, 0xff, 0x16, 0xde, 0x3b, 0xe4, + 0xe9, 0x50, 0x5c, 0xbe, 0x91, 0xa1, 0x9c, 0xe4, 0x3f, 0x4a, 0x65, 0x22, 0xc6, 0x39, 0x73, 0xa1, + 0x15, 0xa6, 0xe9, 0x38, 0x1c, 0x71, 0xb7, 0xb6, 0x55, 0xdb, 0xe9, 0x04, 0x05, 0xc8, 0x6e, 0x03, + 0xf0, 0xb1, 0xcc, 0x2e, 0x53, 0x91, 0x8c, 0xa5, 0x5b, 0xa7, 0x4d, 0x0b, 0xc3, 0x3c, 0x68, 0x8f, + 0x45, 0xcc, 0xe9, 0xa8, 0x43, 0xbb, 0x06, 0xf6, 0xff, 0x5c, 0xab, 0xbe, 0xf6, 0x8a, 0xe7, 0x79, + 0x38, 0xe0, 0x6c, 0x13, 0x96, 0xc2, 0x08, 0x1f, 0xd6, 0x8f, 0x69, 0xc8, 0xe6, 0xa2, 0x7e, 0x15, + 0x17, 0xce, 0x95, 0x5c, 0x34, 0xaa, 0x5c, 0xb0, 0x15, 0xa8, 0x27, 0xb1, 0xdb, 0x24, 0x6c, 0x3d, + 0x89, 0x19, 0x83, 0x46, 0x1c, 0xca, 0xd0, 0x5d, 0xda, 0xaa, 0xed, 0xf4, 0x02, 0x5a, 0xfb, 0xf7, + 0xc0, 0x39, 0x11, 0xb4, 0x65, 0xe9, 0x80, 0xd6, 0x44, 0xce, 0xf3, 0x48, 0x73, 0x44, 0x6b, 0x7f, + 0x1b, 0x1a, 0x27, 0x22, 0xce, 0xd9, 0x87, 0xd0, 0x48, 0x45, 0x9c, 0xbb, 0xb5, 0x2d, 0x67, 0xa7, + 0xbb, 0xd7, 0xda, 0x4d, 0xfb, 0xbb, 0x27, 0x22, 0x0e, 0x08, 0xe9, 0x7f, 0x0b, 0xec, 0x65, 0x92, + 0xcb, 0xd7, 0x5c, 0xfe, 0x4a, 0x64, 0x6f, 0x2d, 0x4d, 0xa7, 0x22, 0xb6, 0x35, 0xad, 0x41, 0xd4, + 0x4a, 0x9c, 0x25, 0x17, 0x3c, 0xd3, 0x4f, 0x69, 0xc8, 0x7f, 0x08, 0x2d, 0x7d, 0xc7, 0x5c, 0xfe, + 0x5c, 0x68, 0xe5, 0x93, 0xfe, 0x98, 0xcb, 0xdc, 0xad, 0x6f, 0x39, 0x78, 0xa1, 0x06, 0xfd, 0xfb, + 0xd0, 0xd6, 0x07, 0x73, 0x76, 0x17, 0xda, 0x63, 0xbd, 0xd6, 0xdc, 0x76, 0x91, 0x5b, 0xbd, 0x1f, + 0x98, 0x4d, 0xff, 0x5f, 0x75, 0x68, 0xbc, 0x16, 0x31, 0x9f, 0xfb, 0x96, 0x07, 0x6d, 0x3e, 0x8e, + 0x6d, 0x57, 0x30, 0xb0, 0x2d, 0x98, 0x53, 0x15, 0x6c, 0x1b, 0x9c, 0x28, 0x9d, 0xb8, 0x0d, 0x7a, + 0x76, 0x9d, 0x9e, 0x15, 0x31, 0xdf, 0x3d, 0x48, 0x27, 0x47, 0x68, 0xc1, 0x00, 0x77, 0x51, 0xfa, + 0x11, 0x1f, 0x89, 0xec, 0x92, 0x2c, 0xe5, 0x04, 0x1a, 0x42, 0x36, 0x92, 0xf1, 0x99, 0x20, 0x6b, + 0x75, 0x02, 0x5a, 0xb3, 0x8f, 0xa0, 0x13, 0x5e, 0x84, 0xc9, 0x30, 0xec, 0x0f, 0xb9, 0xdb, 0xda, 0xaa, 0xed, 0xb4, 0x83, 0x12, 0xc1, 0x3e, 0x87, 0xa5, 0x61, 0xd8, 0xe7, 0xc3, 0xdc, 0x6d, 0xd3, - 0x8d, 0x1b, 0xe6, 0xc6, 0x57, 0x84, 0x56, 0x97, 0xea, 0x35, 0xde, 0x43, 0x68, 0x17, 0x84, 0xb0, - 0x35, 0x70, 0xde, 0xf1, 0x4b, 0xcd, 0x31, 0x0e, 0xd9, 0x06, 0x34, 0x2f, 0xc2, 0xe1, 0x44, 0xd9, - 0xa3, 0x13, 0x28, 0xe0, 0x49, 0xfd, 0x71, 0xcd, 0xfb, 0x2e, 0x74, 0xad, 0xe3, 0xde, 0xb7, 0xb5, - 0x63, 0x6d, 0xf5, 0xef, 0x41, 0x13, 0xc9, 0xc9, 0xd9, 0x6d, 0x68, 0xa2, 0x95, 0x16, 0x1a, 0x69, - 0x17, 0x84, 0x06, 0x0a, 0xed, 0x47, 0xb0, 0x8c, 0xe0, 0xbe, 0x61, 0xcd, 0x36, 0xf3, 0xda, 0x94, - 0x99, 0x5b, 0xf2, 0xaf, 0x57, 0xe5, 0x5f, 0x11, 0x97, 0x33, 0x25, 0x2e, 0xff, 0xcf, 0x75, 0xe8, - 0x1c, 0x88, 0xb1, 0x0c, 0x93, 0x31, 0xcf, 0xb4, 0xb3, 0xd4, 0x8c, 0xb3, 0x2c, 0x3e, 0xf5, 0x0a, - 0xc7, 0x37, 0xb6, 0xd3, 0xb0, 0x6c, 0x67, 0x47, 0x59, 0x41, 0x93, 0x58, 0xdd, 0x44, 0x56, 0xcd, - 0xad, 0x53, 0xa6, 0xb0, 0x01, 0xcd, 0x5f, 0x4c, 0x84, 0xf6, 0xd0, 0x5a, 0xa0, 0x00, 0xcb, 0x40, - 0x5a, 0x15, 0x03, 0xb9, 0x0d, 0x90, 0x66, 0xc9, 0x45, 0x32, 0xe4, 0x03, 0x1e, 0xbb, 0x6d, 0x62, - 0xcf, 0xc2, 0x20, 0x07, 0xc9, 0x38, 0x4f, 0x79, 0x24, 0xdd, 0x0e, 0x79, 0x7c, 0x01, 0xde, 0x54, - 0xf5, 0xfe, 0xef, 0x6b, 0xe0, 0x1a, 0xda, 0x55, 0x7c, 0xe3, 0x71, 0xe1, 0xdf, 0x73, 0x04, 0xf8, - 0x3f, 0x88, 0x69, 0x45, 0x0c, 0x6b, 0x5a, 0x31, 0xec, 0x29, 0x80, 0xa1, 0x2a, 0x67, 0xf7, 0x31, - 0x07, 0x14, 0x90, 0x36, 0xb0, 0xe5, 0x8a, 0xd4, 0x03, 0x6b, 0x81, 0xff, 0x09, 0x74, 0xcd, 0xc4, - 0xf1, 0xe1, 0x34, 0x17, 0xfe, 0x16, 0xf4, 0xac, 0xe9, 0x1c, 0xc5, 0x95, 0xe8, 0xb8, 0xd7, 0x09, - 0x70, 0xe8, 0x7f, 0x03, 0x9b, 0x01, 0x1f, 0x89, 0x0b, 0x6e, 0xd6, 0x15, 0x12, 0x99, 0x59, 0x8b, - 0xa2, 0x3d, 0x13, 0x59, 0xa4, 0x24, 0xd2, 0x0e, 0x14, 0xe0, 0x7f, 0x0b, 0x2b, 0x01, 0x0f, 0x87, - 0x43, 0x11, 0x2d, 0xde, 0xb9, 0xa6, 0x8c, 0xa8, 0x4e, 0x86, 0x41, 0xc6, 0xb2, 0x06, 0xce, 0x88, - 0x8f, 0x48, 0x7c, 0x4e, 0x80, 0x43, 0xff, 0x35, 0x2c, 0xef, 0xc7, 0xf1, 0x89, 0x30, 0x2a, 0x99, - 0x17, 0xc9, 0x90, 0x84, 0xf0, 0x42, 0x14, 0xb1, 0x56, 0x01, 0x26, 0xd6, 0x3b, 0x56, 0xac, 0xff, - 0x14, 0xd6, 0x14, 0x63, 0x57, 0x9f, 0xe8, 0x6f, 0xc3, 0xf2, 0x0b, 0x2e, 0xdf, 0xb3, 0xe8, 0xef, - 0x75, 0x58, 0xd9, 0x8f, 0x63, 0xf4, 0xea, 0x62, 0xd9, 0x55, 0x3e, 0x7d, 0xb3, 0x78, 0xbb, 0x02, - 0xf5, 0x28, 0xd4, 0x26, 0x53, 0x8f, 0x42, 0x24, 0x24, 0xe2, 0x99, 0xd4, 0x29, 0x90, 0xc6, 0x85, - 0xbd, 0x2f, 0x95, 0xf6, 0xae, 0x45, 0x8b, 0xce, 0xd5, 0x34, 0x7e, 0x98, 0x9f, 0x87, 0x19, 0x27, - 0xa7, 0x72, 0x02, 0x05, 0x58, 0x7e, 0xd8, 0xa9, 0xf8, 0xe1, 0x43, 0x13, 0x76, 0x81, 0x8c, 0xed, - 0x36, 0x1a, 0x5b, 0x95, 0xd7, 0xb9, 0x01, 0xf8, 0xbf, 0x08, 0xa4, 0xc7, 0xb0, 0xae, 0x54, 0xf3, - 0x9f, 0xca, 0x73, 0x61, 0x34, 0x43, 0xe3, 0x7b, 0xc1, 0xa5, 0x7d, 0xce, 0xe2, 0x44, 0x6d, 0xdf, - 0x50, 0x9f, 0x2a, 0x79, 0x9e, 0xc1, 0x1a, 0x25, 0x7d, 0x8c, 0xdf, 0xef, 0x3f, 0x69, 0x0d, 0x9c, - 0x70, 0x38, 0xd4, 0x6e, 0x80, 0x43, 0xff, 0x8f, 0x4d, 0x68, 0x3e, 0x9f, 0x24, 0x43, 0xaa, 0x45, - 0xfa, 0x61, 0x6e, 0xcc, 0x07, 0xc7, 0x88, 0xcb, 0x78, 0x2a, 0x8a, 0x5a, 0x04, 0xc7, 0x78, 0xfa, - 0x05, 0xcf, 0x72, 0xac, 0xa6, 0xb4, 0x1d, 0x68, 0x10, 0x4f, 0x8f, 0x93, 0x4c, 0x1b, 0x02, 0x0e, - 0x31, 0x13, 0xe4, 0x93, 0xfe, 0x48, 0xc4, 0x93, 0x21, 0x27, 0x73, 0x68, 0x07, 0x25, 0x02, 0xf9, - 0x8a, 0xc4, 0x68, 0x14, 0x8e, 0xe3, 0xdc, 0x5d, 0x22, 0x9f, 0x33, 0x30, 0xbb, 0x07, 0x0d, 0x3e, - 0xbe, 0xc8, 0xdd, 0x16, 0xe9, 0xf6, 0x03, 0xd4, 0x2d, 0x91, 0xb9, 0x7b, 0x34, 0xbe, 0xd0, 0x0a, - 0xa5, 0x05, 0xb8, 0x30, 0xcc, 0x06, 0x45, 0xee, 0xb5, 0x16, 0xee, 0x67, 0x83, 0x62, 0x21, 0x2e, - 0x60, 0xf7, 0x8d, 0xbd, 0x74, 0x68, 0xe9, 0x87, 0xe5, 0xd2, 0x39, 0x66, 0xc2, 0x1e, 0x42, 0x27, - 0xcc, 0x64, 0x72, 0x16, 0x46, 0xb2, 0xb0, 0x30, 0xd7, 0x3e, 0x5c, 0x4f, 0xa9, 0x4d, 0xe5, 0x52, - 0xf6, 0x1d, 0x68, 0x46, 0x61, 0x74, 0xce, 0xdd, 0x6e, 0x59, 0x0c, 0xa8, 0x3d, 0x07, 0x88, 0x56, - 0xeb, 0xd5, 0x12, 0xef, 0x11, 0x74, 0x0c, 0x3b, 0xd7, 0x31, 0x44, 0xdc, 0x68, 0xd8, 0xbb, 0xd6, - 0xc6, 0x9b, 0x1b, 0xbf, 0xf7, 0x3d, 0x58, 0xa9, 0x72, 0x7d, 0xad, 0xdd, 0x8f, 0x01, 0x4a, 0xfe, - 0xaf, 0xe5, 0x74, 0x7f, 0xa8, 0xc1, 0x12, 0x09, 0x30, 0xc7, 0x50, 0x90, 0xcb, 0x70, 0xc0, 0x8b, - 0x10, 0xad, 0x21, 0xb6, 0x0b, 0x4b, 0x7d, 0x5a, 0x41, 0x15, 0xa9, 0xce, 0xf6, 0x6a, 0x8f, 0xfe, - 0x68, 0xdd, 0xaa, 0x55, 0xde, 0x21, 0x74, 0x2d, 0xf4, 0x1c, 0x6a, 0xee, 0xd8, 0xd4, 0x74, 0xf7, - 0x3a, 0xe6, 0x3c, 0x9b, 0xb0, 0x5f, 0xd7, 0x60, 0x9d, 0x90, 0xc7, 0xa3, 0x70, 0xc0, 0xaf, 0x0a, - 0xfe, 0x0c, 0x1a, 0x93, 0xdc, 0xd4, 0xd9, 0x34, 0xc6, 0x4b, 0x27, 0x49, 0x4c, 0x2e, 0xd4, 0x0c, - 0x70, 0x88, 0x18, 0x19, 0x0e, 0x0a, 0xf7, 0x91, 0xe1, 0x80, 0xf9, 0x86, 0xaf, 0x26, 0xd1, 0x01, - 0x25, 0x5f, 0x05, 0x2f, 0x3e, 0x87, 0xee, 0x4b, 0x21, 0x4c, 0xb9, 0x7f, 0x07, 0xba, 0xe1, 0x99, - 0xe4, 0xd9, 0x69, 0x2e, 0xc3, 0x4c, 0x6a, 0x39, 0x01, 0xa1, 0xde, 0x22, 0x06, 0x17, 0xf4, 0xf9, - 0x99, 0xc8, 0xf8, 0x69, 0x2e, 0x45, 0xaa, 0x4b, 0x78, 0x50, 0xa8, 0xb7, 0x52, 0xa4, 0x65, 0xb2, - 0x74, 0xec, 0x64, 0x29, 0x81, 0xbd, 0xe4, 0xe1, 0x50, 0x9e, 0x1f, 0x9c, 0xf3, 0xc8, 0xdc, 0xf6, - 0x11, 0x74, 0x64, 0x94, 0x9e, 0xa6, 0x22, 0x93, 0x85, 0x4e, 0xda, 0x32, 0x4a, 0x4f, 0x10, 0xc6, - 0xc9, 0x73, 0x29, 0xd5, 0x6c, 0x11, 0xb7, 0x10, 0x81, 0xb3, 0xc4, 0x7e, 0x36, 0xd4, 0x11, 0x04, - 0x87, 0x94, 0x35, 0x44, 0xac, 0x4a, 0x8f, 0x66, 0x40, 0x63, 0xff, 0xb7, 0x35, 0x80, 0x57, 0x62, - 0x60, 0xc9, 0x56, 0x5e, 0xa6, 0x46, 0xb6, 0x38, 0x66, 0x7b, 0xb0, 0x14, 0x89, 0xf1, 0x59, 0x32, - 0xd0, 0xba, 0xf7, 0x50, 0x46, 0xe5, 0x1e, 0x2c, 0x3f, 0xce, 0x92, 0x81, 0xd6, 0xbf, 0x5a, 0x89, - 0x5e, 0x60, 0xa1, 0xaf, 0x65, 0x8d, 0x7f, 0xa9, 0xc3, 0xfa, 0x91, 0xa9, 0x99, 0xae, 0x52, 0xba, - 0x0b, 0x2d, 0x1d, 0xcd, 0x8a, 0xd8, 0xaf, 0xc1, 0xa9, 0x0a, 0xd2, 0x99, 0xa9, 0x20, 0x67, 0xe3, - 0xe8, 0x16, 0x38, 0x43, 0x31, 0xd0, 0x56, 0xb0, 0x52, 0xe5, 0x30, 0xc0, 0x29, 0x8a, 0xf9, 0x93, - 0xfe, 0x30, 0xc9, 0xcf, 0x75, 0x28, 0x2d, 0x40, 0xf6, 0x18, 0xba, 0xe7, 0xa4, 0xb9, 0x08, 0x35, - 0x47, 0xf9, 0x56, 0x7b, 0xc8, 0xac, 0x42, 0x03, 0x7b, 0x29, 0xdb, 0x86, 0xc6, 0xb9, 0x10, 0xef, - 0x28, 0x1d, 0x77, 0xf7, 0x56, 0x69, 0x4b, 0x69, 0x6a, 0x01, 0x4d, 0xb2, 0xff, 0x87, 0x95, 0x8c, - 0x93, 0xb1, 0x9d, 0xa6, 0x62, 0x98, 0x44, 0x2a, 0x4d, 0x77, 0x82, 0x65, 0x8d, 0x3d, 0x21, 0xa4, - 0xff, 0x8f, 0x16, 0x2c, 0xab, 0xd2, 0xf5, 0x2a, 0x99, 0x7d, 0x3d, 0xf3, 0xf8, 0xd7, 0x71, 0x7a, - 0x46, 0xe4, 0x95, 0xca, 0x75, 0x71, 0x69, 0x72, 0x55, 0x4d, 0xbb, 0x01, 0xcd, 0x04, 0x3d, 0x57, - 0xd7, 0x29, 0x0a, 0x60, 0x9f, 0x00, 0xf0, 0x5f, 0xc9, 0x2c, 0x3c, 0xa5, 0xac, 0xa2, 0xea, 0x95, - 0x0e, 0x61, 0x30, 0xe2, 0xa2, 0x51, 0x47, 0xe9, 0xe4, 0x54, 0xbd, 0x17, 0x5a, 0x54, 0x16, 0xb6, - 0xa3, 0x74, 0xf2, 0xa3, 0xa9, 0x27, 0x43, 0xbb, 0x52, 0xaa, 0x6c, 0x40, 0x33, 0x12, 0x93, 0xb1, - 0x7a, 0x10, 0x34, 0x03, 0x05, 0xa0, 0x9a, 0xf9, 0xf8, 0x82, 0x72, 0x4b, 0x27, 0xc0, 0x21, 0x29, - 0x7e, 0x9c, 0x53, 0xe6, 0x40, 0xc5, 0x2b, 0x77, 0x56, 0xd4, 0x9c, 0x8b, 0x5c, 0xe6, 0x6e, 0x4f, - 0x79, 0x2b, 0xa1, 0x5e, 0x22, 0x86, 0xb2, 0xb1, 0x18, 0x4e, 0x46, 0x3c, 0x77, 0x97, 0x95, 0xde, - 0x35, 0xc8, 0x9e, 0x5a, 0x2f, 0xf0, 0x15, 0x72, 0x8d, 0x3b, 0x28, 0xc9, 0x8a, 0x12, 0x8a, 0xf7, - 0xb8, 0x8e, 0x8f, 0x66, 0x03, 0xdb, 0x82, 0xae, 0x1e, 0x8f, 0xd0, 0x27, 0x57, 0x49, 0x0c, 0x36, - 0xca, 0xc4, 0xb4, 0x35, 0x2b, 0xa6, 0x6d, 0x40, 0x33, 0xe6, 0xfd, 0xc9, 0xc0, 0x5d, 0x57, 0xa1, - 0x83, 0x00, 0x2c, 0x02, 0x44, 0xca, 0xc7, 0x6f, 0x65, 0x9c, 0x8c, 0x5d, 0xa6, 0x8a, 0x00, 0x83, - 0x60, 0x5f, 0x40, 0x63, 0xc4, 0x65, 0xe8, 0x7e, 0x40, 0x24, 0x7e, 0x34, 0x4b, 0xe2, 0x6b, 0x2e, - 0x43, 0x9d, 0xc7, 0x71, 0x21, 0xdb, 0x07, 0x40, 0x15, 0xea, 0x5c, 0xbe, 0x41, 0xdb, 0xee, 0xce, - 0xe1, 0xcc, 0xac, 0x51, 0x9b, 0xad, 0x4d, 0x6c, 0x1b, 0x96, 0x63, 0x5a, 0x7c, 0x3a, 0xe2, 0xf2, - 0x5c, 0xc4, 0xee, 0x87, 0xc4, 0x44, 0x4f, 0x21, 0x5f, 0x13, 0x0e, 0x09, 0xa3, 0x27, 0xcf, 0xe6, - 0x22, 0xc2, 0x0e, 0x43, 0x43, 0x18, 0x2e, 0xf4, 0x9e, 0xc2, 0x72, 0x45, 0x9c, 0xd7, 0xcd, 0xe8, - 0x86, 0xd1, 0x6b, 0x6d, 0xfc, 0x3e, 0xac, 0x4e, 0xb1, 0x7a, 0xdd, 0x7b, 0x0d, 0x1f, 0xef, 0xdb, - 0xd8, 0xb3, 0x03, 0x61, 0x1f, 0x98, 0xaa, 0x85, 0x2b, 0xd9, 0xef, 0x46, 0x45, 0x2c, 0xfa, 0x0d, - 0x39, 0x5f, 0xee, 0x3a, 0x2a, 0xaf, 0x2b, 0xc8, 0xbf, 0x0b, 0x9d, 0x03, 0x91, 0x5e, 0x9e, 0x84, - 0xf2, 0x9c, 0x1e, 0x71, 0x29, 0x0e, 0x74, 0x9e, 0x51, 0x80, 0xff, 0xbb, 0x1a, 0xc6, 0xf2, 0xd4, - 0x44, 0x95, 0x87, 0xd0, 0x92, 0x61, 0x36, 0xe0, 0xb2, 0x78, 0x83, 0x7e, 0xac, 0xde, 0xa0, 0x66, - 0xc5, 0xee, 0x8f, 0xd5, 0xb4, 0xd2, 0x5c, 0xb1, 0xd8, 0x3b, 0x86, 0x9e, 0x3d, 0x31, 0x47, 0x14, - 0xdb, 0xd5, 0x9a, 0x60, 0xb9, 0x38, 0x97, 0xa8, 0xb3, 0x25, 0xf3, 0x14, 0xba, 0x47, 0x59, 0x26, - 0xb2, 0x43, 0x2e, 0xc3, 0xa4, 0xcc, 0x6b, 0x35, 0x0a, 0x09, 0x34, 0x46, 0x31, 0x8d, 0x54, 0x6f, - 0xb2, 0xc8, 0x0d, 0x1a, 0xf4, 0xff, 0x56, 0x29, 0x2a, 0x8a, 0x06, 0xe6, 0xf4, 0x23, 0x5f, 0x15, - 0x42, 0x72, 0x92, 0x17, 0xad, 0x3b, 0x05, 0xa1, 0x90, 0xd3, 0x4c, 0x0c, 0x32, 0x9e, 0xe7, 0x45, - 0x8f, 0xa4, 0x80, 0x51, 0x7e, 0x1c, 0xc9, 0xd2, 0x71, 0x50, 0x01, 0xea, 0xa4, 0x8c, 0x87, 0x23, - 0x1d, 0x05, 0x35, 0xc4, 0xf6, 0xa0, 0x47, 0x0b, 0x4e, 0x63, 0xe2, 0x82, 0x02, 0xa1, 0xce, 0x01, - 0x16, 0x73, 0x41, 0x97, 0x97, 0x80, 0xff, 0x4f, 0x07, 0x36, 0x0f, 0x32, 0x1e, 0xca, 0xf2, 0x4d, - 0x5e, 0x30, 0x70, 0x33, 0xbb, 0x50, 0x6c, 0x3b, 0x76, 0x27, 0x75, 0xa6, 0xcd, 0x63, 0xd8, 0x6a, - 0xda, 0x6c, 0x51, 0x93, 0x32, 0x8a, 0x50, 0x0e, 0x4b, 0x14, 0x71, 0x0a, 0x90, 0x7d, 0x5d, 0x3c, - 0x3b, 0xd1, 0x38, 0xb6, 0x49, 0x89, 0x73, 0x49, 0x5e, 0xd4, 0x23, 0x6a, 0xcf, 0xef, 0x11, 0x55, - 0xdf, 0xa6, 0xfb, 0x65, 0x36, 0x56, 0x4f, 0x87, 0x7b, 0x57, 0x5c, 0x74, 0xa2, 0x56, 0x6a, 0x83, - 0x2c, 0xd2, 0x36, 0xd3, 0xc9, 0xb7, 0xab, 0x3a, 0x2e, 0x38, 0xbe, 0x71, 0xef, 0xf0, 0x09, 0xf4, - 0xec, 0x4b, 0xae, 0x55, 0xf0, 0xfc, 0x00, 0xd6, 0x83, 0xc9, 0x78, 0x7f, 0x1c, 0xff, 0x24, 0x4c, - 0x64, 0xa1, 0xce, 0xbb, 0xd0, 0x33, 0xbd, 0x9c, 0x53, 0x63, 0x99, 0x5d, 0x83, 0x3b, 0x2e, 0xbb, - 0xde, 0x75, 0xab, 0x63, 0xf4, 0xf3, 0x4a, 0xcc, 0x28, 0x0e, 0x33, 0x79, 0xb8, 0x66, 0xe7, 0x61, - 0x4b, 0x83, 0xf5, 0xaa, 0x06, 0x3d, 0x68, 0x6b, 0x6f, 0x29, 0xe2, 0x85, 0x81, 0xfd, 0x9f, 0xce, - 0x74, 0x85, 0x16, 0xb9, 0xd0, 0xe2, 0xf3, 0x2d, 0xe7, 0x74, 0xaa, 0xce, 0xf9, 0x1c, 0x4f, 0xa7, - 0x8e, 0x51, 0xc0, 0x73, 0x31, 0xc9, 0x22, 0x7e, 0xed, 0xd3, 0xfd, 0xdf, 0xe8, 0x80, 0x75, 0x5d, - 0xd7, 0x2e, 0x6c, 0xdf, 0xa9, 0xbe, 0x2b, 0x30, 0x0a, 0x16, 0xfe, 0x80, 0xe3, 0x05, 0xfe, 0x30, - 0xef, 0x1f, 0xc4, 0xcf, 0x6c, 0xcd, 0x16, 0xf1, 0xf3, 0xd1, 0x54, 0x99, 0x46, 0x94, 0xe9, 0x2e, - 0x7a, 0x65, 0x22, 0x98, 0x2a, 0xe7, 0xd6, 0xc0, 0x39, 0x18, 0xc5, 0x5a, 0xdd, 0x38, 0xdc, 0xfb, - 0x2b, 0x40, 0xeb, 0x40, 0x64, 0x3c, 0x38, 0x39, 0x60, 0x77, 0xa1, 0xfd, 0x2a, 0xc9, 0x25, 0xfd, - 0xc4, 0xa0, 0xd7, 0x14, 0xfd, 0x1d, 0xf2, 0xda, 0xfa, 0x0f, 0x46, 0xee, 0xdf, 0x62, 0x9f, 0xc2, - 0x92, 0x6a, 0xa3, 0xb1, 0x75, 0xdd, 0xc9, 0x29, 0x7b, 0x5b, 0x5e, 0xf1, 0xab, 0xc3, 0xbf, 0xc5, - 0x76, 0xa1, 0x63, 0xfa, 0x63, 0x8c, 0x9e, 0xd7, 0xd3, 0xed, 0x32, 0xaf, 0xbc, 0x41, 0x9d, 0xab, - 0xfa, 0x64, 0xea, 0xdc, 0x4a, 0xcf, 0xcc, 0x3e, 0xf7, 0x33, 0x68, 0xe9, 0xee, 0x11, 0x63, 0xb3, - 0xad, 0x24, 0xcf, 0x34, 0xcb, 0x89, 0x04, 0x28, 0xfb, 0x40, 0xec, 0xc3, 0x92, 0x06, 0x7b, 0x83, - 0x75, 0xf4, 0x57, 0xb0, 0xf6, 0x56, 0x35, 0x7b, 0xca, 0xd6, 0xba, 0xf9, 0x2f, 0x61, 0x50, 0x95, - 0x2b, 0x3e, 0x83, 0x96, 0xee, 0x0f, 0x29, 0x6a, 0xaa, 0xcd, 0xa2, 0xca, 0xd2, 0x2f, 0xa1, 0xf7, - 0x82, 0xcb, 0xb2, 0xa5, 0xbe, 0x5a, 0xe9, 0xba, 0x1e, 0x1f, 0x7a, 0xd5, 0x36, 0xac, 0x7f, 0x8b, - 0x3d, 0xa0, 0xd6, 0xa1, 0xd5, 0xbc, 0x5d, 0x9b, 0xda, 0x92, 0x7b, 0x2b, 0x15, 0x0c, 0xea, 0xe7, - 0x0b, 0xda, 0x84, 0x77, 0x3e, 0xbf, 0x7c, 0x43, 0xd6, 0xf7, 0x1e, 0xba, 0xbe, 0x82, 0x9e, 0xd6, - 0xb9, 0xfa, 0xfb, 0x40, 0xba, 0x9a, 0x6e, 0x56, 0x29, 0x5d, 0x11, 0xc6, 0xbf, 0xc5, 0x1e, 0xaa, - 0x2d, 0xe6, 0x2f, 0xd2, 0xa6, 0xd9, 0x52, 0xf9, 0xa9, 0xe5, 0xf5, 0xac, 0x7f, 0x49, 0xb8, 0xef, - 0x29, 0xac, 0xe0, 0x2a, 0x8b, 0xa3, 0xff, 0x2b, 0x0d, 0xb6, 0xf2, 0xe7, 0x71, 0x0e, 0x63, 0x4f, - 0xf4, 0x7f, 0x33, 0x11, 0x73, 0xeb, 0x80, 0x79, 0xdc, 0xcd, 0xee, 0x7d, 0x06, 0xeb, 0x33, 0x9d, - 0x79, 0xf6, 0x71, 0x65, 0xd9, 0x54, 0xc3, 0xbe, 0x6a, 0x9c, 0x9f, 0x43, 0x03, 0x83, 0x41, 0xa1, - 0x33, 0x53, 0xa5, 0x78, 0x06, 0xa1, 0xe3, 0x84, 0x7f, 0xeb, 0xcb, 0x1a, 0x7b, 0x06, 0x50, 0xd6, - 0x06, 0xac, 0x6c, 0x60, 0xd9, 0x25, 0x98, 0x37, 0x85, 0xb6, 0xf7, 0xef, 0x43, 0xd7, 0x8a, 0xbf, - 0x4a, 0xba, 0xb3, 0x45, 0x9c, 0x37, 0x8d, 0xb7, 0x8f, 0x38, 0x84, 0x9e, 0x2d, 0xd5, 0xc5, 0x72, - 0x9e, 0x99, 0xb0, 0x4f, 0xf9, 0x06, 0xa0, 0x0c, 0x3d, 0xda, 0x81, 0xa6, 0x43, 0x91, 0x37, 0x85, - 0x36, 0xfb, 0x77, 0x6a, 0x44, 0xc7, 0xea, 0x54, 0x3a, 0x65, 0xb3, 0x31, 0xca, 0xf3, 0x16, 0xa7, - 0x5d, 0xa2, 0xe3, 0x35, 0xac, 0x4e, 0xa5, 0x0b, 0xe6, 0x95, 0xcc, 0x4f, 0xff, 0x59, 0xf0, 0xe6, - 0xcd, 0xd9, 0xc7, 0x1d, 0xe1, 0x71, 0x95, 0xfc, 0xa0, 0xcc, 0xa8, 0xfa, 0x9b, 0xa1, 0x38, 0x66, - 0x5e, 0x22, 0xc1, 0x63, 0xfa, 0x4b, 0xf4, 0x1f, 0xfd, 0xc1, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, - 0x3d, 0xcc, 0xe7, 0x76, 0x55, 0x1f, 0x00, 0x00, + 0x8b, 0x1b, 0xe6, 0xc5, 0x97, 0x84, 0x56, 0x8f, 0x6a, 0x1a, 0xef, 0x01, 0xb4, 0x0b, 0x46, 0xd8, + 0x1a, 0x38, 0x6f, 0xf9, 0xa5, 0x96, 0x18, 0x97, 0x6c, 0x03, 0x9a, 0x17, 0xe1, 0x70, 0xa2, 0xfc, + 0xd1, 0x09, 0x14, 0xf0, 0xb8, 0xfe, 0xa8, 0xe6, 0x7d, 0x0f, 0xba, 0xd6, 0x75, 0xef, 0x3a, 0xda, + 0xb1, 0x8e, 0xfa, 0x77, 0xa1, 0x89, 0xec, 0xe4, 0xec, 0x36, 0x34, 0xd1, 0x4b, 0x0b, 0x8b, 0xb4, + 0x0b, 0x46, 0x03, 0x85, 0xf6, 0x23, 0x58, 0x46, 0x70, 0xdf, 0x88, 0x66, 0xbb, 0x79, 0x6d, 0xca, + 0xcd, 0x2d, 0xfd, 0xd7, 0xab, 0xfa, 0xaf, 0xa8, 0xcb, 0x99, 0x52, 0x97, 0xff, 0x97, 0x3a, 0x74, + 0x0e, 0xc4, 0x58, 0x86, 0xc9, 0x98, 0x67, 0x3a, 0x58, 0x6a, 0x26, 0x58, 0x16, 0xdf, 0x7a, 0x45, + 0xe0, 0x1b, 0xdf, 0x69, 0x58, 0xbe, 0xb3, 0xa3, 0xbc, 0xa0, 0x49, 0xa2, 0x6e, 0xa2, 0xa8, 0xe6, + 0xd5, 0x29, 0x57, 0xd8, 0x80, 0xe6, 0x2f, 0x27, 0x42, 0x47, 0x68, 0x2d, 0x50, 0x80, 0xe5, 0x20, + 0xad, 0x8a, 0x83, 0xdc, 0x06, 0x48, 0xb3, 0xe4, 0x22, 0x19, 0xf2, 0x01, 0x8f, 0xdd, 0x36, 0x89, + 0x67, 0x61, 0x50, 0x82, 0x64, 0x9c, 0xa7, 0x3c, 0x92, 0x6e, 0x87, 0x22, 0xbe, 0x00, 0x6f, 0x6a, + 0x7a, 0xff, 0x0f, 0x35, 0x70, 0x0d, 0xef, 0x2a, 0xbf, 0xf1, 0xb8, 0x88, 0xef, 0x39, 0x0a, 0xfc, + 0x3f, 0xe4, 0xb4, 0x22, 0x87, 0x35, 0xad, 0x1c, 0xf6, 0x04, 0xc0, 0x70, 0x95, 0xb3, 0x7b, 0x58, + 0x03, 0x0a, 0x48, 0x3b, 0xd8, 0x72, 0x45, 0xeb, 0x81, 0x45, 0xe0, 0x7f, 0x0c, 0x5d, 0xb3, 0x71, + 0x7c, 0x38, 0x2d, 0x85, 0xbf, 0x05, 0x3d, 0x6b, 0x3b, 0x47, 0x75, 0x25, 0x3a, 0xef, 0x75, 0x02, + 0x5c, 0xfa, 0xdf, 0xc0, 0x66, 0xc0, 0x47, 0xe2, 0x82, 0x1b, 0xba, 0x42, 0x23, 0x33, 0xb4, 0xa8, + 0xda, 0x33, 0x91, 0x45, 0x4a, 0x23, 0xed, 0x40, 0x01, 0xfe, 0xb7, 0xb0, 0x12, 0xf0, 0x70, 0x38, + 0x14, 0xd1, 0xe2, 0x93, 0x6b, 0xca, 0x89, 0xea, 0xe4, 0x18, 0xe4, 0x2c, 0x6b, 0xe0, 0x8c, 0xf8, + 0x88, 0xd4, 0xe7, 0x04, 0xb8, 0xf4, 0x5f, 0xc1, 0xf2, 0x7e, 0x1c, 0x9f, 0x08, 0x63, 0x92, 0x79, + 0x99, 0x0c, 0x59, 0x08, 0x2f, 0x44, 0x91, 0x6b, 0x15, 0x60, 0x72, 0xbd, 0x63, 0xe5, 0xfa, 0x4f, + 0x61, 0x4d, 0x09, 0x76, 0xf5, 0x8d, 0xfe, 0x36, 0x2c, 0x3f, 0xe7, 0xf2, 0x1d, 0x44, 0xff, 0xa8, + 0xc3, 0xca, 0x7e, 0x1c, 0x63, 0x54, 0x17, 0x64, 0x57, 0xc5, 0xf4, 0xcd, 0xf2, 0xed, 0x0a, 0xd4, + 0xa3, 0x50, 0xbb, 0x4c, 0x3d, 0x0a, 0x91, 0x91, 0x88, 0x67, 0x52, 0x97, 0x40, 0x5a, 0x17, 0xfe, + 0xbe, 0x54, 0xfa, 0xbb, 0x56, 0x2d, 0x06, 0x57, 0xd3, 0xc4, 0x61, 0x7e, 0x1e, 0x66, 0x9c, 0x82, + 0xca, 0x09, 0x14, 0x60, 0xc5, 0x61, 0xa7, 0x12, 0x87, 0x0f, 0x4c, 0xda, 0x05, 0x72, 0xb6, 0xdb, + 0xe8, 0x6c, 0x55, 0x59, 0xe7, 0x26, 0xe0, 0xff, 0x21, 0x91, 0x1e, 0xc3, 0xba, 0x32, 0xcd, 0x7f, + 0xab, 0xcf, 0x85, 0xd9, 0x0c, 0x9d, 0xef, 0x39, 0x97, 0xf6, 0x3d, 0x8b, 0x0b, 0xb5, 0xfd, 0x42, + 0x7d, 0xaa, 0xe5, 0x79, 0x0a, 0x6b, 0x54, 0xf4, 0x31, 0x7f, 0xbf, 0xfb, 0xa6, 0x35, 0x70, 0xc2, + 0xe1, 0x50, 0x87, 0x01, 0x2e, 0xfd, 0x3f, 0x35, 0xa1, 0xf9, 0x6c, 0x92, 0x0c, 0xa9, 0x17, 0xe9, + 0x87, 0xb9, 0x71, 0x1f, 0x5c, 0x23, 0x2e, 0xe3, 0xa9, 0x28, 0x7a, 0x11, 0x5c, 0xe3, 0xed, 0x17, + 0x3c, 0xcb, 0xb1, 0x9b, 0xd2, 0x7e, 0xa0, 0x41, 0xbc, 0x3d, 0x4e, 0x32, 0xed, 0x08, 0xb8, 0xc4, + 0x4a, 0x90, 0x4f, 0xfa, 0x23, 0x11, 0x4f, 0x86, 0x9c, 0xdc, 0xa1, 0x1d, 0x94, 0x08, 0x94, 0x2b, + 0x12, 0xa3, 0x51, 0x38, 0x8e, 0x73, 0x77, 0x89, 0x62, 0xce, 0xc0, 0xec, 0x2e, 0x34, 0xf8, 0xf8, + 0x22, 0x77, 0x5b, 0x64, 0xdb, 0xf7, 0xd0, 0xb6, 0xc4, 0xe6, 0xee, 0xd1, 0xf8, 0x42, 0x1b, 0x94, + 0x08, 0x90, 0x30, 0xcc, 0x06, 0x45, 0xed, 0xb5, 0x08, 0xf7, 0xb3, 0x41, 0x41, 0x88, 0x04, 0xec, + 0x9e, 0xf1, 0x97, 0x0e, 0x91, 0xbe, 0x5f, 0x92, 0xce, 0x71, 0x13, 0xf6, 0x00, 0x3a, 0x61, 0x26, + 0x93, 0xb3, 0x30, 0x92, 0x85, 0x87, 0xb9, 0xf6, 0xe5, 0x7a, 0x4b, 0x1d, 0x2a, 0x49, 0xd9, 0x77, + 0xa1, 0x19, 0x85, 0xd1, 0x39, 0x77, 0xbb, 0x65, 0x33, 0xa0, 0xce, 0x1c, 0x20, 0x5a, 0xd1, 0x2b, + 0x12, 0xef, 0x21, 0x74, 0x8c, 0x38, 0xd7, 0x71, 0x44, 0x3c, 0x68, 0xc4, 0xbb, 0xd6, 0xc1, 0x9b, + 0x3b, 0xbf, 0xf7, 0x7d, 0x58, 0xa9, 0x4a, 0x7d, 0xad, 0xd3, 0x8f, 0x00, 0x4a, 0xf9, 0xaf, 0x15, + 0x74, 0x7f, 0xac, 0xc1, 0x12, 0x29, 0x30, 0xc7, 0x54, 0x90, 0xcb, 0x70, 0xc0, 0x8b, 0x14, 0xad, + 0x21, 0xb6, 0x0b, 0x4b, 0x7d, 0xa2, 0xa0, 0x8e, 0x54, 0x57, 0x7b, 0x75, 0x46, 0xff, 0x68, 0xdb, + 0x2a, 0x2a, 0xef, 0x10, 0xba, 0x16, 0x7a, 0x0e, 0x37, 0x9f, 0xd8, 0xdc, 0x74, 0xf7, 0x3a, 0xe6, + 0x3e, 0x9b, 0xb1, 0xdf, 0xd4, 0x60, 0x9d, 0x90, 0xc7, 0xa3, 0x70, 0xc0, 0xaf, 0x4a, 0xfe, 0x0c, + 0x1a, 0x93, 0xdc, 0xf4, 0xd9, 0xb4, 0xc6, 0x47, 0x27, 0x49, 0x4c, 0x21, 0xd4, 0x0c, 0x70, 0x89, + 0x18, 0x19, 0x0e, 0x8a, 0xf0, 0x91, 0xe1, 0x80, 0xf9, 0x46, 0xae, 0x26, 0xf1, 0x01, 0xa5, 0x5c, + 0x85, 0x2c, 0x3e, 0x87, 0xee, 0x0b, 0x21, 0x4c, 0xbb, 0xff, 0x09, 0x74, 0xc3, 0x33, 0xc9, 0xb3, + 0xd3, 0x5c, 0x86, 0x99, 0xd4, 0x7a, 0x02, 0x42, 0xbd, 0x41, 0x0c, 0x12, 0xf4, 0xf9, 0x99, 0xc8, + 0xf8, 0x69, 0x2e, 0x45, 0xaa, 0x5b, 0x78, 0x50, 0xa8, 0x37, 0x52, 0xa4, 0x65, 0xb1, 0x74, 0xec, + 0x62, 0x29, 0x81, 0xbd, 0xe0, 0xe1, 0x50, 0x9e, 0x1f, 0x9c, 0xf3, 0xc8, 0xbc, 0xf6, 0x21, 0x74, + 0x64, 0x94, 0x9e, 0xa6, 0x22, 0x93, 0x85, 0x4d, 0xda, 0x32, 0x4a, 0x4f, 0x10, 0xc6, 0xcd, 0x73, + 0x29, 0xd5, 0x6e, 0x91, 0xb7, 0x10, 0x81, 0xbb, 0x24, 0x7e, 0x36, 0xd4, 0x19, 0x04, 0x97, 0x54, + 0x35, 0x44, 0xac, 0x5a, 0x8f, 0x66, 0x40, 0x6b, 0xff, 0x77, 0x35, 0x80, 0x97, 0x62, 0x60, 0xe9, + 0x56, 0x5e, 0xa6, 0x46, 0xb7, 0xb8, 0x66, 0x7b, 0xb0, 0x14, 0x89, 0xf1, 0x59, 0x32, 0xd0, 0xb6, + 0xf7, 0x50, 0x47, 0xe5, 0x19, 0x6c, 0x3f, 0xce, 0x92, 0x81, 0xb6, 0xbf, 0xa2, 0xc4, 0x28, 0xb0, + 0xd0, 0xd7, 0xf2, 0xc6, 0xbf, 0xd6, 0x61, 0xfd, 0xc8, 0xf4, 0x4c, 0x57, 0x19, 0xdd, 0x85, 0x96, + 0xce, 0x66, 0x45, 0xee, 0xd7, 0xe0, 0x54, 0x07, 0xe9, 0xcc, 0x74, 0x90, 0xb3, 0x79, 0x74, 0x0b, + 0x9c, 0xa1, 0x18, 0x68, 0x2f, 0x58, 0xa9, 0x4a, 0x18, 0xe0, 0x16, 0xe5, 0xfc, 0x49, 0x7f, 0x98, + 0xe4, 0xe7, 0x3a, 0x95, 0x16, 0x20, 0x7b, 0x04, 0xdd, 0x73, 0xb2, 0x5c, 0x84, 0x96, 0xa3, 0x7a, + 0xab, 0x23, 0x64, 0xd6, 0xa0, 0x81, 0x4d, 0xca, 0xb6, 0xa1, 0x71, 0x2e, 0xc4, 0x5b, 0x2a, 0xc7, + 0xdd, 0xbd, 0x55, 0x3a, 0x52, 0xba, 0x5a, 0x40, 0x9b, 0xec, 0x3b, 0xb0, 0x92, 0x71, 0x72, 0xb6, + 0xd3, 0x54, 0x0c, 0x93, 0x48, 0x95, 0xe9, 0x4e, 0xb0, 0xac, 0xb1, 0x27, 0x84, 0xf4, 0xff, 0xdd, + 0x82, 0x65, 0xd5, 0xba, 0x5e, 0xa5, 0xb3, 0xaf, 0x67, 0x3e, 0xfe, 0x75, 0x9e, 0x9e, 0x51, 0x79, + 0xa5, 0x73, 0x5d, 0xdc, 0x9a, 0x5c, 0xd5, 0xd3, 0x6e, 0x40, 0x33, 0xc1, 0xc8, 0xd5, 0x7d, 0x8a, + 0x02, 0xd8, 0xc7, 0x00, 0xfc, 0xd7, 0x32, 0x0b, 0x4f, 0xa9, 0xaa, 0xa8, 0x7e, 0xa5, 0x43, 0x18, + 0xcc, 0xb8, 0xe8, 0xd4, 0x51, 0x3a, 0x39, 0x55, 0xdf, 0x0b, 0x2d, 0x6a, 0x0b, 0xdb, 0x51, 0x3a, + 0xf9, 0xf1, 0xd4, 0x27, 0x43, 0xbb, 0xd2, 0xaa, 0x6c, 0x40, 0x33, 0x12, 0x93, 0xb1, 0xfa, 0x20, + 0x68, 0x06, 0x0a, 0x40, 0x33, 0xf3, 0xf1, 0x05, 0xd5, 0x96, 0x4e, 0x80, 0x4b, 0x32, 0xfc, 0x38, + 0xa7, 0xca, 0x81, 0x86, 0x57, 0xe1, 0xac, 0xb8, 0x39, 0x17, 0xb9, 0xcc, 0xdd, 0x9e, 0x8a, 0x56, + 0x42, 0xbd, 0x40, 0x0c, 0x55, 0x63, 0x31, 0x9c, 0x8c, 0x78, 0xee, 0x2e, 0x2b, 0xbb, 0x6b, 0x90, + 0x3d, 0xb1, 0xbe, 0xc0, 0x57, 0x28, 0x34, 0x3e, 0x41, 0x4d, 0x56, 0x8c, 0x50, 0x7c, 0x8f, 0xeb, + 0xfc, 0x68, 0x0e, 0xb0, 0x2d, 0xe8, 0xea, 0xf5, 0x08, 0x63, 0x72, 0x95, 0xd4, 0x60, 0xa3, 0x4c, + 0x4e, 0x5b, 0xb3, 0x72, 0xda, 0x06, 0x34, 0x63, 0xde, 0x9f, 0x0c, 0xdc, 0x75, 0x95, 0x3a, 0x08, + 0xc0, 0x26, 0x40, 0xa4, 0x7c, 0xfc, 0x46, 0xc6, 0xc9, 0xd8, 0x65, 0xaa, 0x09, 0x30, 0x08, 0xf6, + 0x05, 0x34, 0x46, 0x5c, 0x86, 0xee, 0x7b, 0xc4, 0xe2, 0x87, 0xb3, 0x2c, 0xbe, 0xe2, 0x32, 0xd4, + 0x75, 0x1c, 0x09, 0xd9, 0x3e, 0x00, 0x9a, 0x50, 0xd7, 0xf2, 0x0d, 0x3a, 0x76, 0x67, 0x8e, 0x64, + 0x86, 0x46, 0x1d, 0xb6, 0x0e, 0xb1, 0x6d, 0x58, 0x8e, 0x89, 0xf8, 0x74, 0xc4, 0xe5, 0xb9, 0x88, + 0xdd, 0xf7, 0x49, 0x88, 0x9e, 0x42, 0xbe, 0x22, 0x1c, 0x32, 0x46, 0x9f, 0x3c, 0x9b, 0x8b, 0x18, + 0x3b, 0x0c, 0x0d, 0x63, 0x48, 0x48, 0xcd, 0x8e, 0x38, 0x93, 0xc3, 0x64, 0x94, 0x48, 0xf7, 0x03, + 0xdd, 0xec, 0x14, 0x08, 0xef, 0x09, 0x2c, 0x57, 0x94, 0x7d, 0xdd, 0x7a, 0x6f, 0xd4, 0x70, 0xad, + 0x83, 0x3f, 0x80, 0xd5, 0x29, 0x45, 0x5c, 0xf7, 0x5d, 0x23, 0xe5, 0xbb, 0x0e, 0xf6, 0xec, 0x34, + 0xd9, 0x07, 0xa6, 0x3a, 0xe5, 0x4a, 0x6d, 0xbc, 0x51, 0x8b, 0x8b, 0x51, 0x45, 0xa1, 0x99, 0xbb, + 0x8e, 0xaa, 0xfa, 0x0a, 0xf2, 0xef, 0x40, 0xe7, 0x40, 0xa4, 0x97, 0x27, 0xa1, 0x3c, 0xa7, 0x4f, + 0xbc, 0x14, 0x17, 0xba, 0x0a, 0x29, 0xc0, 0xff, 0x7d, 0x0d, 0x33, 0x7d, 0x6a, 0x72, 0xce, 0x03, + 0x68, 0xc9, 0x30, 0x1b, 0x70, 0x59, 0x7c, 0xa1, 0x7e, 0xa4, 0xbe, 0x50, 0x0d, 0xc5, 0xee, 0x4f, + 0xd4, 0xb6, 0xb2, 0x6b, 0x41, 0xec, 0x1d, 0x43, 0xcf, 0xde, 0x98, 0xa3, 0x8a, 0xed, 0x6a, 0xc7, + 0xb0, 0x5c, 0xdc, 0x4b, 0xdc, 0xd9, 0x9a, 0x79, 0x02, 0xdd, 0xa3, 0x2c, 0x13, 0xd9, 0x21, 0x97, + 0x61, 0x52, 0x56, 0xbd, 0x1a, 0x25, 0x0c, 0x5a, 0xa3, 0x9a, 0x46, 0x6a, 0x72, 0x59, 0x54, 0x0e, + 0x0d, 0xfa, 0x7f, 0xaf, 0xb4, 0x1c, 0xc5, 0x78, 0x73, 0x7a, 0x04, 0xa0, 0xda, 0x24, 0x39, 0xc9, + 0x8b, 0xc1, 0x9e, 0x82, 0x50, 0xc9, 0x69, 0x26, 0x06, 0x19, 0xcf, 0xf3, 0x62, 0x82, 0x52, 0xc0, + 0xa8, 0x3f, 0x8e, 0x6c, 0xe9, 0x2c, 0xa9, 0x00, 0x75, 0x53, 0xc6, 0xc3, 0x91, 0xce, 0x91, 0x1a, + 0x62, 0x7b, 0xd0, 0x23, 0x82, 0xd3, 0x98, 0xa4, 0xa0, 0x34, 0xa9, 0x2b, 0x84, 0x25, 0x5c, 0xd0, + 0xe5, 0x25, 0xe0, 0xff, 0xd3, 0x81, 0xcd, 0x83, 0x8c, 0x87, 0xb2, 0xfc, 0x62, 0x2f, 0x04, 0xb8, + 0x99, 0x5f, 0x28, 0xb1, 0x1d, 0x7b, 0xce, 0x3a, 0x33, 0x04, 0x32, 0x62, 0x35, 0x6d, 0xb1, 0x68, + 0x84, 0x19, 0x45, 0xa8, 0x87, 0x25, 0x8a, 0xd3, 0x02, 0x64, 0x5f, 0x17, 0x1f, 0xa5, 0xe8, 0x1c, + 0xdb, 0x64, 0xc4, 0xb9, 0x2c, 0x2f, 0x9a, 0x20, 0xb5, 0xe7, 0x4f, 0x90, 0xaa, 0x5f, 0xae, 0xfb, + 0x65, 0xad, 0x56, 0x1f, 0x16, 0x77, 0xaf, 0x78, 0xe8, 0x44, 0x51, 0x6a, 0x87, 0x2c, 0x8a, 0x3a, + 0xd3, 0xa5, 0xb9, 0xab, 0xe6, 0x31, 0xb8, 0xbe, 0xf1, 0x64, 0xf1, 0x31, 0xf4, 0xec, 0x47, 0xae, + 0xd5, 0x0e, 0xfd, 0x10, 0xd6, 0x83, 0xc9, 0x78, 0x7f, 0x1c, 0xff, 0x34, 0x4c, 0x64, 0x61, 0xce, + 0x3b, 0xd0, 0x33, 0x93, 0x9e, 0x53, 0xe3, 0x99, 0x5d, 0x83, 0x3b, 0x2e, 0x67, 0xe2, 0x75, 0x6b, + 0x9e, 0xf4, 0x8b, 0x4a, 0xce, 0x28, 0x2e, 0x33, 0x55, 0xba, 0x66, 0x57, 0x69, 0xcb, 0x82, 0xf5, + 0xaa, 0x05, 0x3d, 0x68, 0xeb, 0x68, 0x29, 0xf2, 0x85, 0x81, 0xfd, 0x9f, 0xcd, 0xcc, 0x8c, 0x16, + 0x85, 0xd0, 0xe2, 0xfb, 0xad, 0xe0, 0x74, 0xaa, 0xc1, 0xf9, 0x0c, 0x6f, 0xa7, 0x79, 0x52, 0xc0, + 0x73, 0x31, 0xc9, 0x22, 0x7e, 0xed, 0xdb, 0xfd, 0xdf, 0xea, 0x84, 0x75, 0xdd, 0xd0, 0x2e, 0x7c, + 0xdf, 0xa9, 0x7e, 0x75, 0x60, 0x16, 0x2c, 0xe2, 0x01, 0xd7, 0x0b, 0xe2, 0x61, 0xde, 0x3f, 0x14, + 0x3f, 0xb7, 0x2d, 0x5b, 0xe4, 0xcf, 0x87, 0x53, 0x4d, 0x1c, 0x71, 0xa6, 0x67, 0xec, 0x95, 0x8d, + 0x60, 0xaa, 0xd9, 0x5b, 0x03, 0xe7, 0x60, 0x14, 0x6b, 0x73, 0xe3, 0x72, 0xef, 0x6f, 0x00, 0xad, + 0x03, 0x91, 0xf1, 0xe0, 0xe4, 0x80, 0xdd, 0x81, 0xf6, 0xcb, 0x24, 0x97, 0xf4, 0x17, 0x07, 0x7d, + 0x6b, 0xd1, 0x7f, 0x47, 0x5e, 0x5b, 0xff, 0xbf, 0x91, 0xfb, 0xb7, 0xd8, 0xa7, 0xb0, 0xa4, 0x86, + 0x6c, 0x6c, 0x5d, 0xcf, 0x79, 0xca, 0xc9, 0x97, 0x57, 0xfc, 0x11, 0xe2, 0xdf, 0x62, 0xbb, 0xd0, + 0x31, 0xd3, 0x33, 0x46, 0x1f, 0xdf, 0xd3, 0xc3, 0x34, 0xaf, 0x7c, 0x41, 0xdd, 0xab, 0xa6, 0x68, + 0xea, 0xde, 0xca, 0x44, 0xcd, 0xbe, 0xf7, 0x33, 0x68, 0xe9, 0xd9, 0x12, 0x63, 0xb3, 0x83, 0x26, + 0xcf, 0x8c, 0xd2, 0x89, 0x05, 0x28, 0xa7, 0x44, 0xec, 0xfd, 0x92, 0x07, 0xfb, 0x80, 0x75, 0xf5, + 0x57, 0xb0, 0xf6, 0x46, 0x8d, 0x82, 0xca, 0xc1, 0xbb, 0xf9, 0xd7, 0xc2, 0xa0, 0x2a, 0x4f, 0x7c, + 0x06, 0x2d, 0x3d, 0x3d, 0x52, 0xdc, 0x54, 0x47, 0x49, 0x15, 0xd2, 0x2f, 0xa1, 0xf7, 0x9c, 0xcb, + 0x72, 0xe0, 0xbe, 0x5a, 0x99, 0xc9, 0x1e, 0x1f, 0x7a, 0xd5, 0x21, 0xad, 0x7f, 0x8b, 0xdd, 0xa7, + 0xc1, 0xa2, 0x35, 0xda, 0x5d, 0x9b, 0x3a, 0x92, 0x7b, 0x2b, 0x15, 0x0c, 0xda, 0xe7, 0x0b, 0x3a, + 0x84, 0x6f, 0x3e, 0xbb, 0x7c, 0x4d, 0xde, 0xf7, 0x0e, 0xbe, 0xbe, 0x82, 0x9e, 0xb6, 0xb9, 0xfa, + 0x6f, 0x82, 0x6c, 0x35, 0x3d, 0xca, 0x52, 0xb6, 0x22, 0x8c, 0x7f, 0x8b, 0x3d, 0x50, 0x47, 0xcc, + 0x7f, 0x4c, 0x9b, 0xe6, 0x48, 0xe5, 0x2f, 0x2f, 0xaf, 0x67, 0xfd, 0xd3, 0x84, 0xe7, 0x9e, 0xc0, + 0x0a, 0x52, 0x59, 0x12, 0x7d, 0x50, 0x3a, 0x6c, 0xe5, 0x7f, 0xc9, 0x39, 0x82, 0x3d, 0xd6, 0xff, + 0xaa, 0x89, 0x98, 0x5b, 0x17, 0xcc, 0x93, 0x6e, 0xf6, 0xec, 0x53, 0x58, 0x9f, 0x99, 0xdb, 0xb3, + 0x8f, 0x2a, 0x64, 0x53, 0xe3, 0xfc, 0xaa, 0x73, 0x7e, 0x0e, 0x0d, 0x4c, 0x06, 0x85, 0xcd, 0x4c, + 0x97, 0xe2, 0x19, 0x84, 0xce, 0x13, 0xfe, 0xad, 0x2f, 0x6b, 0xec, 0x29, 0x40, 0xd9, 0x1b, 0xb0, + 0x72, 0xbc, 0x65, 0xb7, 0x60, 0xde, 0x14, 0xda, 0x3e, 0xbf, 0x0f, 0x5d, 0x2b, 0xff, 0x2a, 0xed, + 0xce, 0x36, 0x71, 0xde, 0x34, 0xde, 0xbe, 0xe2, 0x10, 0x7a, 0xb6, 0x56, 0x17, 0xeb, 0x79, 0x66, + 0xc3, 0xbe, 0xe5, 0x1b, 0x80, 0x32, 0xf5, 0xe8, 0x00, 0x9a, 0x4e, 0x45, 0xde, 0x14, 0xda, 0x9c, + 0xdf, 0xa9, 0x11, 0x1f, 0xab, 0x53, 0xe5, 0x94, 0xcd, 0xe6, 0x28, 0xcf, 0x5b, 0x5c, 0x76, 0x89, + 0x8f, 0x57, 0xb0, 0x3a, 0x55, 0x2e, 0x98, 0x57, 0x0a, 0x3f, 0xfd, 0xbf, 0x83, 0x37, 0x6f, 0xcf, + 0xbe, 0xee, 0x08, 0xaf, 0xab, 0xd4, 0x07, 0xe5, 0x46, 0xd5, 0x3f, 0x21, 0x8a, 0x6b, 0xe6, 0x15, + 0x12, 0xbc, 0xa6, 0xbf, 0x44, 0xff, 0xb2, 0xdf, 0xff, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, + 0xa5, 0x58, 0x09, 0x73, 0x1f, 0x00, 0x00, } diff --git a/rpc/gen/core.proto b/rpc/gen/core.proto index 522721d7a..7ebb8287d 100644 --- a/rpc/gen/core.proto +++ b/rpc/gen/core.proto @@ -258,6 +258,7 @@ message DeployOptions { map nodelabels = 20; string deploy_method = 21; map data = 22; + bool softlimit = 23; } message RemoveImageOptions { diff --git a/rpc/gen/core_pb2.py b/rpc/gen/core_pb2.py index 06cf5c7b2..6a41e9bb1 100644 --- a/rpc/gen/core_pb2.py +++ b/rpc/gen/core_pb2.py @@ -19,7 +19,7 @@ name='core.proto', package='pb', syntax='proto3', - serialized_pb=_b('\n\ncore.proto\x12\x02pb\"\x07\n\x05\x45mpty\"L\n\x13\x44\x65ployStatusOptions\x12\x0f\n\x07\x61ppname\x18\x01 \x01(\t\x12\x12\n\nentrypoint\x18\x02 \x01(\t\x12\x10\n\x08nodename\x18\x03 \x01(\t\"v\n\x13\x44\x65ployStatusMessage\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\t\x12\x0f\n\x07\x61ppname\x18\x02 \x01(\t\x12\x12\n\nentrypoint\x18\x03 \x01(\t\x12\x10\n\x08nodename\x18\x04 \x01(\t\x12\n\n\x02id\x18\x05 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x06 \x01(\x0c\"!\n\x03Pod\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x65sc\x18\x02 \x01(\t\"\x1d\n\x04Pods\x12\x15\n\x04pods\x18\x01 \x03(\x0b\x32\x07.pb.Pod\"5\n\x12ListNetworkOptions\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x0e\n\x06\x64river\x18\x02 \x01(\t\"(\n\x07Network\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07subnets\x18\x02 \x03(\t\")\n\x08Networks\x12\x1d\n\x08networks\x18\x01 \x03(\x0b\x32\x0b.pb.Network\"\x89\x02\n\x04Node\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x65ndpoint\x18\x02 \x01(\t\x12\x0f\n\x07podname\x18\x03 \x01(\t\x12\x1e\n\x03\x63pu\x18\x04 \x03(\x0b\x32\x11.pb.Node.CpuEntry\x12\x0e\n\x06memory\x18\x05 \x01(\x03\x12\x0c\n\x04info\x18\x06 \x01(\t\x12\x11\n\tavailable\x18\x07 \x01(\x08\x12$\n\x06labels\x18\x08 \x03(\x0b\x32\x14.pb.Node.LabelsEntry\x1a*\n\x08\x43puEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\" \n\x05Nodes\x12\x17\n\x05nodes\x18\x01 \x03(\x0b\x32\x08.pb.Node\"E\n\rNodeAvailable\x12\x10\n\x08nodename\x18\x01 \x01(\t\x12\x0f\n\x07podname\x18\x02 \x01(\t\x12\x11\n\tavailable\x18\x03 \x01(\x08\"\xdd\x01\n\tContainer\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07podname\x18\x02 \x01(\t\x12\x10\n\x08nodename\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12#\n\x03\x63pu\x18\x05 \x03(\x0b\x32\x16.pb.Container.CpuEntry\x12\r\n\x05quota\x18\x06 \x01(\x01\x12\x0e\n\x06memory\x18\x07 \x01(\x03\x12\x12\n\nprivileged\x18\x08 \x01(\x08\x12\x0f\n\x07inspect\x18\t \x01(\x0c\x1a*\n\x08\x43puEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\"k\n\x18\x43ontainerDeployedOptions\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07\x61ppname\x18\x02 \x01(\t\x12\x12\n\nentrypoint\x18\x03 \x01(\t\x12\x10\n\x08nodename\x18\x04 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x05 \x01(\x0c\"/\n\nContainers\x12!\n\ncontainers\x18\x01 \x03(\x0b\x32\r.pb.Container\"\x19\n\x0b\x43ontainerID\x12\n\n\x02id\x18\x01 \x01(\t\"\x1b\n\x0c\x43ontainerIDs\x12\x0b\n\x03ids\x18\x01 \x03(\t\"4\n\x16RemoveContainerOptions\x12\x0b\n\x03ids\x18\x01 \x03(\t\x12\r\n\x05\x66orce\x18\x02 \x01(\x08\"7\n\x0eReallocOptions\x12\x0b\n\x03ids\x18\x01 \x03(\t\x12\x0b\n\x03\x63pu\x18\x02 \x01(\x01\x12\x0b\n\x03mem\x18\x03 \x01(\x03\":\n\rAddPodOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05\x66\x61vor\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x65sc\x18\x03 \x01(\t\" \n\x10RemovePodOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1d\n\rGetPodOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\"\xf7\x01\n\x0e\x41\x64\x64NodeOptions\x12\x10\n\x08nodename\x18\x01 \x01(\t\x12\x10\n\x08\x65ndpoint\x18\x02 \x01(\t\x12\x0f\n\x07podname\x18\x03 \x01(\t\x12\n\n\x02\x63\x61\x18\x04 \x01(\t\x12\x0c\n\x04\x63\x65rt\x18\x05 \x01(\t\x12\x0b\n\x03key\x18\x06 \x01(\t\x12\x0b\n\x03\x63pu\x18\x07 \x01(\x05\x12\r\n\x05share\x18\x08 \x01(\x03\x12\x0e\n\x06memory\x18\t \x01(\x03\x12.\n\x06labels\x18\n \x03(\x0b\x32\x1e.pb.AddNodeOptions.LabelsEntry\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"6\n\x11RemoveNodeOptions\x12\x10\n\x08nodename\x18\x01 \x01(\t\x12\x0f\n\x07podname\x18\x02 \x01(\t\"3\n\x0eGetNodeOptions\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x10\n\x08nodename\x18\x02 \x01(\t\"0\n\x10ListNodesOptions\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x0b\n\x03\x61ll\x18\x02 \x01(\x08\"\x8e\x04\n\x05\x42uild\x12\x0c\n\x04\x62\x61se\x18\x01 \x01(\t\x12\x0c\n\x04repo\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\t\x12\x0b\n\x03\x64ir\x18\x04 \x01(\t\x12\x11\n\tsubmodule\x18\x05 \x01(\x08\x12\x10\n\x08\x63ommands\x18\x06 \x03(\t\x12!\n\x04\x65nvs\x18\x07 \x03(\x0b\x32\x13.pb.Build.EnvsEntry\x12!\n\x04\x61rgs\x18\x08 \x03(\x0b\x32\x13.pb.Build.ArgsEntry\x12%\n\x06labels\x18\t \x03(\x0b\x32\x15.pb.Build.LabelsEntry\x12+\n\tartifacts\x18\n \x03(\x0b\x32\x18.pb.Build.ArtifactsEntry\x12#\n\x05\x63\x61\x63he\x18\x0b \x03(\x0b\x32\x14.pb.Build.CacheEntry\x1a+\n\tEnvsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tArgsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x30\n\x0e\x41rtifactsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a,\n\nCacheEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"z\n\x06\x42uilds\x12\x0e\n\x06stages\x18\x01 \x03(\t\x12&\n\x06\x62uilds\x18\x02 \x03(\x0b\x32\x16.pb.Builds.BuildsEntry\x1a\x38\n\x0b\x42uildsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x18\n\x05value\x18\x02 \x01(\x0b\x32\t.pb.Build:\x02\x38\x01\"e\n\x11\x42uildImageOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x0b\n\x03uid\x18\x03 \x01(\x05\x12\x0b\n\x03tag\x18\x04 \x01(\t\x12\x1a\n\x06\x62uilds\x18\x05 \x01(\x0b\x32\n.pb.Builds\"F\n\x0bHookOptions\x12\x13\n\x0b\x61\x66ter_start\x18\x01 \x03(\t\x12\x13\n\x0b\x62\x65\x66ore_stop\x18\x02 \x03(\t\x12\r\n\x05\x66orce\x18\x03 \x01(\x08\"U\n\x12HealthCheckOptions\x12\x11\n\ttcp_ports\x18\x01 \x03(\t\x12\x11\n\thttp_port\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x01(\t\x12\x0c\n\x04\x63ode\x18\x04 \x01(\x05\"u\n\nLogOptions\x12\x0c\n\x04type\x18\x01 \x01(\t\x12*\n\x06\x63onfig\x18\x02 \x03(\x0b\x32\x1a.pb.LogOptions.ConfigEntry\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xe5\x01\n\x11\x45ntrypointOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\x12\x12\n\nprivileged\x18\x03 \x01(\x08\x12\x0b\n\x03\x64ir\x18\x04 \x01(\t\x12\x1b\n\x03log\x18\x05 \x01(\x0b\x32\x0e.pb.LogOptions\x12\x0f\n\x07publish\x18\x06 \x03(\t\x12+\n\x0bhealthcheck\x18\x07 \x01(\x0b\x32\x16.pb.HealthCheckOptions\x12\x1d\n\x04hook\x18\x08 \x01(\x0b\x32\x0f.pb.HookOptions\x12\x16\n\x0erestart_policy\x18\t \x01(\t\"\xda\x05\n\rDeployOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\nentrypoint\x18\x02 \x01(\x0b\x32\x15.pb.EntrypointOptions\x12\x0f\n\x07podname\x18\x03 \x01(\t\x12\x10\n\x08nodename\x18\x04 \x01(\t\x12\r\n\x05image\x18\x05 \x01(\t\x12\x12\n\nextra_args\x18\x06 \x01(\t\x12\x11\n\tcpu_quota\x18\x07 \x01(\x01\x12\x0e\n\x06memory\x18\x08 \x01(\x03\x12\r\n\x05\x63ount\x18\t \x01(\x05\x12\x0b\n\x03\x65nv\x18\n \x03(\t\x12\x0b\n\x03\x64ns\x18\x0b \x03(\t\x12\x13\n\x0b\x65xtra_hosts\x18\x0c \x03(\t\x12\x0f\n\x07volumes\x18\r \x03(\t\x12\x31\n\x08networks\x18\x0e \x03(\x0b\x32\x1f.pb.DeployOptions.NetworksEntry\x12\x13\n\x0bnetworkmode\x18\x0f \x01(\t\x12\x0c\n\x04user\x18\x10 \x01(\t\x12\r\n\x05\x64\x65\x62ug\x18\x11 \x01(\x08\x12\x11\n\topenStdin\x18\x12 \x01(\x08\x12)\n\x04meta\x18\x13 \x03(\x0b\x32\x1b.pb.DeployOptions.MetaEntry\x12\x35\n\nnodelabels\x18\x14 \x03(\x0b\x32!.pb.DeployOptions.NodelabelsEntry\x12\x15\n\rdeploy_method\x18\x15 \x01(\t\x12)\n\x04\x64\x61ta\x18\x16 \x03(\x0b\x32\x1b.pb.DeployOptions.DataEntry\x1a/\n\rNetworksEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tMetaEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x31\n\x0fNodelabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"G\n\x12RemoveImageOptions\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x10\n\x08nodename\x18\x02 \x01(\t\x12\x0e\n\x06images\x18\x03 \x03(\t\"\x1a\n\tCopyPaths\x12\r\n\x05paths\x18\x01 \x03(\t\"{\n\x0b\x43opyOptions\x12-\n\x07targets\x18\x01 \x03(\x0b\x32\x1c.pb.CopyOptions.TargetsEntry\x1a=\n\x0cTargetsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1c\n\x05value\x18\x02 \x01(\x0b\x32\r.pb.CopyPaths:\x02\x38\x01\",\n\x0b\x45rrorDetail\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x03\x12\x0f\n\x07message\x18\x02 \x01(\t\"\x87\x01\n\x11\x42uildImageMessage\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06status\x18\x02 \x01(\t\x12\x10\n\x08progress\x18\x03 \x01(\t\x12\r\n\x05\x65rror\x18\x04 \x01(\t\x12\x0e\n\x06stream\x18\x05 \x01(\t\x12%\n\x0c\x65rror_detail\x18\x06 \x01(\x0b\x32\x0f.pb.ErrorDetail\"\xea\x02\n\x16\x43reateContainerMessage\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x10\n\x08nodename\x18\x02 \x01(\t\x12\n\n\x02id\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\r\n\x05\x65rror\x18\x05 \x01(\t\x12\x0f\n\x07success\x18\x06 \x01(\x08\x12\x30\n\x03\x63pu\x18\x07 \x03(\x0b\x32#.pb.CreateContainerMessage.CpuEntry\x12\r\n\x05quota\x18\x08 \x01(\x01\x12\x0e\n\x06memory\x18\t \x01(\x03\x12\x38\n\x07publish\x18\n \x03(\x0b\x32\'.pb.CreateContainerMessage.PublishEntry\x12\x0c\n\x04hook\x18\x0b \x01(\x0c\x1a*\n\x08\x43puEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\x1a.\n\x0cPublishEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"7\n\x11RunAndWaitMessage\x12\x14\n\x0c\x63ontainer_id\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"F\n\x12RemoveImageMessage\x12\r\n\x05image\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x10\n\x08messages\x18\x03 \x03(\t\"F\n\x16RemoveContainerMessage\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x0f\n\x07message\x18\x03 \x01(\t\"5\n\x16ReallocResourceMessage\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\"b\n\x0b\x43opyMessage\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06status\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x0c\n\x04path\x18\x04 \x01(\t\x12\r\n\x05\x65rror\x18\x05 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x06 \x01(\x0c\"J\n\x11RunAndWaitOptions\x12(\n\rDeployOptions\x18\x01 \x01(\x0b\x32\x11.pb.DeployOptions\x12\x0b\n\x03\x43md\x18\x02 \x01(\x0c\x32\xb6\n\n\x07\x43oreRPC\x12!\n\x08ListPods\x12\t.pb.Empty\x1a\x08.pb.Pods\"\x00\x12&\n\x06\x41\x64\x64Pod\x12\x11.pb.AddPodOptions\x1a\x07.pb.Pod\"\x00\x12.\n\tRemovePod\x12\x14.pb.RemovePodOptions\x1a\t.pb.Empty\"\x00\x12&\n\x06GetPod\x12\x11.pb.GetPodOptions\x1a\x07.pb.Pod\"\x00\x12)\n\x07\x41\x64\x64Node\x12\x12.pb.AddNodeOptions\x1a\x08.pb.Node\"\x00\x12.\n\nRemoveNode\x12\x15.pb.RemoveNodeOptions\x1a\x07.pb.Pod\"\x00\x12\x31\n\x10SetNodeAvailable\x12\x11.pb.NodeAvailable\x1a\x08.pb.Node\"\x00\x12)\n\x07GetNode\x12\x12.pb.GetNodeOptions\x1a\x08.pb.Node\"\x00\x12\x30\n\x0cGetContainer\x12\x0f.pb.ContainerID\x1a\r.pb.Container\"\x00\x12\x33\n\rGetContainers\x12\x10.pb.ContainerIDs\x1a\x0e.pb.Containers\"\x00\x12/\n\rGetNodeByName\x12\x12.pb.GetNodeOptions\x1a\x08.pb.Node\"\x00\x12\x31\n\x0cListPodNodes\x12\x14.pb.ListNodesOptions\x1a\t.pb.Nodes\"\x00\x12\x36\n\x0cListNetworks\x12\x16.pb.ListNetworkOptions\x1a\x0c.pb.Networks\"\x00\x12;\n\x0eListContainers\x12\x17.pb.DeployStatusOptions\x1a\x0e.pb.Containers\"\x00\x12:\n\x12ListNodeContainers\x12\x12.pb.GetNodeOptions\x1a\x0e.pb.Containers\"\x00\x12>\n\x11\x43ontainerDeployed\x12\x1c.pb.ContainerDeployedOptions\x1a\t.pb.Empty\"\x00\x12,\n\x04\x43opy\x12\x0f.pb.CopyOptions\x1a\x0f.pb.CopyMessage\"\x00\x30\x01\x12>\n\nBuildImage\x12\x15.pb.BuildImageOptions\x1a\x15.pb.BuildImageMessage\"\x00\x30\x01\x12\x41\n\x0bRemoveImage\x12\x16.pb.RemoveImageOptions\x1a\x16.pb.RemoveImageMessage\"\x00\x30\x01\x12\x44\n\x0c\x44\x65ployStatus\x12\x17.pb.DeployStatusOptions\x1a\x17.pb.DeployStatusMessage\"\x00\x30\x01\x12@\n\nRunAndWait\x12\x15.pb.RunAndWaitOptions\x1a\x15.pb.RunAndWaitMessage\"\x00(\x01\x30\x01\x12\x44\n\x0f\x43reateContainer\x12\x11.pb.DeployOptions\x1a\x1a.pb.CreateContainerMessage\"\x00\x30\x01\x12M\n\x0fRemoveContainer\x12\x1a.pb.RemoveContainerOptions\x1a\x1a.pb.RemoveContainerMessage\"\x00\x30\x01\x12\x45\n\x0fReallocResource\x12\x12.pb.ReallocOptions\x1a\x1a.pb.ReallocResourceMessage\"\x00\x30\x01\x62\x06proto3') + serialized_pb=_b('\n\ncore.proto\x12\x02pb\"\x07\n\x05\x45mpty\"L\n\x13\x44\x65ployStatusOptions\x12\x0f\n\x07\x61ppname\x18\x01 \x01(\t\x12\x12\n\nentrypoint\x18\x02 \x01(\t\x12\x10\n\x08nodename\x18\x03 \x01(\t\"v\n\x13\x44\x65ployStatusMessage\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\t\x12\x0f\n\x07\x61ppname\x18\x02 \x01(\t\x12\x12\n\nentrypoint\x18\x03 \x01(\t\x12\x10\n\x08nodename\x18\x04 \x01(\t\x12\n\n\x02id\x18\x05 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x06 \x01(\x0c\"!\n\x03Pod\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x65sc\x18\x02 \x01(\t\"\x1d\n\x04Pods\x12\x15\n\x04pods\x18\x01 \x03(\x0b\x32\x07.pb.Pod\"5\n\x12ListNetworkOptions\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x0e\n\x06\x64river\x18\x02 \x01(\t\"(\n\x07Network\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07subnets\x18\x02 \x03(\t\")\n\x08Networks\x12\x1d\n\x08networks\x18\x01 \x03(\x0b\x32\x0b.pb.Network\"\x89\x02\n\x04Node\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x65ndpoint\x18\x02 \x01(\t\x12\x0f\n\x07podname\x18\x03 \x01(\t\x12\x1e\n\x03\x63pu\x18\x04 \x03(\x0b\x32\x11.pb.Node.CpuEntry\x12\x0e\n\x06memory\x18\x05 \x01(\x03\x12\x0c\n\x04info\x18\x06 \x01(\t\x12\x11\n\tavailable\x18\x07 \x01(\x08\x12$\n\x06labels\x18\x08 \x03(\x0b\x32\x14.pb.Node.LabelsEntry\x1a*\n\x08\x43puEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\" \n\x05Nodes\x12\x17\n\x05nodes\x18\x01 \x03(\x0b\x32\x08.pb.Node\"E\n\rNodeAvailable\x12\x10\n\x08nodename\x18\x01 \x01(\t\x12\x0f\n\x07podname\x18\x02 \x01(\t\x12\x11\n\tavailable\x18\x03 \x01(\x08\"\xdd\x01\n\tContainer\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07podname\x18\x02 \x01(\t\x12\x10\n\x08nodename\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12#\n\x03\x63pu\x18\x05 \x03(\x0b\x32\x16.pb.Container.CpuEntry\x12\r\n\x05quota\x18\x06 \x01(\x01\x12\x0e\n\x06memory\x18\x07 \x01(\x03\x12\x12\n\nprivileged\x18\x08 \x01(\x08\x12\x0f\n\x07inspect\x18\t \x01(\x0c\x1a*\n\x08\x43puEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\"k\n\x18\x43ontainerDeployedOptions\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07\x61ppname\x18\x02 \x01(\t\x12\x12\n\nentrypoint\x18\x03 \x01(\t\x12\x10\n\x08nodename\x18\x04 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x05 \x01(\x0c\"/\n\nContainers\x12!\n\ncontainers\x18\x01 \x03(\x0b\x32\r.pb.Container\"\x19\n\x0b\x43ontainerID\x12\n\n\x02id\x18\x01 \x01(\t\"\x1b\n\x0c\x43ontainerIDs\x12\x0b\n\x03ids\x18\x01 \x03(\t\"4\n\x16RemoveContainerOptions\x12\x0b\n\x03ids\x18\x01 \x03(\t\x12\r\n\x05\x66orce\x18\x02 \x01(\x08\"7\n\x0eReallocOptions\x12\x0b\n\x03ids\x18\x01 \x03(\t\x12\x0b\n\x03\x63pu\x18\x02 \x01(\x01\x12\x0b\n\x03mem\x18\x03 \x01(\x03\":\n\rAddPodOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05\x66\x61vor\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x65sc\x18\x03 \x01(\t\" \n\x10RemovePodOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1d\n\rGetPodOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\"\xf7\x01\n\x0e\x41\x64\x64NodeOptions\x12\x10\n\x08nodename\x18\x01 \x01(\t\x12\x10\n\x08\x65ndpoint\x18\x02 \x01(\t\x12\x0f\n\x07podname\x18\x03 \x01(\t\x12\n\n\x02\x63\x61\x18\x04 \x01(\t\x12\x0c\n\x04\x63\x65rt\x18\x05 \x01(\t\x12\x0b\n\x03key\x18\x06 \x01(\t\x12\x0b\n\x03\x63pu\x18\x07 \x01(\x05\x12\r\n\x05share\x18\x08 \x01(\x03\x12\x0e\n\x06memory\x18\t \x01(\x03\x12.\n\x06labels\x18\n \x03(\x0b\x32\x1e.pb.AddNodeOptions.LabelsEntry\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"6\n\x11RemoveNodeOptions\x12\x10\n\x08nodename\x18\x01 \x01(\t\x12\x0f\n\x07podname\x18\x02 \x01(\t\"3\n\x0eGetNodeOptions\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x10\n\x08nodename\x18\x02 \x01(\t\"0\n\x10ListNodesOptions\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x0b\n\x03\x61ll\x18\x02 \x01(\x08\"\x8e\x04\n\x05\x42uild\x12\x0c\n\x04\x62\x61se\x18\x01 \x01(\t\x12\x0c\n\x04repo\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\t\x12\x0b\n\x03\x64ir\x18\x04 \x01(\t\x12\x11\n\tsubmodule\x18\x05 \x01(\x08\x12\x10\n\x08\x63ommands\x18\x06 \x03(\t\x12!\n\x04\x65nvs\x18\x07 \x03(\x0b\x32\x13.pb.Build.EnvsEntry\x12!\n\x04\x61rgs\x18\x08 \x03(\x0b\x32\x13.pb.Build.ArgsEntry\x12%\n\x06labels\x18\t \x03(\x0b\x32\x15.pb.Build.LabelsEntry\x12+\n\tartifacts\x18\n \x03(\x0b\x32\x18.pb.Build.ArtifactsEntry\x12#\n\x05\x63\x61\x63he\x18\x0b \x03(\x0b\x32\x14.pb.Build.CacheEntry\x1a+\n\tEnvsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tArgsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x30\n\x0e\x41rtifactsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a,\n\nCacheEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"z\n\x06\x42uilds\x12\x0e\n\x06stages\x18\x01 \x03(\t\x12&\n\x06\x62uilds\x18\x02 \x03(\x0b\x32\x16.pb.Builds.BuildsEntry\x1a\x38\n\x0b\x42uildsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x18\n\x05value\x18\x02 \x01(\x0b\x32\t.pb.Build:\x02\x38\x01\"e\n\x11\x42uildImageOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04user\x18\x02 \x01(\t\x12\x0b\n\x03uid\x18\x03 \x01(\x05\x12\x0b\n\x03tag\x18\x04 \x01(\t\x12\x1a\n\x06\x62uilds\x18\x05 \x01(\x0b\x32\n.pb.Builds\"F\n\x0bHookOptions\x12\x13\n\x0b\x61\x66ter_start\x18\x01 \x03(\t\x12\x13\n\x0b\x62\x65\x66ore_stop\x18\x02 \x03(\t\x12\r\n\x05\x66orce\x18\x03 \x01(\x08\"U\n\x12HealthCheckOptions\x12\x11\n\ttcp_ports\x18\x01 \x03(\t\x12\x11\n\thttp_port\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x01(\t\x12\x0c\n\x04\x63ode\x18\x04 \x01(\x05\"u\n\nLogOptions\x12\x0c\n\x04type\x18\x01 \x01(\t\x12*\n\x06\x63onfig\x18\x02 \x03(\x0b\x32\x1a.pb.LogOptions.ConfigEntry\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xe5\x01\n\x11\x45ntrypointOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07\x63ommand\x18\x02 \x01(\t\x12\x12\n\nprivileged\x18\x03 \x01(\x08\x12\x0b\n\x03\x64ir\x18\x04 \x01(\t\x12\x1b\n\x03log\x18\x05 \x01(\x0b\x32\x0e.pb.LogOptions\x12\x0f\n\x07publish\x18\x06 \x03(\t\x12+\n\x0bhealthcheck\x18\x07 \x01(\x0b\x32\x16.pb.HealthCheckOptions\x12\x1d\n\x04hook\x18\x08 \x01(\x0b\x32\x0f.pb.HookOptions\x12\x16\n\x0erestart_policy\x18\t \x01(\t\"\xed\x05\n\rDeployOptions\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\nentrypoint\x18\x02 \x01(\x0b\x32\x15.pb.EntrypointOptions\x12\x0f\n\x07podname\x18\x03 \x01(\t\x12\x10\n\x08nodename\x18\x04 \x01(\t\x12\r\n\x05image\x18\x05 \x01(\t\x12\x12\n\nextra_args\x18\x06 \x01(\t\x12\x11\n\tcpu_quota\x18\x07 \x01(\x01\x12\x0e\n\x06memory\x18\x08 \x01(\x03\x12\r\n\x05\x63ount\x18\t \x01(\x05\x12\x0b\n\x03\x65nv\x18\n \x03(\t\x12\x0b\n\x03\x64ns\x18\x0b \x03(\t\x12\x13\n\x0b\x65xtra_hosts\x18\x0c \x03(\t\x12\x0f\n\x07volumes\x18\r \x03(\t\x12\x31\n\x08networks\x18\x0e \x03(\x0b\x32\x1f.pb.DeployOptions.NetworksEntry\x12\x13\n\x0bnetworkmode\x18\x0f \x01(\t\x12\x0c\n\x04user\x18\x10 \x01(\t\x12\r\n\x05\x64\x65\x62ug\x18\x11 \x01(\x08\x12\x11\n\topenStdin\x18\x12 \x01(\x08\x12)\n\x04meta\x18\x13 \x03(\x0b\x32\x1b.pb.DeployOptions.MetaEntry\x12\x35\n\nnodelabels\x18\x14 \x03(\x0b\x32!.pb.DeployOptions.NodelabelsEntry\x12\x15\n\rdeploy_method\x18\x15 \x01(\t\x12)\n\x04\x64\x61ta\x18\x16 \x03(\x0b\x32\x1b.pb.DeployOptions.DataEntry\x12\x11\n\tsoftlimit\x18\x17 \x01(\x08\x1a/\n\rNetworksEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tMetaEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x31\n\x0fNodelabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a+\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"G\n\x12RemoveImageOptions\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x10\n\x08nodename\x18\x02 \x01(\t\x12\x0e\n\x06images\x18\x03 \x03(\t\"\x1a\n\tCopyPaths\x12\r\n\x05paths\x18\x01 \x03(\t\"{\n\x0b\x43opyOptions\x12-\n\x07targets\x18\x01 \x03(\x0b\x32\x1c.pb.CopyOptions.TargetsEntry\x1a=\n\x0cTargetsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1c\n\x05value\x18\x02 \x01(\x0b\x32\r.pb.CopyPaths:\x02\x38\x01\",\n\x0b\x45rrorDetail\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x03\x12\x0f\n\x07message\x18\x02 \x01(\t\"\x87\x01\n\x11\x42uildImageMessage\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06status\x18\x02 \x01(\t\x12\x10\n\x08progress\x18\x03 \x01(\t\x12\r\n\x05\x65rror\x18\x04 \x01(\t\x12\x0e\n\x06stream\x18\x05 \x01(\t\x12%\n\x0c\x65rror_detail\x18\x06 \x01(\x0b\x32\x0f.pb.ErrorDetail\"\xea\x02\n\x16\x43reateContainerMessage\x12\x0f\n\x07podname\x18\x01 \x01(\t\x12\x10\n\x08nodename\x18\x02 \x01(\t\x12\n\n\x02id\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\r\n\x05\x65rror\x18\x05 \x01(\t\x12\x0f\n\x07success\x18\x06 \x01(\x08\x12\x30\n\x03\x63pu\x18\x07 \x03(\x0b\x32#.pb.CreateContainerMessage.CpuEntry\x12\r\n\x05quota\x18\x08 \x01(\x01\x12\x0e\n\x06memory\x18\t \x01(\x03\x12\x38\n\x07publish\x18\n \x03(\x0b\x32\'.pb.CreateContainerMessage.PublishEntry\x12\x0c\n\x04hook\x18\x0b \x01(\x0c\x1a*\n\x08\x43puEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\x1a.\n\x0cPublishEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"7\n\x11RunAndWaitMessage\x12\x14\n\x0c\x63ontainer_id\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"F\n\x12RemoveImageMessage\x12\r\n\x05image\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x10\n\x08messages\x18\x03 \x03(\t\"F\n\x16RemoveContainerMessage\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x0f\n\x07message\x18\x03 \x01(\t\"5\n\x16ReallocResourceMessage\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07success\x18\x02 \x01(\x08\"b\n\x0b\x43opyMessage\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06status\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x0c\n\x04path\x18\x04 \x01(\t\x12\r\n\x05\x65rror\x18\x05 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x06 \x01(\x0c\"J\n\x11RunAndWaitOptions\x12(\n\rDeployOptions\x18\x01 \x01(\x0b\x32\x11.pb.DeployOptions\x12\x0b\n\x03\x43md\x18\x02 \x01(\x0c\x32\xb6\n\n\x07\x43oreRPC\x12!\n\x08ListPods\x12\t.pb.Empty\x1a\x08.pb.Pods\"\x00\x12&\n\x06\x41\x64\x64Pod\x12\x11.pb.AddPodOptions\x1a\x07.pb.Pod\"\x00\x12.\n\tRemovePod\x12\x14.pb.RemovePodOptions\x1a\t.pb.Empty\"\x00\x12&\n\x06GetPod\x12\x11.pb.GetPodOptions\x1a\x07.pb.Pod\"\x00\x12)\n\x07\x41\x64\x64Node\x12\x12.pb.AddNodeOptions\x1a\x08.pb.Node\"\x00\x12.\n\nRemoveNode\x12\x15.pb.RemoveNodeOptions\x1a\x07.pb.Pod\"\x00\x12\x31\n\x10SetNodeAvailable\x12\x11.pb.NodeAvailable\x1a\x08.pb.Node\"\x00\x12)\n\x07GetNode\x12\x12.pb.GetNodeOptions\x1a\x08.pb.Node\"\x00\x12\x30\n\x0cGetContainer\x12\x0f.pb.ContainerID\x1a\r.pb.Container\"\x00\x12\x33\n\rGetContainers\x12\x10.pb.ContainerIDs\x1a\x0e.pb.Containers\"\x00\x12/\n\rGetNodeByName\x12\x12.pb.GetNodeOptions\x1a\x08.pb.Node\"\x00\x12\x31\n\x0cListPodNodes\x12\x14.pb.ListNodesOptions\x1a\t.pb.Nodes\"\x00\x12\x36\n\x0cListNetworks\x12\x16.pb.ListNetworkOptions\x1a\x0c.pb.Networks\"\x00\x12;\n\x0eListContainers\x12\x17.pb.DeployStatusOptions\x1a\x0e.pb.Containers\"\x00\x12:\n\x12ListNodeContainers\x12\x12.pb.GetNodeOptions\x1a\x0e.pb.Containers\"\x00\x12>\n\x11\x43ontainerDeployed\x12\x1c.pb.ContainerDeployedOptions\x1a\t.pb.Empty\"\x00\x12,\n\x04\x43opy\x12\x0f.pb.CopyOptions\x1a\x0f.pb.CopyMessage\"\x00\x30\x01\x12>\n\nBuildImage\x12\x15.pb.BuildImageOptions\x1a\x15.pb.BuildImageMessage\"\x00\x30\x01\x12\x41\n\x0bRemoveImage\x12\x16.pb.RemoveImageOptions\x1a\x16.pb.RemoveImageMessage\"\x00\x30\x01\x12\x44\n\x0c\x44\x65ployStatus\x12\x17.pb.DeployStatusOptions\x1a\x17.pb.DeployStatusMessage\"\x00\x30\x01\x12@\n\nRunAndWait\x12\x15.pb.RunAndWaitOptions\x1a\x15.pb.RunAndWaitMessage\"\x00(\x01\x30\x01\x12\x44\n\x0f\x43reateContainer\x12\x11.pb.DeployOptions\x1a\x1a.pb.CreateContainerMessage\"\x00\x30\x01\x12M\n\x0fRemoveContainer\x12\x1a.pb.RemoveContainerOptions\x1a\x1a.pb.RemoveContainerMessage\"\x00\x30\x01\x12\x45\n\x0fReallocResource\x12\x12.pb.ReallocOptions\x1a\x1a.pb.ReallocResourceMessage\"\x00\x30\x01\x62\x06proto3') ) @@ -1989,8 +1989,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3696, - serialized_end=3743, + serialized_start=3715, + serialized_end=3762, ) _DEPLOYOPTIONS_METAENTRY = _descriptor.Descriptor( @@ -2026,8 +2026,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3745, - serialized_end=3788, + serialized_start=3764, + serialized_end=3807, ) _DEPLOYOPTIONS_NODELABELSENTRY = _descriptor.Descriptor( @@ -2063,8 +2063,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3790, - serialized_end=3839, + serialized_start=3809, + serialized_end=3858, ) _DEPLOYOPTIONS_DATAENTRY = _descriptor.Descriptor( @@ -2100,8 +2100,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3841, - serialized_end=3884, + serialized_start=3860, + serialized_end=3903, ) _DEPLOYOPTIONS = _descriptor.Descriptor( @@ -2265,6 +2265,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='softlimit', full_name='pb.DeployOptions.softlimit', index=22, + number=23, type=8, cpp_type=7, label=1, + has_default_value=False, default_value=False, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -2278,7 +2285,7 @@ oneofs=[ ], serialized_start=3154, - serialized_end=3884, + serialized_end=3903, ) @@ -2322,8 +2329,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3886, - serialized_end=3957, + serialized_start=3905, + serialized_end=3976, ) @@ -2353,8 +2360,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3959, - serialized_end=3985, + serialized_start=3978, + serialized_end=4004, ) @@ -2391,8 +2398,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4049, - serialized_end=4110, + serialized_start=4068, + serialized_end=4129, ) _COPYOPTIONS = _descriptor.Descriptor( @@ -2421,8 +2428,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3987, - serialized_end=4110, + serialized_start=4006, + serialized_end=4129, ) @@ -2459,8 +2466,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4112, - serialized_end=4156, + serialized_start=4131, + serialized_end=4175, ) @@ -2525,8 +2532,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4159, - serialized_end=4294, + serialized_start=4178, + serialized_end=4313, ) @@ -2600,8 +2607,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4613, - serialized_end=4659, + serialized_start=4632, + serialized_end=4678, ) _CREATECONTAINERMESSAGE = _descriptor.Descriptor( @@ -2700,8 +2707,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4297, - serialized_end=4659, + serialized_start=4316, + serialized_end=4678, ) @@ -2738,8 +2745,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4661, - serialized_end=4716, + serialized_start=4680, + serialized_end=4735, ) @@ -2783,8 +2790,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4718, - serialized_end=4788, + serialized_start=4737, + serialized_end=4807, ) @@ -2828,8 +2835,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4790, - serialized_end=4860, + serialized_start=4809, + serialized_end=4879, ) @@ -2866,8 +2873,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4862, - serialized_end=4915, + serialized_start=4881, + serialized_end=4934, ) @@ -2932,8 +2939,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=4917, - serialized_end=5015, + serialized_start=4936, + serialized_end=5034, ) @@ -2970,8 +2977,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=5017, - serialized_end=5091, + serialized_start=5036, + serialized_end=5110, ) _PODS.fields_by_name['pods'].message_type = _POD @@ -3573,8 +3580,8 @@ file=DESCRIPTOR, index=0, options=None, - serialized_start=5094, - serialized_end=6428, + serialized_start=5113, + serialized_end=6447, methods=[ _descriptor.MethodDescriptor( name='ListPods', diff --git a/rpc/transform.go b/rpc/transform.go index eecc4e258..efcd1e144 100644 --- a/rpc/transform.go +++ b/rpc/transform.go @@ -165,6 +165,7 @@ func toCoreDeployOptions(d *pb.DeployOptions) (*types.DeployOptions, error) { NodeLabels: d.Nodelabels, DeployMethod: d.DeployMethod, Data: d.Data, + SoftLimit: d.Softlimit, }, nil } diff --git a/types/container.go b/types/container.go index e4483bb0b..8fbe4c901 100644 --- a/types/container.go +++ b/types/container.go @@ -22,6 +22,7 @@ type Container struct { Memory int64 `json:"memory"` Hook *Hook `json:"hook"` Privileged bool `json:"privileged"` + SoftLimit bool `json:"softlimit"` Engine *engineapi.Client `json:"-"` } diff --git a/types/options.go b/types/options.go index 06d62ca25..96097f700 100644 --- a/types/options.go +++ b/types/options.go @@ -33,6 +33,7 @@ type DeployOptions struct { NodeLabels map[string]string // NodeLabels for filter node DeployMethod string // Deploy method Data map[string][]byte // For additional file data + SoftLimit bool // softlimit memory } //RunAndWaitOptions is options for running and waiting