f277205f4f
This refactor removes the legacy KubeletConfig object and adds a new KubeletDeps object, which contains injected runtime objects and separates them from static config. It also reduces NewMainKubelet to two arguments: a KubeletConfiguration and a KubeletDeps. Some mesos and kubemark code was affected by this change, and has been modified accordingly. And a few final notes: KubeletDeps: KubeletDeps will be a temporary bin for things we might consider "injected dependencies", until we have a better dependency injection story for the Kubelet. We will have to discuss this eventually. RunOnce: We will likely not pull new KubeletConfiguration from the API server when in runonce mode, so it doesn't make sense to make this something that can be configured centrally. We will leave it as a flag-only option for now. Additionally, it is increasingly looking like nobody actually uses the Kubelet's runonce mode anymore, so it may be a candidate for deprecation and removal.
75 lines
1.9 KiB
Go
75 lines
1.9 KiB
Go
/*
|
|
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 app
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"k8s.io/kubernetes/pkg/kubelet"
|
|
"k8s.io/kubernetes/pkg/util/config"
|
|
)
|
|
|
|
func TestValueOfAllocatableResources(t *testing.T) {
|
|
testCases := []struct {
|
|
kubeReserved string
|
|
systemReserved string
|
|
errorExpected bool
|
|
name string
|
|
}{
|
|
{
|
|
kubeReserved: "cpu=200m,memory=-150G",
|
|
systemReserved: "cpu=200m,memory=150G",
|
|
errorExpected: true,
|
|
name: "negative quantity value",
|
|
},
|
|
{
|
|
kubeReserved: "cpu=200m,memory=150GG",
|
|
systemReserved: "cpu=200m,memory=150G",
|
|
errorExpected: true,
|
|
name: "invalid quantity unit",
|
|
},
|
|
{
|
|
kubeReserved: "cpu=200m,memory=15G",
|
|
systemReserved: "cpu=200m,memory=15Ki",
|
|
errorExpected: false,
|
|
name: "Valid resource quantity",
|
|
},
|
|
}
|
|
|
|
for _, test := range testCases {
|
|
kubeReservedCM := make(config.ConfigurationMap)
|
|
systemReservedCM := make(config.ConfigurationMap)
|
|
|
|
kubeReservedCM.Set(test.kubeReserved)
|
|
systemReservedCM.Set(test.systemReserved)
|
|
|
|
_, err := kubelet.ParseReservation(kubeReservedCM, systemReservedCM)
|
|
if err != nil {
|
|
t.Logf("%s: error returned: %v", test.name, err)
|
|
}
|
|
if test.errorExpected {
|
|
if err == nil {
|
|
t.Errorf("%s: error expected", test.name)
|
|
}
|
|
} else {
|
|
if err != nil {
|
|
t.Errorf("%s: unexpected error: %v", test.name, err)
|
|
}
|
|
}
|
|
}
|
|
}
|