vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1132 from sak0/dev

Browse source 
allow update running/created container.
This commit is contained in:
Antonio Murdaca 2017-11-12 01:51:04 +01:00 committed by GitHub
commit 98f7591d5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/container_update_resources.go
View file

@ -1,9 +1,11 @@
package server package server
import ( import (
"fmt"
"time" "time"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"github.com/kubernetes-incubator/cri-o/oci"
rspec "github.com/opencontainers/runtime-spec/specs-go" rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -23,6 +25,11 @@ func (s *Server) UpdateContainerResources(ctx context.Context, req *pb.UpdateCon
if err != nil { if err != nil {
return nil, err return nil, err
} }
state := s.Runtime().ContainerStatus(c)
if !(state.Status == oci.ContainerStateRunning || state.Status == oci.ContainerStateCreated) {
return nil, fmt.Errorf("container %s is not running or created state: %s", c.ID(), state.Status)
}
resources := toOCIResources(req.GetLinux()) resources := toOCIResources(req.GetLinux())
if err := s.Runtime().UpdateContainer(c, resources); err != nil { if err := s.Runtime().UpdateContainer(c, resources); err != nil {
return nil, err return nil, err