Standardize on capatalized Cgroups

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

19 files changed, 53 insertions, 53 deletions

diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index ceeb5119d..68e35f79f 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -215,7 +215,7 @@ func (s *BoltState) Refresh() error {
 					return errors.Wrapf(err, "error unmarshalling state for pod %s", string(id))
 				}
 
-				// Clear the CGroup path
+				// Clear the Cgroup path
 				state.CgroupPath = ""
 
 				newStateBytes, err := json.Marshal(state)
diff --git a/libpod/container.go b/libpod/container.go
index 1dd2ef5f7..51a3ffd3d 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -23,7 +23,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// CgroupfsDefaultCgroupParent is the cgroup parent for CGroupFS in libpod
+// CgroupfsDefaultCgroupParent is the cgroup parent for CgroupFS in libpod
 const CgroupfsDefaultCgroupParent = "/libpod_parent"
 
 // SystemdDefaultCgroupParent is the cgroup parent for the systemd cgroup
@@ -56,7 +56,7 @@ const (
 	UserNS LinuxNS = iota
 	// UTSNS is the UTS namespace
 	UTSNS LinuxNS = iota
-	// CgroupNS is the CGroup namespace
+	// CgroupNS is the Cgroup namespace
 	CgroupNS LinuxNS = iota
 )
 
@@ -575,7 +575,7 @@ func (c *Container) CreatedTime() time.Time {
 	return c.config.CreatedTime
 }
 
-// CgroupParent gets the container's CGroup parent
+// CgroupParent gets the container's Cgroup parent
 func (c *Container) CgroupParent() string {
 	return c.config.CgroupParent
 }
@@ -907,10 +907,10 @@ func (c *Container) CgroupManager() string {
 	return cgroupManager
 }
 
-// CGroupPath returns a cgroups "path" for the given container.
+// CgroupPath returns a cgroups "path" for the given container.
 // Note that the container must be running.  Otherwise, an error
 // is returned.
-func (c *Container) CGroupPath() (string, error) {
+func (c *Container) CgroupPath() (string, error) {
 	if !c.batched {
 		c.lock.Lock()
 		defer c.lock.Unlock()
diff --git a/libpod/container_config.go b/libpod/container_config.go
index 102d74236..725e27c2a 100644
--- a/libpod/container_config.go
+++ b/libpod/container_config.go
@@ -334,7 +334,7 @@ type ContainerMiscConfig struct {
 	// CgroupManager is the cgroup manager used to create this container.
 	// If empty, the runtime default will be used.
 	CgroupManager string `json:"cgroupManager,omitempty"`
-	// NoCgroups indicates that the container will not create CGroups. It is
+	// NoCgroups indicates that the container will not create Cgroups. It is
 	// incompatible with CgroupParent.  Deprecated in favor of CgroupsMode.
 	NoCgroups bool `json:"noCgroups,omitempty"`
 	// CgroupsMode indicates how the container will create cgroups
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index 792dfc58e..615a7522b 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -730,7 +730,7 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named
 	}
 	hostConfig.CgroupMode = cgroupMode
 
-	// CGroup parent
+	// Cgroup parent
 	// Need to check if it's the default, and not print if so.
 	defaultCgroupParent := ""
 	switch c.CgroupManager() {
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 12d6d5a18..d0c8ccc4c 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1092,7 +1092,7 @@ func (c *Container) init(ctx context.Context, retainRetries bool) error {
 		// upstream in any OCI runtime.
 		// TODO: Remove once runc supports cgroupsv2
 		if strings.Contains(err.Error(), "this version of runc doesn't work on cgroups v2") {
-			logrus.Errorf("Oci runtime %q does not support CGroups V2: use system migrate to mitigate", c.ociRuntime.Name())
+			logrus.Errorf("Oci runtime %q does not support Cgroups V2: use system migrate to mitigate", c.ociRuntime.Name())
 		}
 		return err
 	}
@@ -1291,8 +1291,8 @@ func (c *Container) stop(timeout uint) error {
 	// a pid namespace then the OCI Runtime needs to kill ALL processes in
 	// the containers cgroup in order to make sure the container is stopped.
 	all := !c.hasNamespace(spec.PIDNamespace)
-	// We can't use --all if CGroups aren't present.
-	// Rootless containers with CGroups v1 and NoCgroups are both cases
+	// We can't use --all if Cgroups aren't present.
+	// Rootless containers with Cgroups v1 and NoCgroups are both cases
 	// where this can happen.
 	if all {
 		if c.config.NoCgroups {
@@ -1400,7 +1400,7 @@ func (c *Container) stop(timeout uint) error {
 // Internal, non-locking function to pause a container
 func (c *Container) pause() error {
 	if c.config.NoCgroups {
-		return errors.Wrapf(define.ErrNoCgroups, "cannot pause without using CGroups")
+		return errors.Wrapf(define.ErrNoCgroups, "cannot pause without using Cgroups")
 	}
 
 	if rootless.IsRootless() {
@@ -1428,7 +1428,7 @@ func (c *Container) pause() error {
 // Internal, non-locking function to unpause a container
 func (c *Container) unpause() error {
 	if c.config.NoCgroups {
-		return errors.Wrapf(define.ErrNoCgroups, "cannot unpause without using CGroups")
+		return errors.Wrapf(define.ErrNoCgroups, "cannot unpause without using Cgroups")
 	}
 
 	if err := c.ociRuntime.UnpauseContainer(c); err != nil {
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 508a8a8cf..0f89daab0 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -2772,7 +2772,7 @@ func (c *Container) getOCICgroupPath() (string, error) {
 		// expects cgroups to be passed as follows:
 		// slice:prefix:name
 		systemdCgroups := fmt.Sprintf("%s:libpod:%s", path.Base(c.config.CgroupParent), c.ID())
-		logrus.Debugf("Setting CGroups for container %s to %s", c.ID(), systemdCgroups)
+		logrus.Debugf("Setting Cgroups for container %s to %s", c.ID(), systemdCgroups)
 		return systemdCgroups, nil
 	case (rootless.IsRootless() && (cgroupManager == config.CgroupfsCgroupsManager || !unified)):
 		if c.config.CgroupParent == "" || !isRootlessCgroupSet(c.config.CgroupParent) {
@@ -2781,7 +2781,7 @@ func (c *Container) getOCICgroupPath() (string, error) {
 		fallthrough
 	case cgroupManager == config.CgroupfsCgroupsManager:
 		cgroupPath := filepath.Join(c.config.CgroupParent, fmt.Sprintf("libpod-%s", c.ID()))
-		logrus.Debugf("Setting CGroup path for container %s to %s", c.ID(), cgroupPath)
+		logrus.Debugf("Setting Cgroup path for container %s to %s", c.ID(), cgroupPath)
 		return cgroupPath, nil
 	default:
 		return "", errors.Wrapf(define.ErrInvalidArg, "invalid cgroup manager %s requested", cgroupManager)
diff --git a/libpod/container_validate.go b/libpod/container_validate.go
index ca5ce8b2a..492225401 100644
--- a/libpod/container_validate.go
+++ b/libpod/container_validate.go
@@ -57,13 +57,13 @@ func (c *Container) validate() error {
 			if ns.Type == spec.PIDNamespace {
 				foundPid = true
 				if ns.Path != "" {
-					return errors.Wrapf(define.ErrInvalidArg, "containers not creating CGroups must create a private PID namespace - cannot use another")
+					return errors.Wrapf(define.ErrInvalidArg, "containers not creating Cgroups must create a private PID namespace - cannot use another")
 				}
 				break
 			}
 		}
 		if !foundPid {
-			return errors.Wrapf(define.ErrInvalidArg, "containers not creating CGroups must create a private PID namespace")
+			return errors.Wrapf(define.ErrInvalidArg, "containers not creating Cgroups must create a private PID namespace")
 		}
 	}
 
diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go
index ba73e4196..6db1b025e 100644
--- a/libpod/define/container_inspect.go
+++ b/libpod/define/container_inspect.go
@@ -345,9 +345,9 @@ type InspectContainerHostConfig struct {
 	// populated.
 	// TODO.
 	Cgroup string `json:"Cgroup"`
-	// Cgroups contains the container's CGroup mode.
-	// Allowed values are "default" (container is creating CGroups) and
-	// "disabled" (container is not creating CGroups).
+	// Cgroups contains the container's Cgroup mode.
+	// Allowed values are "default" (container is creating Cgroups) and
+	// "disabled" (container is not creating Cgroups).
 	// This is Libpod-specific and not included in `docker inspect`.
 	Cgroups string `json:"Cgroups"`
 	// Links is unused, and provided purely for Docker compatibility.
@@ -417,7 +417,7 @@ type InspectContainerHostConfig struct {
 	Isolation string `json:"Isolation"`
 	// CpuShares indicates the CPU resources allocated to the container.
 	// It is a relative weight in the scheduler for assigning CPU time
-	// versus other CGroups.
+	// versus other Cgroups.
 	CpuShares uint64 `json:"CpuShares"`
 	// Memory indicates the memory resources allocated to the container.
 	// This is the limit (in bytes) of RAM the container may use.
@@ -434,12 +434,12 @@ type InspectContainerHostConfig struct {
 	// 100000, we will set both CpuQuota, CpuPeriod, and NanoCpus. If
 	// CpuQuota is not the default, we will not set NanoCpus.
 	NanoCpus int64 `json:"NanoCpus"`
-	// CgroupParent is the CGroup parent of the container.
+	// CgroupParent is the Cgroup parent of the container.
 	// Only set if not default.
 	CgroupParent string `json:"CgroupParent"`
 	// BlkioWeight indicates the I/O resources allocated to the container.
 	// It is a relative weight in the scheduler for assigning I/O time
-	// versus other CGroups.
+	// versus other Cgroups.
 	BlkioWeight uint16 `json:"BlkioWeight"`
 	// BlkioWeightDevice is an array of I/O resource priorities for
 	// individual device nodes.
diff --git a/libpod/define/errors.go b/libpod/define/errors.go
index 653ef187d..f5a7c73e5 100644
--- a/libpod/define/errors.go
+++ b/libpod/define/errors.go
@@ -96,7 +96,7 @@ var (
 	ErrWillDeadlock = errors.New("deadlock due to lock mismatch")
 
 	// ErrNoCgroups indicates that the container does not have its own
-	// CGroup.
+	// Cgroup.
 	ErrNoCgroups = errors.New("this container does not have a cgroup")
 	// ErrNoLogs indicates that this container is not creating a log so log
 	// operations cannot be performed on it
diff --git a/libpod/define/info.go b/libpod/define/info.go
index 15400991f..48ad51c22 100644
--- a/libpod/define/info.go
+++ b/libpod/define/info.go
@@ -27,7 +27,7 @@ type HostInfo struct {
 	Arch              string           `json:"arch"`
 	BuildahVersion    string           `json:"buildahVersion"`
 	CgroupManager     string           `json:"cgroupManager"`
-	CGroupsVersion    string           `json:"cgroupVersion"`
+	CgroupsVersion    string           `json:"cgroupVersion"`
 	CgroupControllers []string         `json:"cgroupControllers"`
 	Conmon            *ConmonInfo      `json:"conmon"`
 	CPUs              int              `json:"cpus"`
diff --git a/libpod/define/pod_inspect.go b/libpod/define/pod_inspect.go
index e7adc8700..e85a660a1 100644
--- a/libpod/define/pod_inspect.go
+++ b/libpod/define/pod_inspect.go
@@ -26,12 +26,12 @@ type InspectPodData struct {
 	// Labels is a set of key-value labels that have been applied to the
 	// pod.
 	Labels map[string]string `json:"Labels,omitempty"`
-	// CreateCgroup is whether this pod will create its own CGroup to group
+	// CreateCgroup is whether this pod will create its own Cgroup to group
 	// containers under.
 	CreateCgroup bool
-	// CgroupParent is the parent of the pod's CGroup.
+	// CgroupParent is the parent of the pod's Cgroup.
 	CgroupParent string `json:"CgroupParent,omitempty"`
-	// CgroupPath is the path to the pod's CGroup.
+	// CgroupPath is the path to the pod's Cgroup.
 	CgroupPath string `json:"CgroupPath,omitempty"`
 	// CreateInfra is whether this pod will create an infra container to
 	// share namespaces.
diff --git a/libpod/info.go b/libpod/info.go
index 354364ccc..de675859e 100644
--- a/libpod/info.go
+++ b/libpod/info.go
@@ -104,7 +104,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
 		return nil, errors.Wrapf(err, "error getting Seccomp profile path")
 	}
 
-	// CGroups version
+	// Cgroups version
 	unified, err := cgroups.IsCgroup2UnifiedMode()
 	if err != nil {
 		return nil, errors.Wrapf(err, "error reading cgroups mode")
@@ -150,7 +150,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
 	if unified {
 		cgroupVersion = "v2"
 	}
-	info.CGroupsVersion = cgroupVersion
+	info.CgroupsVersion = cgroupVersion
 
 	slirp4netnsPath := r.config.Engine.NetworkCmdPath
 	if slirp4netnsPath == "" {
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 3440507ed..8d6a23ecc 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -1402,7 +1402,7 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p
 		args = append(args, "--log-tag", logTag)
 	}
 	if ctr.config.NoCgroups {
-		logrus.Debugf("Running with no CGroups")
+		logrus.Debugf("Running with no Cgroups")
 		args = append(args, "--runtime-arg", "--cgroup-manager", "--runtime-arg", "disabled")
 	}
 	return args
diff --git a/libpod/options.go b/libpod/options.go
index 5cf7609e9..f32eb279d 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -217,7 +217,7 @@ func WithCgroupManager(manager string) RuntimeOption {
 		}
 
 		if manager != config.CgroupfsCgroupsManager && manager != config.SystemdCgroupsManager {
-			return errors.Wrapf(define.ErrInvalidArg, "CGroup manager must be one of %s and %s",
+			return errors.Wrapf(define.ErrInvalidArg, "Cgroup manager must be one of %s and %s",
 				config.CgroupfsCgroupsManager, config.SystemdCgroupsManager)
 		}
 
@@ -945,7 +945,7 @@ func WithUTSNSFrom(nsCtr *Container) CtrCreateOption {
 	}
 }
 
-// WithCgroupNSFrom indicates the the container should join the CGroup namespace
+// WithCgroupNSFrom indicates the the container should join the Cgroup namespace
 // of the given container.
 // If the container has joined a pod, it can only join the namespaces of
 // containers in the same pod.
@@ -1080,7 +1080,7 @@ func WithLogTag(tag string) CtrCreateOption {
 	}
 }
 
-// WithCgroupsMode disables the creation of CGroups for the conmon process.
+// WithCgroupsMode disables the creation of Cgroups for the conmon process.
 func WithCgroupsMode(mode string) CtrCreateOption {
 	return func(ctr *Container) error {
 		if ctr.valid {
@@ -1864,7 +1864,7 @@ func WithPodCgroupParent(path string) PodCreateOption {
 // WithPodCgroups tells containers in this pod to use the cgroup created for
 // this pod.
 // This can still be overridden at the container level by explicitly specifying
-// a CGroup parent.
+// a Cgroup parent.
 func WithPodCgroups() PodCreateOption {
 	return func(pod *Pod) error {
 		if pod.valid {
diff --git a/libpod/pod.go b/libpod/pod.go
index 0e5ac4906..b159f6bc7 100644
--- a/libpod/pod.go
+++ b/libpod/pod.go
@@ -44,9 +44,9 @@ type PodConfig struct {
 
 	// Labels contains labels applied to the pod
 	Labels map[string]string `json:"labels"`
-	// CgroupParent contains the pod's CGroup parent
+	// CgroupParent contains the pod's Cgroup parent
 	CgroupParent string `json:"cgroupParent"`
-	// UsePodCgroup indicates whether the pod will create its own CGroup and
+	// UsePodCgroup indicates whether the pod will create its own Cgroup and
 	// join containers to it.
 	// If true, all containers joined to the pod will use the pod cgroup as
 	// their cgroup parent, and cannot set a different cgroup parent
@@ -77,7 +77,7 @@ type PodConfig struct {
 
 // podState represents a pod's state
 type podState struct {
-	// CgroupPath is the path to the pod's CGroup
+	// CgroupPath is the path to the pod's Cgroup
 	CgroupPath string `json:"cgroupPath"`
 	// InfraContainerID is the container that holds pod namespace information
 	// Most often an infra container
@@ -237,7 +237,7 @@ func (p *Pod) CreateCommand() []string {
 	return p.config.CreateCommand
 }
 
-// CgroupParent returns the pod's CGroup parent
+// CgroupParent returns the pod's Cgroup parent
 func (p *Pod) CgroupParent() string {
 	return p.config.CgroupParent
 }
@@ -289,7 +289,7 @@ func (p *Pod) Hostname() string {
 	return p.config.Hostname
 }
 
-// CgroupPath returns the path to the pod's CGroup
+// CgroupPath returns the path to the pod's Cgroup
 func (p *Pod) CgroupPath() (string, error) {
 	p.lock.Lock()
 	defer p.lock.Unlock()
@@ -315,7 +315,7 @@ func (p *Pod) CgroupPath() (string, error) {
 		}
 		if ctr != nil {
 			ctr.Start(context.Background(), true)
-			cgroupPath, err := ctr.CGroupPath()
+			cgroupPath, err := ctr.CgroupPath()
 			fmt.Println(cgroupPath)
 			if err != nil {
 				return "", errors.Wrapf(err, "could not get container cgroup")
diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go
index d903b8719..eaa6eb14b 100644
--- a/libpod/pod_internal.go
+++ b/libpod/pod_internal.go
@@ -71,7 +71,7 @@ func (p *Pod) refresh() error {
 		case config.SystemdCgroupsManager:
 			cgroupPath, err := systemdSliceFromPath(p.config.CgroupParent, fmt.Sprintf("libpod_pod_%s", p.ID()))
 			if err != nil {
-				logrus.Errorf("Creating CGroup for pod %s: %v", p.ID(), err)
+				logrus.Errorf("Creating Cgroup for pod %s: %v", p.ID(), err)
 			}
 			p.state.CgroupPath = cgroupPath
 		case config.CgroupfsCgroupsManager:
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index 252279485..15bca6133 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -344,8 +344,8 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
 		}
 	}
 
-	// Check CGroup parent sanity, and set it if it was not set.
-	// Only if we're actually configuring CGroups.
+	// Check Cgroup parent sanity, and set it if it was not set.
+	// Only if we're actually configuring Cgroups.
 	if !ctr.config.NoCgroups {
 		ctr.config.CgroupManager = r.config.Engine.CgroupManager
 		switch r.config.Engine.CgroupManager {
@@ -391,7 +391,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
 				return nil, errors.Wrapf(define.ErrInvalidArg, "did not receive systemd slice as cgroup parent when using systemd to manage cgroups")
 			}
 		default:
-			return nil, errors.Wrapf(define.ErrInvalidArg, "unsupported CGroup manager: %s - cannot validate cgroup parent", r.config.Engine.CgroupManager)
+			return nil, errors.Wrapf(define.ErrInvalidArg, "unsupported Cgroup manager: %s - cannot validate cgroup parent", r.config.Engine.CgroupManager)
 		}
 	}
 
@@ -411,7 +411,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
 		g.RemoveMount("/run/.containerenv")
 		g.RemoveMount("/run/secrets")
 
-		// Regenerate CGroup paths so they don't point to the old
+		// Regenerate Cgroup paths so they don't point to the old
 		// container ID.
 		cgroupPath, err := ctr.getOCICgroupPath()
 		if err != nil {
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go
index ee59cd8c3..ea3eb53c4 100644
--- a/libpod/runtime_pod_linux.go
+++ b/libpod/runtime_pod_linux.go
@@ -61,7 +61,7 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option
 
 	pod.valid = true
 
-	// Check CGroup parent sanity, and set it if it was not set
+	// Check Cgroup parent sanity, and set it if it was not set
 	switch r.config.Engine.CgroupManager {
 	case config.CgroupfsCgroupsManager:
 		canUseCgroup := !rootless.IsRootless() || isRootlessCgroupSet(pod.config.CgroupParent)
@@ -105,7 +105,7 @@ func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, option
 			}
 		}
 	default:
-		return nil, errors.Wrapf(define.ErrInvalidArg, "unsupported CGroup manager: %s - cannot validate cgroup parent", r.config.Engine.CgroupManager)
+		return nil, errors.Wrapf(define.ErrInvalidArg, "unsupported Cgroup manager: %s - cannot validate cgroup parent", r.config.Engine.CgroupManager)
 	}
 
 	if pod.config.UsePodCgroup {
@@ -226,12 +226,12 @@ func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool,
 	}
 
 	// We're going to be removing containers.
-	// If we are CGroupfs cgroup driver, to avoid races, we need to hit
-	// the pod and conmon CGroups with a PID limit to prevent them from
+	// If we are Cgroupfs cgroup driver, to avoid races, we need to hit
+	// the pod and conmon Cgroups with a PID limit to prevent them from
 	// spawning any further processes (particularly cleanup processes) which
-	// would prevent removing the CGroups.
+	// would prevent removing the Cgroups.
 	if p.runtime.config.Engine.CgroupManager == config.CgroupfsCgroupsManager {
-		// Get the conmon CGroup
+		// Get the conmon Cgroup
 		conmonCgroupPath := filepath.Join(p.state.CgroupPath, "conmon")
 		conmonCgroup, err := cgroups.Load(conmonCgroupPath)
 		if err != nil && err != cgroups.ErrCgroupDeleted && err != cgroups.ErrCgroupV1Rootless {
diff --git a/libpod/util_linux.go b/libpod/util_linux.go
index ef871ef3d..9fee35823 100644
--- a/libpod/util_linux.go
+++ b/libpod/util_linux.go
@@ -43,7 +43,7 @@ func getDefaultSystemdCgroup() string {
 	return SystemdDefaultCgroupParent
 }
 
-// makeSystemdCgroup creates a systemd CGroup at the given location.
+// makeSystemdCgroup creates a systemd Cgroup at the given location.
 func makeSystemdCgroup(path string) error {
 	controller, err := cgroups.NewSystemd(getDefaultSystemdCgroup())
 	if err != nil {