From 5494b30ce5ac3a161d1a52abbcfa9dd349fedfad Mon Sep 17 00:00:00 2001 From: sivchari Date: Sun, 24 Jul 2022 19:04:08 +0900 Subject: [PATCH] feat: improve naming I fixed naming to recommended by Golang. --- pkg/kubelet/cm/devicemanager/endpoint.go | 2 +- pkg/kubelet/cm/devicemanager/manager.go | 2 +- pkg/kubelet/cm/devicemanager/plugin/v1beta1/client.go | 4 ++-- pkg/kubelet/cm/devicemanager/pod_devices.go | 6 +++--- pkg/kubelet/cm/devicemanager/pod_devices_test.go | 4 ++-- pkg/kubelet/cm/types.go | 6 +++--- pkg/kubelet/preemption/preemption_test.go | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/kubelet/cm/devicemanager/endpoint.go b/pkg/kubelet/cm/devicemanager/endpoint.go index 8ae98d3ffca..a9f7e7bed90 100644 --- a/pkg/kubelet/cm/devicemanager/endpoint.go +++ b/pkg/kubelet/cm/devicemanager/endpoint.go @@ -50,7 +50,7 @@ type endpointImpl struct { // This is to be used during normal device plugin registration. func newEndpointImpl(p plugin.DevicePlugin) *endpointImpl { return &endpointImpl{ - api: p.Api(), + api: p.API(), resourceName: p.Resource(), } } diff --git a/pkg/kubelet/cm/devicemanager/manager.go b/pkg/kubelet/cm/devicemanager/manager.go index 7b0283d93e4..13459af0ff0 100644 --- a/pkg/kubelet/cm/devicemanager/manager.go +++ b/pkg/kubelet/cm/devicemanager/manager.go @@ -203,7 +203,7 @@ func (m *ManagerImpl) CleanupPluginDirectory(dir string) error { } func (m *ManagerImpl) PluginConnected(resourceName string, p plugin.DevicePlugin) error { - options, err := p.Api().GetDevicePluginOptions(context.Background(), &pluginapi.Empty{}) + options, err := p.API().GetDevicePluginOptions(context.Background(), &pluginapi.Empty{}) if err != nil { return fmt.Errorf("failed to get device plugin options: %v", err) } diff --git a/pkg/kubelet/cm/devicemanager/plugin/v1beta1/client.go b/pkg/kubelet/cm/devicemanager/plugin/v1beta1/client.go index 13b1249009b..03c946c0025 100644 --- a/pkg/kubelet/cm/devicemanager/plugin/v1beta1/client.go +++ b/pkg/kubelet/cm/devicemanager/plugin/v1beta1/client.go @@ -30,7 +30,7 @@ import ( ) type DevicePlugin interface { - Api() api.DevicePluginClient + API() api.DevicePluginClient Resource() string SocketPath() string } @@ -104,7 +104,7 @@ func (c *client) Resource() string { return c.resource } -func (c *client) Api() api.DevicePluginClient { +func (c *client) API() api.DevicePluginClient { return c.client } diff --git a/pkg/kubelet/cm/devicemanager/pod_devices.go b/pkg/kubelet/cm/devicemanager/pod_devices.go index 4e53c6c3a82..8d359dfe9f6 100644 --- a/pkg/kubelet/cm/devicemanager/pod_devices.go +++ b/pkg/kubelet/cm/devicemanager/pod_devices.go @@ -343,11 +343,11 @@ func (pdev *podDevices) getContainerDevices(podUID, contName string) ResourceDev } devicePluginMap := make(map[string]pluginapi.Device) for numaid, devlist := range allocateInfo.deviceIds { - for _, devId := range devlist { + for _, devID := range devlist { var topology *pluginapi.TopologyInfo if numaid != nodeWithoutTopology { NUMANodes := []*pluginapi.NUMANode{{ID: numaid}} - if pDev, ok := devicePluginMap[devId]; ok && pDev.Topology != nil { + if pDev, ok := devicePluginMap[devID]; ok && pDev.Topology != nil { if nodes := pDev.Topology.GetNodes(); nodes != nil { NUMANodes = append(NUMANodes, nodes...) } @@ -356,7 +356,7 @@ func (pdev *podDevices) getContainerDevices(podUID, contName string) ResourceDev // ID and Healthy are not relevant here. topology = &pluginapi.TopologyInfo{Nodes: NUMANodes} } - devicePluginMap[devId] = pluginapi.Device{ + devicePluginMap[devID] = pluginapi.Device{ Topology: topology, } } diff --git a/pkg/kubelet/cm/devicemanager/pod_devices_test.go b/pkg/kubelet/cm/devicemanager/pod_devices_test.go index 37a1e3a7dfb..f21fee36816 100644 --- a/pkg/kubelet/cm/devicemanager/pod_devices_test.go +++ b/pkg/kubelet/cm/devicemanager/pod_devices_test.go @@ -42,14 +42,14 @@ func TestGetContainerDevices(t *testing.T) { contDevices, ok := resContDevices[resourceName1] require.True(t, ok, "resource %q not present", resourceName1) - for devId, plugInfo := range contDevices { + for devID, plugInfo := range contDevices { nodes := plugInfo.GetTopology().GetNodes() require.Equal(t, len(nodes), len(devices), "Incorrect container devices: %v - %v (nodes %v)", devices, contDevices, nodes) for _, node := range plugInfo.GetTopology().GetNodes() { dev, ok := devices[node.ID] require.True(t, ok, "NUMA id %v doesn't exist in result", node.ID) - require.Equal(t, devId, dev[0], "Can't find device %s in result", dev[0]) + require.Equal(t, devID, dev[0], "Can't find device %s in result", dev[0]) } } } diff --git a/pkg/kubelet/cm/types.go b/pkg/kubelet/cm/types.go index edf97334781..f9ddc55ae2c 100644 --- a/pkg/kubelet/cm/types.go +++ b/pkg/kubelet/cm/types.go @@ -26,11 +26,11 @@ type ResourceConfig struct { // Memory limit (in bytes). Memory *int64 // CPU shares (relative weight vs. other containers). - CpuShares *uint64 + CPUShares *uint64 // CPU hardcap limit (in usecs). Allowed cpu time in a given period. - CpuQuota *int64 + CPUQuota *int64 // CPU quota period. - CpuPeriod *uint64 + CPUPeriod *uint64 // HugePageLimit map from page size (in bytes) to limit (in bytes) HugePageLimit map[int64]int64 // Maximum number of pids diff --git a/pkg/kubelet/preemption/preemption_test.go b/pkg/kubelet/preemption/preemption_test.go index f643dd4a936..96a2158dc0a 100644 --- a/pkg/kubelet/preemption/preemption_test.go +++ b/pkg/kubelet/preemption/preemption_test.go @@ -495,7 +495,7 @@ func parseCPUToInt64(res string) int64 { return (&r).MilliValue() } -func parseNonCpuResourceToInt64(res string) int64 { +func parseNonCPUResourceToInt64(res string) int64 { r := resource.MustParse(res) return (&r).Value() } @@ -511,7 +511,7 @@ func getAdmissionRequirementList(cpu, memory, pods int) admissionRequirementList if memory > 0 { reqs = append(reqs, &admissionRequirement{ resourceName: v1.ResourceMemory, - quantity: parseNonCpuResourceToInt64(fmt.Sprintf("%dMi", memory)), + quantity: parseNonCPUResourceToInt64(fmt.Sprintf("%dMi", memory)), }) } if pods > 0 {