From 05bb27023b031b0bc24426e0af37f824900fdd99 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Thu, 3 Nov 2016 09:51:52 -0500 Subject: [PATCH] fix cross build for kubelet/cm --- pkg/kubelet/cm/cgroup_manager_unsupported.go | 16 ++++++ .../cm/container_manager_unsupported_test.go | 4 ++ pkg/kubelet/cm/helpers_unsupported.go | 54 +++++++++++++++++++ .../cm/pod_container_manager_unsupported.go | 4 ++ 4 files changed, 78 insertions(+) create mode 100644 pkg/kubelet/cm/helpers_unsupported.go diff --git a/pkg/kubelet/cm/cgroup_manager_unsupported.go b/pkg/kubelet/cm/cgroup_manager_unsupported.go index 692955d3d3b..b41c301c432 100644 --- a/pkg/kubelet/cm/cgroup_manager_unsupported.go +++ b/pkg/kubelet/cm/cgroup_manager_unsupported.go @@ -57,3 +57,19 @@ func (m *unsupportedCgroupManager) Create(_ *CgroupConfig) error { func (m *unsupportedCgroupManager) Pids(_ CgroupName) []int { return nil } + +func (m *unsupportedCgroupManager) CgroupName(name string) CgroupName { + return "" +} + +func (m *unsupportedCgroupManager) ReduceCPULimits(cgroupName CgroupName) error { + return nil +} + +func ConvertCgroupFsNameToSystemd(cgroupfsName string) (string, error) { + return "", nil +} + +func ConvertCgroupNameToSystemd(cgroupName CgroupName, outputToCgroupFs bool) string { + return "" +} diff --git a/pkg/kubelet/cm/container_manager_unsupported_test.go b/pkg/kubelet/cm/container_manager_unsupported_test.go index 9e09d32a895..421ecd19253 100644 --- a/pkg/kubelet/cm/container_manager_unsupported_test.go +++ b/pkg/kubelet/cm/container_manager_unsupported_test.go @@ -57,6 +57,10 @@ func (mi *fakeMountInterface) PathIsDevice(pathname string) (bool, error) { return true, nil } +func (mi *fakeMountInterface) GetDeviceNameFromMount(mountPath, pluginDir string) (string, error) { + return "", nil +} + func fakeContainerMgrMountInt() mount.Interface { return &fakeMountInterface{ []mount.MountPoint{ diff --git a/pkg/kubelet/cm/helpers_unsupported.go b/pkg/kubelet/cm/helpers_unsupported.go new file mode 100644 index 00000000000..f60149cb854 --- /dev/null +++ b/pkg/kubelet/cm/helpers_unsupported.go @@ -0,0 +1,54 @@ +// +build !linux + +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package cm + +import "k8s.io/kubernetes/pkg/api" + +const ( + MinShares = 0 + SharesPerCPU = 0 + MilliCPUToCPU = 0 + + QuotaPeriod = 0 + MinQuotaPeriod = 0 +) + +// MilliCPUToQuota converts milliCPU to CFS quota and period values. +func MilliCPUToQuota(milliCPU int64) (int64, int64) { + return 0, 0 +} + +// MilliCPUToShares converts the milliCPU to CFS shares. +func MilliCPUToShares(milliCPU int64) int64 { + return 0 +} + +// ResourceConfigForPod takes the input pod and outputs the cgroup resource config. +func ResourceConfigForPod(pod *api.Pod) *ResourceConfig { + return nil +} + +// GetCgroupSubsystems returns information about the mounted cgroup subsystems +func GetCgroupSubsystems() (*CgroupSubsystems, error) { + return nil, nil +} + +func getCgroupProcs(dir string) ([]int, error) { + return nil, nil +} diff --git a/pkg/kubelet/cm/pod_container_manager_unsupported.go b/pkg/kubelet/cm/pod_container_manager_unsupported.go index 863e3c059cf..164278ccb2f 100644 --- a/pkg/kubelet/cm/pod_container_manager_unsupported.go +++ b/pkg/kubelet/cm/pod_container_manager_unsupported.go @@ -47,3 +47,7 @@ func (m *unsupportedPodContainerManager) ReduceCPULimits(_ CgroupName) error { func (m *unsupportedPodContainerManager) GetAllPodsFromCgroups() (map[types.UID]CgroupName, error) { return nil, nil } + +func (m *unsupportedPodContainerManager) Destroy(name CgroupName) error { + return nil +}