github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Fixes golint errors in pkg/api

Browse Source
This commit is contained in:
Yuki Yugui Sonoda 2014-07-15 22:53:39 +09:00 committed by Yuki Sonoda (Yugui)
parent 314eb1ae2d
commit af38bf1ef7
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/types.go
View File

@ -156,7 +156,7 @@ type Percentile struct {
// ContainerStats represents statistical information of a container // ContainerStats represents statistical information of a container
type ContainerStats struct { type ContainerStats struct {
CpuUsagePercentiles []Percentile `json:"cpu_usage_percentiles,omitempty"` CPUUsagePercentiles []Percentile `json:"cpu_usage_percentiles,omitempty"`
MemoryUsagePercentiles []Percentile `json:"memory_usage_percentiles,omitempty"` MemoryUsagePercentiles []Percentile `json:"memory_usage_percentiles,omitempty"`
MaxMemoryUsage uint64 `json:"max_memory_usage,omitempty"` MaxMemoryUsage uint64 `json:"max_memory_usage,omitempty"`
} }

1
pkg/api/validation.go
View File

@ -247,6 +247,7 @@ func ValidateManifest(manifest *ContainerManifest) []error {
return []error(allErrs) return []error(allErrs)
} }
// ValidateService tests if required fields in the service are set.
func ValidateService(service *Service) []error { func ValidateService(service *Service) []error {
allErrs := errorList{} allErrs := errorList{}
if service.ID == "" { if service.ID == "" {

2
pkg/kubelet/kubelet.go
View File

@ -963,7 +963,7 @@ func (kl *Kubelet) statsFromContainerPath(containerPath string) (*api.ContainerS
percentiles[i].Percentage = p.Percentage percentiles[i].Percentage = p.Percentage
percentiles[i].Value = p.Value percentiles[i].Value = p.Value
} }
ret.CpuUsagePercentiles = percentiles ret.CPUUsagePercentiles = percentiles
} }
if len(info.StatsPercentiles.MemoryUsagePercentiles) > 0 { if len(info.StatsPercentiles.MemoryUsagePercentiles) > 0 {
percentiles := make([]api.Percentile, len(info.StatsPercentiles.MemoryUsagePercentiles)) percentiles := make([]api.Percentile, len(info.StatsPercentiles.MemoryUsagePercentiles))

4
pkg/kubelet/kubelet_server_test.go
View File

@ -150,7 +150,7 @@ func TestContainerStats(t *testing.T) {
fw := makeServerTest() fw := makeServerTest()
expectedStats := &api.ContainerStats{ expectedStats := &api.ContainerStats{
MaxMemoryUsage: 1024001, MaxMemoryUsage: 1024001,
CpuUsagePercentiles: []api.Percentile{ CPUUsagePercentiles: []api.Percentile{
{50, 150}, {50, 150},
{80, 180}, {80, 180},
{90, 190}, {90, 190},
@ -190,7 +190,7 @@ func TestMachineStats(t *testing.T) {
fw := makeServerTest() fw := makeServerTest()
expectedStats := &api.ContainerStats{ expectedStats := &api.ContainerStats{
MaxMemoryUsage: 1024001, MaxMemoryUsage: 1024001,
CpuUsagePercentiles: []api.Percentile{ CPUUsagePercentiles: []api.Percentile{
{50, 150}, {50, 150},
{80, 180}, {80, 180},
{90, 190}, {90, 190},

10
pkg/kubelet/kubelet_test.go
View File

@ -966,7 +966,7 @@ func TestGetContainerStats(t *testing.T) {
{80, 180}, {80, 180},
{90, 190}, {90, 190},
}, },
CpuUsagePercentiles: []info.Percentile{ CPUUsagePercentiles: []info.Percentile{
{51, 101}, {51, 101},
{81, 181}, {81, 181},
{91, 191}, {91, 191},
@ -995,7 +995,7 @@ func TestGetContainerStats(t *testing.T) {
if stats.MaxMemoryUsage != containerInfo.StatsPercentiles.MaxMemoryUsage { if stats.MaxMemoryUsage != containerInfo.StatsPercentiles.MaxMemoryUsage {
t.Errorf("wrong max memory usage") t.Errorf("wrong max memory usage")
} }
areSamePercentiles(containerInfo.StatsPercentiles.CpuUsagePercentiles, stats.CpuUsagePercentiles, t) areSamePercentiles(containerInfo.StatsPercentiles.CpuUsagePercentiles, stats.CPUUsagePercentiles, t)
areSamePercentiles(containerInfo.StatsPercentiles.MemoryUsagePercentiles, stats.MemoryUsagePercentiles, t) areSamePercentiles(containerInfo.StatsPercentiles.MemoryUsagePercentiles, stats.MemoryUsagePercentiles, t)
mockCadvisor.AssertExpectations(t) mockCadvisor.AssertExpectations(t)
} }
@ -1036,7 +1036,7 @@ func TestGetMachineStats(t *testing.T) {
if stats.MaxMemoryUsage != containerInfo.StatsPercentiles.MaxMemoryUsage { if stats.MaxMemoryUsage != containerInfo.StatsPercentiles.MaxMemoryUsage {
t.Errorf("wrong max memory usage") t.Errorf("wrong max memory usage")
} }
areSamePercentiles(containerInfo.StatsPercentiles.CpuUsagePercentiles, stats.CpuUsagePercentiles, t) areSamePercentiles(containerInfo.StatsPercentiles.CpuUsagePercentiles, stats.CPUUsagePercentiles, t)
areSamePercentiles(containerInfo.StatsPercentiles.MemoryUsagePercentiles, stats.MemoryUsagePercentiles, t) areSamePercentiles(containerInfo.StatsPercentiles.MemoryUsagePercentiles, stats.MemoryUsagePercentiles, t)
mockCadvisor.AssertExpectations(t) mockCadvisor.AssertExpectations(t)
} }
@ -1060,8 +1060,8 @@ func TestGetContainerStatsWithoutCadvisor(t *testing.T) {
if stats.MaxMemoryUsage != 0 { if stats.MaxMemoryUsage != 0 {
t.Errorf("MaxMemoryUsage is %v even if there's no cadvisor", stats.MaxMemoryUsage) t.Errorf("MaxMemoryUsage is %v even if there's no cadvisor", stats.MaxMemoryUsage)
} }
if len(stats.CpuUsagePercentiles) > 0 { if len(stats.CPUUsagePercentiles) > 0 {
t.Errorf("Cpu usage percentiles is not empty (%+v) even if there's no cadvisor", stats.CpuUsagePercentiles) t.Errorf("Cpu usage percentiles is not empty (%+v) even if there's no cadvisor", stats.CPUUsagePercentiles)
} }
if len(stats.MemoryUsagePercentiles) > 0 { if len(stats.MemoryUsagePercentiles) > 0 {
t.Errorf("Memory usage percentiles is not empty (%+v) even if there's no cadvisor", stats.MemoryUsagePercentiles) t.Errorf("Memory usage percentiles is not empty (%+v) even if there's no cadvisor", stats.MemoryUsagePercentiles)