Merge pull request #44024 from zhangxiaoyu-zidif/egnew

pkg/controller/deployment/sync.go

@@ -551,7 +551,7 @@ func calculateStatus(allRSs []*extensions.ReplicaSet, newRS *extensions.ReplicaS
 	totalReplicas := deploymentutil.GetReplicaCountForReplicaSets(allRSs)
 	unavailableReplicas := totalReplicas - availableReplicas
 	// 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 {
 		unavailableReplicas = 0
 	}

pkg/kubectl/rolling_updater_test.go

@@ -1655,7 +1655,7 @@ func TestRollingUpdater_readyPods(t *testing.T) {
 		oldPods []bool
 		newPods []bool
 		// 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
 		newPodDeletions int
 		// specify additional time to wait for deployment to wait on top of the

pkg/util/procfs/procfs_fake.go

@@ -23,7 +23,7 @@ func NewFakeProcFS() ProcFSInterface {
 }
 
 // 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.
 func (fakePfs *FakeProcFS) GetFullContainerName(pid int) (string, error) {
 	return "", nil

pkg/util/procfs/procfs_linux.go

@@ -53,7 +53,7 @@ func containerNameFromProcCgroup(content string) (string, error) {
 }
 
 // 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.
 func (pfs *ProcFS) GetFullContainerName(pid int) (string, error) {
 	filePath := path.Join("/proc", strconv.Itoa(pid), "cgroup")