From 2293b473464a78877a57bdfff5a2b0f11c3283bf Mon Sep 17 00:00:00 2001 From: Aresforchina <18845641183@163.com> Date: Fri, 3 Jan 2020 14:49:01 +0800 Subject: [PATCH] add some comments for const variable --- pkg/kubelet/sysctl/namespace.go | 20 ++++++++++---------- pkg/kubelet/sysctl/namespace_test.go | 8 ++++---- pkg/kubelet/sysctl/whitelist.go | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/kubelet/sysctl/namespace.go b/pkg/kubelet/sysctl/namespace.go index 1619998f3f8c..c1c93ed5f8b4 100644 --- a/pkg/kubelet/sysctl/namespace.go +++ b/pkg/kubelet/sysctl/namespace.go @@ -25,28 +25,28 @@ type Namespace string const ( // the Linux IPC namespace - IpcNamespace = Namespace("ipc") + ipcNamespace = Namespace("ipc") // the network namespace - NetNamespace = Namespace("net") + netNamespace = Namespace("net") // the zero value if no namespace is known - UnknownNamespace = Namespace("") + unknownNamespace = Namespace("") ) var namespaces = map[string]Namespace{ - "kernel.sem": IpcNamespace, + "kernel.sem": ipcNamespace, } var prefixNamespaces = map[string]Namespace{ - "kernel.shm": IpcNamespace, - "kernel.msg": IpcNamespace, - "fs.mqueue.": IpcNamespace, - "net.": NetNamespace, + "kernel.shm": ipcNamespace, + "kernel.msg": ipcNamespace, + "fs.mqueue.": ipcNamespace, + "net.": netNamespace, } // NamespacedBy returns the namespace of the Linux kernel for a sysctl, or -// UnknownNamespace if the sysctl is not known to be namespaced. +// unknownNamespace if the sysctl is not known to be namespaced. func NamespacedBy(val string) Namespace { if ns, found := namespaces[val]; found { return ns @@ -56,5 +56,5 @@ func NamespacedBy(val string) Namespace { return ns } } - return UnknownNamespace + return unknownNamespace } diff --git a/pkg/kubelet/sysctl/namespace_test.go b/pkg/kubelet/sysctl/namespace_test.go index a5db297bfc4b..1db7f8460ece 100644 --- a/pkg/kubelet/sysctl/namespace_test.go +++ b/pkg/kubelet/sysctl/namespace_test.go @@ -22,10 +22,10 @@ import ( func TestNamespacedBy(t *testing.T) { tests := map[string]Namespace{ - "kernel.shm_rmid_forced": IpcNamespace, - "net.a.b.c": NetNamespace, - "fs.mqueue.a.b.c": IpcNamespace, - "foo": UnknownNamespace, + "kernel.shm_rmid_forced": ipcNamespace, + "net.a.b.c": netNamespace, + "fs.mqueue.a.b.c": ipcNamespace, + "foo": unknownNamespace, } for sysctl, ns := range tests { diff --git a/pkg/kubelet/sysctl/whitelist.go b/pkg/kubelet/sysctl/whitelist.go index 067409a7e8ff..f259bc1b61c4 100644 --- a/pkg/kubelet/sysctl/whitelist.go +++ b/pkg/kubelet/sysctl/whitelist.go @@ -58,13 +58,13 @@ func NewWhitelist(patterns []string) (*patternWhitelist, error) { if strings.HasSuffix(s, "*") { prefix := s[:len(s)-1] ns := NamespacedBy(prefix) - if ns == UnknownNamespace { + if ns == unknownNamespace { return nil, fmt.Errorf("the sysctls %q are not known to be namespaced", s) } w.prefixes[prefix] = ns } else { ns := NamespacedBy(s) - if ns == UnknownNamespace { + if ns == unknownNamespace { return nil, fmt.Errorf("the sysctl %q are not known to be namespaced", s) } w.sysctls[s] = ns @@ -83,20 +83,20 @@ func NewWhitelist(patterns []string) (*patternWhitelist, error) { func (w *patternWhitelist) validateSysctl(sysctl string, hostNet, hostIPC bool) error { nsErrorFmt := "%q not allowed with host %s enabled" if ns, found := w.sysctls[sysctl]; found { - if ns == IpcNamespace && hostIPC { + if ns == ipcNamespace && hostIPC { return fmt.Errorf(nsErrorFmt, sysctl, ns) } - if ns == NetNamespace && hostNet { + if ns == netNamespace && hostNet { return fmt.Errorf(nsErrorFmt, sysctl, ns) } return nil } for p, ns := range w.prefixes { if strings.HasPrefix(sysctl, p) { - if ns == IpcNamespace && hostIPC { + if ns == ipcNamespace && hostIPC { return fmt.Errorf(nsErrorFmt, sysctl, ns) } - if ns == NetNamespace && hostNet { + if ns == netNamespace && hostNet { return fmt.Errorf(nsErrorFmt, sysctl, ns) } return nil