Skip to content

K
k3s
Commit c3e8bd04 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #48949 from php-coder/minor_cleanup

Automatic merge from submit-queue Fix comments and typo in the error message **What this PR does / why we need it**: This PR fixes outdated comments and typo in the error message. **Release note**: ```release-note NONE ``` CC @simo5
parents e1ba93f2 ae147a73
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
pkg/kubelet/kubelet_pods.go
View file @ c3e8bd04
...@@ -940,7 +940,7 @@ func (kl *Kubelet) podKiller() { ...@@ -940,7 +940,7 @@ func (kl *Kubelet) podKiller() {
} }
} }
// checkHostPortConflicts detects pods with conflicted host ports. // hasHostPortConflicts detects pods with conflicted host ports.
func hasHostPortConflicts(pods []*v1.Pod) bool { func hasHostPortConflicts(pods []*v1.Pod) bool {
ports := sets.String{} ports := sets.String{}
for _, pod := range pods { for _, pod := range pods {
...@@ -1653,7 +1653,7 @@ func (kl *Kubelet) hasHostMountPVC(pod *v1.Pod) bool { ...@@ -1653,7 +1653,7 @@ func (kl *Kubelet) hasHostMountPVC(pod *v1.Pod) bool {
if pvc != nil { if pvc != nil {
referencedVolume, err := kl.kubeClient.Core().PersistentVolumes().Get(pvc.Spec.VolumeName, metav1.GetOptions{}) referencedVolume, err := kl.kubeClient.Core().PersistentVolumes().Get(pvc.Spec.VolumeName, metav1.GetOptions{})
if err != nil { if err != nil {
glog.Warningf("unable to retrieve pvc %s - %v", pvc.Spec.VolumeName, err) glog.Warningf("unable to retrieve pv %s - %v", pvc.Spec.VolumeName, err)
continue continue
} }
if referencedVolume != nil && referencedVolume.Spec.HostPath != nil { if referencedVolume != nil && referencedVolume.Spec.HostPath != nil {
......
pkg/kubelet/util.go
View file @ c3e8bd04
...@@ -88,7 +88,7 @@ func allowHostNetwork(pod *v1.Pod) (bool, error) { ...@@ -88,7 +88,7 @@ func allowHostNetwork(pod *v1.Pod) (bool, error) {
return false, nil return false, nil
} }
// Determined whether the specified pod is allowed to use host networking // Determined whether the specified pod is allowed to use host PID
func allowHostPID(pod *v1.Pod) (bool, error) { func allowHostPID(pod *v1.Pod) (bool, error) {
podSource, err := kubetypes.GetPodSource(pod) podSource, err := kubetypes.GetPodSource(pod)
if err != nil { if err != nil {
......
pkg/volume/empty_dir/empty_dir.go
View file @ c3e8bd04
...@@ -234,8 +234,7 @@ func (ed *emptyDir) SetUpAt(dir string, fsGroup *int64) error { ...@@ -234,8 +234,7 @@ func (ed *emptyDir) SetUpAt(dir string, fsGroup *int64) error {
return err return err
} }
// setupTmpfs creates a tmpfs mount at the specified directory with the // setupTmpfs creates a tmpfs mount at the specified directory.
// specified SELinux context.
func (ed *emptyDir) setupTmpfs(dir string) error { func (ed *emptyDir) setupTmpfs(dir string) error {
if ed.mounter == nil { if ed.mounter == nil {
return fmt.Errorf("memory storage requested, but mounter is nil") return fmt.Errorf("memory storage requested, but mounter is nil")
...@@ -258,8 +257,7 @@ func (ed *emptyDir) setupTmpfs(dir string) error { ...@@ -258,8 +257,7 @@ func (ed *emptyDir) setupTmpfs(dir string) error {
return ed.mounter.Mount("tmpfs", dir, "tmpfs", nil /* options */) return ed.mounter.Mount("tmpfs", dir, "tmpfs", nil /* options */)
} }
// setupDir creates the directory with the specified SELinux context and // setupDir creates the directory with the default permissions specified by the perm constant.
// the default permissions specified by the perm constant.
func (ed *emptyDir) setupDir(dir string) error { func (ed *emptyDir) setupDir(dir string) error {
// Create the directory if it doesn't already exist. // Create the directory if it doesn't already exist.
if err := os.MkdirAll(dir, perm); err != nil { if err := os.MkdirAll(dir, perm); err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment