Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cross build for kubelet/cm #36163

Merged
merged 1 commit into from
Nov 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions pkg/kubelet/cm/cgroup_manager_unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
}
4 changes: 4 additions & 0 deletions pkg/kubelet/cm/container_manager_unsupported_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
54 changes: 54 additions & 0 deletions pkg/kubelet/cm/helpers_unsupported.go
Original file line number Diff line number Diff line change
@@ -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
}
4 changes: 4 additions & 0 deletions pkg/kubelet/cm/pod_container_manager_unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}