892942af8f
There are three values that uniquely identify a pod on a host - the configuration source (etcd, file, http), the pod name, and the pod namespace. This change ensures that configuration properly makes those names unique by changing podFullName to contain both name (currently ID in v1beta1, Name in v1beta3) and namespace. The Kubelet does not properly handle information requests for pods not in the default namespace at this time.
243 lines
8.2 KiB
Go
243 lines
8.2 KiB
Go
/*
|
|
Copyright 2014 Google Inc. All rights reserved.
|
|
|
|
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 config
|
|
|
|
import (
|
|
"reflect"
|
|
"sort"
|
|
"testing"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
|
|
)
|
|
|
|
func expectEmptyChannel(t *testing.T, ch <-chan interface{}) {
|
|
select {
|
|
case update := <-ch:
|
|
t.Errorf("Expected no update in channel, Got %v", update)
|
|
default:
|
|
}
|
|
}
|
|
|
|
type sortedPods []api.BoundPod
|
|
|
|
func (s sortedPods) Len() int {
|
|
return len(s)
|
|
}
|
|
func (s sortedPods) Swap(i, j int) {
|
|
s[i], s[j] = s[j], s[i]
|
|
}
|
|
func (s sortedPods) Less(i, j int) bool {
|
|
return s[i].ID < s[j].ID
|
|
}
|
|
|
|
func CreateValidPod(name, namespace, source string) api.BoundPod {
|
|
return api.BoundPod{
|
|
TypeMeta: api.TypeMeta{
|
|
ID: name,
|
|
Namespace: namespace,
|
|
Annotations: map[string]string{kubelet.ConfigSourceAnnotationKey: source},
|
|
},
|
|
Spec: api.PodSpec{
|
|
RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
|
|
},
|
|
}
|
|
}
|
|
|
|
func CreatePodUpdate(op kubelet.PodOperation, pods ...api.BoundPod) kubelet.PodUpdate {
|
|
if len(pods) == 0 {
|
|
return kubelet.PodUpdate{Op: op}
|
|
}
|
|
newPods := make([]api.BoundPod, len(pods))
|
|
for i := range pods {
|
|
newPods[i] = pods[i]
|
|
}
|
|
return kubelet.PodUpdate{newPods, op}
|
|
}
|
|
|
|
func createPodConfigTester(mode PodConfigNotificationMode) (chan<- interface{}, <-chan kubelet.PodUpdate, *PodConfig) {
|
|
config := NewPodConfig(mode)
|
|
channel := config.Channel("test")
|
|
ch := config.Updates()
|
|
return channel, ch, config
|
|
}
|
|
|
|
func expectPodUpdate(t *testing.T, ch <-chan kubelet.PodUpdate, expected ...kubelet.PodUpdate) {
|
|
for i := range expected {
|
|
update := <-ch
|
|
sort.Sort(sortedPods(update.Pods))
|
|
if !reflect.DeepEqual(expected[i], update) {
|
|
t.Fatalf("Expected %#v, Got %#v", expected[i], update)
|
|
}
|
|
}
|
|
expectNoPodUpdate(t, ch)
|
|
}
|
|
|
|
func expectNoPodUpdate(t *testing.T, ch <-chan kubelet.PodUpdate) {
|
|
select {
|
|
case update := <-ch:
|
|
t.Errorf("Expected no update in channel, Got %#v", update)
|
|
default:
|
|
}
|
|
}
|
|
|
|
func TestNewPodAdded(t *testing.T) {
|
|
channel, ch, config := createPodConfigTester(PodConfigNotificationIncremental)
|
|
|
|
// see an update
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", "test")))
|
|
|
|
config.Sync()
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET, CreateValidPod("foo", "new", "test")))
|
|
}
|
|
|
|
func TestNewPodAddedInvalidNamespace(t *testing.T) {
|
|
channel, ch, config := createPodConfigTester(PodConfigNotificationIncremental)
|
|
|
|
// see an update
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "", ""))
|
|
channel <- podUpdate
|
|
config.Sync()
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET))
|
|
}
|
|
|
|
func TestNewPodAddedDefaultNamespace(t *testing.T) {
|
|
channel, ch, config := createPodConfigTester(PodConfigNotificationIncremental)
|
|
|
|
// see an update
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "default", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "default", "test")))
|
|
|
|
config.Sync()
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET, CreateValidPod("foo", "default", "test")))
|
|
}
|
|
|
|
func TestNewPodAddedDifferentNamespaces(t *testing.T) {
|
|
channel, ch, config := createPodConfigTester(PodConfigNotificationIncremental)
|
|
|
|
// see an update
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "default", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "default", "test")))
|
|
|
|
// see an update in another namespace
|
|
podUpdate = CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", "test")))
|
|
|
|
config.Sync()
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET, CreateValidPod("foo", "default", "test"), CreateValidPod("foo", "new", "test")))
|
|
}
|
|
|
|
func TestInvalidPodFiltered(t *testing.T) {
|
|
channel, ch, _ := createPodConfigTester(PodConfigNotificationIncremental)
|
|
|
|
// see an update
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", "test")))
|
|
|
|
// add an invalid update
|
|
podUpdate = CreatePodUpdate(kubelet.UPDATE, api.BoundPod{TypeMeta: api.TypeMeta{ID: "foo"}})
|
|
channel <- podUpdate
|
|
expectNoPodUpdate(t, ch)
|
|
}
|
|
|
|
func TestNewPodAddedSnapshotAndUpdates(t *testing.T) {
|
|
channel, ch, config := createPodConfigTester(PodConfigNotificationSnapshotAndUpdates)
|
|
|
|
// see an set
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET, CreateValidPod("foo", "new", "test")))
|
|
|
|
config.Sync()
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET, CreateValidPod("foo", "new", "test")))
|
|
|
|
// container updates are separated as UPDATE
|
|
pod := podUpdate.Pods[0]
|
|
pod.Spec.Containers = []api.Container{{Name: "bar", Image: "test"}}
|
|
channel <- CreatePodUpdate(kubelet.ADD, pod)
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.UPDATE, pod))
|
|
}
|
|
|
|
func TestNewPodAddedSnapshot(t *testing.T) {
|
|
channel, ch, config := createPodConfigTester(PodConfigNotificationSnapshot)
|
|
|
|
// see an set
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET, CreateValidPod("foo", "new", "test")))
|
|
|
|
config.Sync()
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET, CreateValidPod("foo", "new", "test")))
|
|
|
|
// container updates are separated as UPDATE
|
|
pod := podUpdate.Pods[0]
|
|
pod.Spec.Containers = []api.Container{{Name: "bar", Image: "test"}}
|
|
channel <- CreatePodUpdate(kubelet.ADD, pod)
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.SET, pod))
|
|
}
|
|
|
|
func TestNewPodAddedUpdatedRemoved(t *testing.T) {
|
|
channel, ch, _ := createPodConfigTester(PodConfigNotificationIncremental)
|
|
|
|
// should register an add
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", "test")))
|
|
|
|
// should ignore ADDs that are identical
|
|
expectNoPodUpdate(t, ch)
|
|
|
|
// an kubelet.ADD should be converted to kubelet.UPDATE
|
|
pod := CreateValidPod("foo", "new", "test")
|
|
pod.Spec.Containers = []api.Container{{Name: "bar", Image: "test"}}
|
|
podUpdate = CreatePodUpdate(kubelet.ADD, pod)
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.UPDATE, pod))
|
|
|
|
podUpdate = CreatePodUpdate(kubelet.REMOVE, api.BoundPod{TypeMeta: api.TypeMeta{ID: "foo", Namespace: "new"}})
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.REMOVE, pod))
|
|
}
|
|
|
|
func TestNewPodAddedUpdatedSet(t *testing.T) {
|
|
channel, ch, _ := createPodConfigTester(PodConfigNotificationIncremental)
|
|
|
|
// should register an add
|
|
podUpdate := CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", ""), CreateValidPod("foo2", "new", ""), CreateValidPod("foo3", "new", ""))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch, CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", "test"), CreateValidPod("foo2", "new", "test"), CreateValidPod("foo3", "new", "test")))
|
|
|
|
// should ignore ADDs that are identical
|
|
expectNoPodUpdate(t, ch)
|
|
|
|
// should be converted to an kubelet.ADD, kubelet.REMOVE, and kubelet.UPDATE
|
|
pod := CreateValidPod("foo2", "new", "test")
|
|
pod.Spec.Containers = []api.Container{{Name: "bar", Image: "test"}}
|
|
podUpdate = CreatePodUpdate(kubelet.SET, pod, CreateValidPod("foo3", "new", ""), CreateValidPod("foo4", "new", "test"))
|
|
channel <- podUpdate
|
|
expectPodUpdate(t, ch,
|
|
CreatePodUpdate(kubelet.REMOVE, CreateValidPod("foo", "new", "test")),
|
|
CreatePodUpdate(kubelet.ADD, CreateValidPod("foo4", "new", "test")),
|
|
CreatePodUpdate(kubelet.UPDATE, pod))
|
|
}
|