Skip to content

Commit

Permalink
Enhanced test suite to help with testing of PreferNoSchedule taints
Browse files Browse the repository at this point in the history
  • Loading branch information
@prashanth26
prashanth26 committed Jan 14, 2019
1 parent 8846117 commit cdcac24
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 43 deletions.
82 changes: 73 additions & 9 deletions pkg/controller/controller_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,42 @@ func newMachineSetsFromMachineDeployment(machineSetCount int, machineDeployment
UID: machineDeployment.UID,
BlockOwnerDeletion: boolPtr(true),
Controller: boolPtr(true),
})
}, nil)
}

func newMachineSet(specTemplate *v1alpha1.MachineTemplateSpec, replicas, minReadySeconds int32, statusTemplate *v1alpha1.MachineSetStatus, owner *metav1.OwnerReference) *v1alpha1.MachineSet {
return newMachineSets(1, specTemplate, replicas, minReadySeconds, statusTemplate, owner)[0]
func newMachineSet(
specTemplate *v1alpha1.MachineTemplateSpec,
replicas int32,
minReadySeconds int32,
statusTemplate *v1alpha1.MachineSetStatus,
owner *metav1.OwnerReference,
annotations map[string]string,
) *v1alpha1.MachineSet {
return newMachineSets(1, specTemplate, replicas, minReadySeconds, statusTemplate, owner, annotations)[0]
}

func newMachineSets(machineSetCount int, specTemplate *v1alpha1.MachineTemplateSpec, replicas, minReadySeconds int32, statusTemplate *v1alpha1.MachineSetStatus, owner *metav1.OwnerReference) []*v1alpha1.MachineSet {
machineSets := make([]*v1alpha1.MachineSet, replicas)
func newMachineSets(
machineSetCount int,
specTemplate *v1alpha1.MachineTemplateSpec,
replicas int32,
minReadySeconds int32,
statusTemplate *v1alpha1.MachineSetStatus,
owner *metav1.OwnerReference,
annotations map[string]string,
) []*v1alpha1.MachineSet {

machineSets := make([]*v1alpha1.MachineSet, machineSetCount)
for i := range machineSets {
ms := &v1alpha1.MachineSet{
TypeMeta: metav1.TypeMeta{
APIVersion: "machine.sapcloud.io",
Kind: "MachineSet",
},
ObjectMeta: *newObjectMeta(&specTemplate.ObjectMeta, i),
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("machineset-%d", i),
Namespace: testNamespace,
Labels: make(map[string]string, 0),
},
Spec: v1alpha1.MachineSetSpec{
MachineClass: *specTemplate.Spec.Class.DeepCopy(),
MinReadySeconds: minReadySeconds,
Expand All @@ -96,6 +116,10 @@ func newMachineSets(machineSetCount int, specTemplate *v1alpha1.MachineTemplateS
ms.OwnerReferences = append(ms.OwnerReferences, *owner.DeepCopy())
}

if annotations != nil {
ms.Annotations = annotations
}

machineSets[i] = ms
}
return machineSets
Expand Down Expand Up @@ -137,8 +161,12 @@ func newMachines(machineCount int, specTemplate *v1alpha1.MachineTemplateSpec, s
APIVersion: "machine.sapcloud.io",
Kind: "Machine",
},
ObjectMeta: *newObjectMeta(&specTemplate.ObjectMeta, i),
Spec: *newMachineSpec(&specTemplate.Spec, i),
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("machine-%d", i),
Namespace: testNamespace,
Labels: make(map[string]string, 0),
},
Spec: *newMachineSpec(&specTemplate.Spec, i),
}

if statusTemplate != nil {
Expand All @@ -154,6 +182,38 @@ func newMachines(machineCount int, specTemplate *v1alpha1.MachineTemplateSpec, s
return machines
}

func nodeNodes(
nodeCount int,
nodeSpec *corev1.NodeSpec,
nodeStatus *corev1.NodeStatus,
) *corev1.Node {
return newNodes(1, nodeSpec, nodeStatus)[0]
}

func newNodes(
nodeCount int,
nodeSpec *corev1.NodeSpec,
nodeStatus *corev1.NodeStatus,
) []*corev1.Node {

nodes := make([]*corev1.Node, nodeCount)
for i := range nodes {
node := &corev1.Node{
TypeMeta: metav1.TypeMeta{
APIVersion: "v1",
Kind: "Node",
},
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("node-%d", i),
},
Spec: *nodeSpec.DeepCopy(),
}

nodes[i] = node
}
return nodes
}

func boolPtr(b bool) *bool {
return &b
}
Expand Down Expand Up @@ -217,7 +277,11 @@ func newSecretReference(meta *metav1.ObjectMeta, index int) *corev1.SecretRefere
return r
}

func createController(stop <-chan struct{}, namespace string, controlMachineObjects, controlCoreObjects, targetCoreObjects []runtime.Object) (*controller, *customfake.FakeObjectTrackers) {
func createController(
stop <-chan struct{},
namespace string,
controlMachineObjects, controlCoreObjects, targetCoreObjects []runtime.Object,
) (*controller, *customfake.FakeObjectTrackers) {

fakeControlMachineClient, controlMachineObjectTracker := customfake.NewMachineClientSet(controlMachineObjects...)
fakeTypedMachineClient := &faketyped.FakeMachineV1alpha1{
Expand Down
32 changes: 15 additions & 17 deletions pkg/controller/machine_safety_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,12 @@ import (
"k8s.io/client-go/tools/cache"
)

const namespace = "test"

var (
fiveSecondsBeforeNow = time.Now().Add(-time.Duration(5 * time.Second))
fiveMinutesBeforeNow = time.Now().Add(-time.Duration(5 * time.Minute))
)

var _ = Describe("machine", func() {
var _ = Describe("#machine_safety", func() {
DescribeTable("##freezeMachineSetsAndDeployments",
func(machineSet *v1alpha1.MachineSet) {
stop := make(chan struct{})
Expand All @@ -49,7 +47,7 @@ var _ = Describe("machine", func() {
if machineSet != nil {
controlMachineObjects = append(controlMachineObjects, machineSet)
}
c, trackers := createController(stop, namespace, controlMachineObjects, nil, nil)
c, trackers := createController(stop, testNamespace, controlMachineObjects, nil, nil)
defer trackers.Stop()

machineSets, err := c.controlMachineClient.MachineSets(machineSet.Namespace).List(metav1.ListOptions{})
Expand All @@ -66,22 +64,22 @@ var _ = Describe("machine", func() {
Entry("one machineset", newMachineSet(&v1alpha1.MachineTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Name: "machine",
Namespace: "test",
Namespace: testNamespace,
},
}, 1, 10, nil, nil)),
}, 1, 10, nil, nil, nil)),
)

DescribeTable("##unfreezeMachineSetsAndDeployments",
func(machineSetExists, machineSetIsFrozen, parentExists, parentIsFrozen bool) {
testMachineSet := newMachineSet(&v1alpha1.MachineTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Name: "testMachineSet",
Namespace: machinenamespace,
Name: "machine",
Namespace: testNamespace,
Labels: map[string]string{
"name": "testMachineDeployment",
},
},
}, 1, 10, nil, nil)
}, 1, 10, nil, nil, nil)
if machineSetIsFrozen {
testMachineSet.Labels["freeze"] = "True"
msStatus := testMachineSet.Status
Expand All @@ -92,7 +90,7 @@ var _ = Describe("machine", func() {
testMachineDeployment := &v1alpha1.MachineDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "testMachineDeployment",
Namespace: machinenamespace,
Namespace: testNamespace,
Labels: map[string]string{},
},
Spec: v1alpha1.MachineDeploymentSpec{
Expand Down Expand Up @@ -120,7 +118,7 @@ var _ = Describe("machine", func() {
if parentExists {
controlMachineObjects = append(controlMachineObjects, testMachineDeployment)
}
c, trackers := createController(stop, namespace, controlMachineObjects, nil, nil)
c, trackers := createController(stop, testNamespace, controlMachineObjects, nil, nil)
defer trackers.Stop()

Expect(cache.WaitForCacheSync(stop, c.machineSetSynced, c.machineDeploymentSynced)).To(BeTrue())
Expand All @@ -132,7 +130,7 @@ var _ = Describe("machine", func() {
Expect(GetCondition(&machineSet.Status, v1alpha1.MachineSetFrozen)).Should(BeNil())
machineDeployment, err := c.controlMachineClient.MachineDeployments(testMachineDeployment.Namespace).Get(testMachineDeployment.Name, metav1.GetOptions{})
if parentExists {
Expect(machineDeployment.Labels["freeze"]).Should((BeEmpty()))
//Expect(machineDeployment.Labels["freeze"]).Should((BeEmpty()))
Expect(GetMachineDeploymentCondition(machineDeployment.Status, v1alpha1.MachineDeploymentFrozen)).Should(BeNil())
} else {
Expect(err).ShouldNot(BeNil())
Expand All @@ -157,7 +155,7 @@ var _ = Describe("machine", func() {
if machineSet != nil {
controlMachineObjects = append(controlMachineObjects, machineSet)
}
c, trackers := createController(stop, namespace, controlMachineObjects, nil, nil)
c, trackers := createController(stop, testNamespace, controlMachineObjects, nil, nil)
defer trackers.Stop()

waitForCacheSync(stop, c)
Expand All @@ -171,9 +169,9 @@ var _ = Describe("machine", func() {
Entry("one machineset", newMachineSet(&v1alpha1.MachineTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Name: "machine",
Namespace: "test",
Namespace: testNamespace,
},
}, 1, 10, nil, nil)),
}, 1, 10, nil, nil, nil)),
)

DescribeTable("##reconcileClusterMachineSafetyAPIServer",
Expand All @@ -190,7 +188,7 @@ var _ = Describe("machine", func() {
testMachine := &machinev1.Machine{
ObjectMeta: metav1.ObjectMeta{
Name: "testmachine1",
Namespace: machinenamespace,
Namespace: testNamespace,
},
Status: machinev1.MachineStatus{
CurrentStatus: machinev1.CurrentStatus{
Expand All @@ -201,7 +199,7 @@ var _ = Describe("machine", func() {
controlMachineObjects := []runtime.Object{}
controlMachineObjects = append(controlMachineObjects, testMachine)

c, trackers := createController(stop, namespace, controlMachineObjects, nil, nil)
c, trackers := createController(stop, testNamespace, controlMachineObjects, nil, nil)
defer trackers.Stop()
waitForCacheSync(stop, c)

Expand Down
16 changes: 8 additions & 8 deletions pkg/controller/machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
k8stesting "k8s.io/client-go/testing"
)

const machinenamespace = "test"
const testNamespace = "test"

var _ = Describe("machine", func() {
var (
Expand All @@ -60,7 +60,7 @@ var _ = Describe("machine", func() {
machine = &machinev1.Machine{
ObjectMeta: metav1.ObjectMeta{
Name: "machine-1",
Namespace: machinenamespace,
Namespace: testNamespace,
},
}
lastOperation = machinev1.LastOperation{
Expand Down Expand Up @@ -141,7 +141,7 @@ var _ = Describe("machine", func() {
testMachine := machinev1.Machine{
ObjectMeta: metav1.ObjectMeta{
Name: "testmachine",
Namespace: machinenamespace,
Namespace: testNamespace,
},
Status: machinev1.MachineStatus{
Conditions: []corev1.NodeCondition{},
Expand Down Expand Up @@ -216,13 +216,13 @@ var _ = Describe("machine", func() {
defer close(stop)

objects := []runtime.Object{}
c, trackers := createController(stop, namespace, objects, nil, nil)
c, trackers := createController(stop, testNamespace, objects, nil, nil)
defer trackers.Stop()

testMachine := &machinev1.Machine{
ObjectMeta: metav1.ObjectMeta{
Name: "testmachine",
Namespace: machinenamespace,
Namespace: testNamespace,
},
Status: machinev1.MachineStatus{
CurrentStatus: machinev1.CurrentStatus{
Expand All @@ -243,7 +243,7 @@ var _ = Describe("machine", func() {
testMachine := &machinev1.Machine{
ObjectMeta: metav1.ObjectMeta{
Name: "testmachine",
Namespace: machinenamespace,
Namespace: testNamespace,
},
Status: machinev1.MachineStatus{
CurrentStatus: machinev1.CurrentStatus{
Expand All @@ -254,7 +254,7 @@ var _ = Describe("machine", func() {
objects := []runtime.Object{}
objects = append(objects, testMachine)

c, trackers := createController(stop, namespace, objects, nil, nil)
c, trackers := createController(stop, testNamespace, objects, nil, nil)
defer trackers.Stop()

var updatedMachine, err = c.updateMachineConditions(testMachine, conditions)
Expand Down Expand Up @@ -325,7 +325,7 @@ var _ = Describe("machine", func() {

objMeta := &metav1.ObjectMeta{
GenerateName: "class",
Namespace: namespace,
Namespace: testNamespace,
}

DescribeTable("##table",
Expand Down
18 changes: 9 additions & 9 deletions pkg/driver/driver_alicloud_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ func TestTagsOrdered(t *testing.T) {
tags := map[string]string{
"kubernetes.io/cluster/ali-test": "1",
"kubernetes.io/role/worker": "1",
"taga": "tagvala",
"tagb": "tagvalb",
"tagc": "tagvalc",
"taga": "tagvala",
"tagb": "tagvalb",
"tagc": "tagvalc",
}
c := &AlicloudDriver{}
res, err := c.toInstanceTags(tags)
Expand Down Expand Up @@ -48,9 +48,9 @@ func TestTagsOrdered(t *testing.T) {
func TestNoClusterTags(t *testing.T) {
tags := map[string]string{
"kubernetes.io/role/worker": "1",
"taga": "tagvala",
"tagb": "tagvalb",
"tagc": "tagvalc",
"taga": "tagvala",
"tagb": "tagvalb",
"tagc": "tagvalc",
}
c := &AlicloudDriver{}
_, err := c.toInstanceTags(tags)
Expand All @@ -60,11 +60,11 @@ func TestNoClusterTags(t *testing.T) {
}
func TestRandomOrderTags(t *testing.T) {
tags := map[string]string{
"taga": "tagvala",
"tagb": "tagvalb",
"taga": "tagvala",
"tagb": "tagvalb",
"kubernetes.io/cluster/ali-test": "1",
"kubernetes.io/role/worker": "1",
"tagc": "tagvalc",
"tagc": "tagvalc",
}
c := &AlicloudDriver{}
res, err := c.toInstanceTags(tags)
Expand Down

0 comments on commit cdcac24

Please sign in to comment.