github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

e3d534b2c4

pull/6/head
zhangxiaoyu-zidif 2017-04-04 14:16:34 +08:00
parent e3d534b2c4
commit 932ece5cfd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/deployment/sync.go
View File

@ -557,7 +557,7 @@ func calculateStatus(allRSs []*extensions.ReplicaSet, newRS *extensions.ReplicaS
totalReplicas := deploymentutil.GetReplicaCountForReplicaSets(allRSs) totalReplicas := deploymentutil.GetReplicaCountForReplicaSets(allRSs)
unavailableReplicas := totalReplicas - availableReplicas unavailableReplicas := totalReplicas - availableReplicas
// If unavailableReplicas is negative, then that means the Deployment has more available replicas running than // If unavailableReplicas is negative, then that means the Deployment has more available replicas running than
// desired, eg. whenever it scales down. In such a case we should simply default unavailableReplicas to zero. // desired, e.g. whenever it scales down. In such a case we should simply default unavailableReplicas to zero.
if unavailableReplicas < 0 { if unavailableReplicas < 0 {
unavailableReplicas = 0 unavailableReplicas = 0
} }

2
pkg/kubectl/rolling_updater_test.go
View File

@ -1654,7 +1654,7 @@ func TestRollingUpdater_readyPods(t *testing.T) {
oldPods []bool oldPods []bool
newPods []bool newPods []bool
// deletions - should be less then the size of the respective slice above // deletions - should be less then the size of the respective slice above
// eg. len(oldPods) > oldPodDeletions && len(newPods) > newPodDeletions // e.g. len(oldPods) > oldPodDeletions && len(newPods) > newPodDeletions
oldPodDeletions int oldPodDeletions int
newPodDeletions int newPodDeletions int
// specify additional time to wait for deployment to wait on top of the // specify additional time to wait for deployment to wait on top of the

2
pkg/util/procfs/procfs_fake.go
View File

@ -23,7 +23,7 @@ func NewFakeProcFS() ProcFSInterface {
} }
// GetFullContainerName gets the container name given the root process id of the container. // GetFullContainerName gets the container name given the root process id of the container.
// Eg. If the devices cgroup for the container is stored in /sys/fs/cgroup/devices/docker/nginx, // E.g. if the devices cgroup for the container is stored in /sys/fs/cgroup/devices/docker/nginx,
// return docker/nginx. Assumes that the process is part of exactly one cgroup hierarchy. // return docker/nginx. Assumes that the process is part of exactly one cgroup hierarchy.
func (fakePfs *FakeProcFS) GetFullContainerName(pid int) (string, error) { func (fakePfs *FakeProcFS) GetFullContainerName(pid int) (string, error) {
return "", nil return "", nil

2
pkg/util/procfs/procfs_linux.go
View File

@ -53,7 +53,7 @@ func containerNameFromProcCgroup(content string) (string, error) {
} }
// getFullContainerName gets the container name given the root process id of the container. // getFullContainerName gets the container name given the root process id of the container.
// Eg. If the devices cgroup for the container is stored in /sys/fs/cgroup/devices/docker/nginx, // E.g. if the devices cgroup for the container is stored in /sys/fs/cgroup/devices/docker/nginx,
// return docker/nginx. Assumes that the process is part of exactly one cgroup hierarchy. // return docker/nginx. Assumes that the process is part of exactly one cgroup hierarchy.
func (pfs *ProcFS) GetFullContainerName(pid int) (string, error) { func (pfs *ProcFS) GetFullContainerName(pid int) (string, error) {
filePath := path.Join("/proc", strconv.Itoa(pid), "cgroup") filePath := path.Join("/proc", strconv.Itoa(pid), "cgroup")