Skip to content

kubeletconfig: fix updates, add unit test, race condition fix #437

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 2 commits into from
Feb 16, 2019
Merged

kubeletconfig: fix updates, add unit test, race condition fix #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04d9c44
kubeletconfig: fix updates and add unit test
rphillips Feb 15, 2019
57ff65d
kubeletconfig: race fix
rphillips Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions pkg/controller/kubelet-config/kubelet_config_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,11 +355,6 @@ func (ctrl *Controller) syncKubeletConfig(key string) error {
return ctrl.syncStatusOnly(cfg, err, "Could not find MachineConfig: %v", managedKey)
}
isNotFound := errors.IsNotFound(err)
// If the managed MachineConfig exists then try the next pool. This
// prevents an infinite recursion of recreating MachineConfigs.
if err == nil && !isNotFound && mc != nil {
continue
}
// Generate the original KubeletConfig
originalKubeletIgn, err := ctrl.generateOriginalKubeletConfig(role)
if err != nil {
Expand Down
118 changes: 99 additions & 19 deletions pkg/controller/kubelet-config/kubelet_config_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,25 @@ func newFixture(t *testing.T) *fixture {
return f
}

func (f *fixture) validateActions() {
actions := filterInformerActions(f.client.Actions())
for i, action := range actions {
glog.Infof(" Action: %v", action)

if len(f.actions) < i+1 {
f.t.Errorf("%d unexpected actions: %+v", len(actions)-len(f.actions), actions[i:])
break
}

expectedAction := f.actions[i]
checkAction(expectedAction, action, f.t)
}

if len(f.actions) > len(actions) {
f.t.Errorf("%d additional expected actions:%+v", len(f.actions)-len(actions), f.actions[len(actions):])
}
}

func newMachineConfig(name string, labels map[string]string, osurl string, files []ignv2_2types.File) *mcfgv1.MachineConfig {
if labels == nil {
labels = map[string]string{}
Expand All @@ -72,12 +91,14 @@ func newMachineConfig(name string, labels map[string]string, osurl string, files
}
}

func newControllerConfig(name string) *mcfgv1.ControllerConfig {
func newControllerConfig(name, platform string) *mcfgv1.ControllerConfig {
name = fmt.Sprintf("%s-%s", name, platform)
cc := &mcfgv1.ControllerConfig{
TypeMeta: metav1.TypeMeta{APIVersion: mcfgv1.SchemeGroupVersion.String()},
ObjectMeta: metav1.ObjectMeta{Name: name, UID: types.UID(utilrand.String(5))},
Spec: mcfgv1.ControllerConfigSpec{
EtcdDiscoveryDomain: fmt.Sprintf("%s.tt.testing", name),
Platform: platform,
},
}
return cc
Expand Down Expand Up @@ -159,22 +180,7 @@ func (f *fixture) runController(mcpname string, startInformers bool, expectError
f.t.Error("expected error syncing kubeletconfigs, got nil")
}

actions := filterInformerActions(f.client.Actions())
for i, action := range actions {
glog.Infof(" Action: %v", action)

if len(f.actions) < i+1 {
f.t.Errorf("%d unexpected actions: %+v", len(actions)-len(f.actions), actions[i:])
break
}

expectedAction := f.actions[i]
checkAction(expectedAction, action, f.t)
}

if len(f.actions) > len(actions) {
f.t.Errorf("%d additional expected actions:%+v", len(f.actions)-len(actions), f.actions[len(actions):])
}
f.validateActions()
}

// filterInformerActions filters list and watch actions for testing resources.
Expand Down Expand Up @@ -253,6 +259,10 @@ func (f *fixture) expectCreateMachineConfigAction(config *mcfgv1.MachineConfig)
f.actions = append(f.actions, core.NewRootCreateAction(schema.GroupVersionResource{Resource: "machineconfigs"}, config))
}

func (f *fixture) expectUpdateMachineConfigAction(config *mcfgv1.MachineConfig) {
f.actions = append(f.actions, core.NewRootUpdateAction(schema.GroupVersionResource{Resource: "machineconfigs"}, config))
}

func (f *fixture) expectPatchKubeletConfig(config *mcfgv1.KubeletConfig, patch []byte) {
f.actions = append(f.actions, core.NewRootPatchAction(schema.GroupVersionResource{Version: "v1", Group: "machineconfiguration.openshift.io", Resource: "kubeletconfigs"}, config.Name, patch))
}
Expand All @@ -266,8 +276,7 @@ func TestKubeletConfigCreate(t *testing.T) {
t.Run(platform, func(t *testing.T) {
f := newFixture(t)

cc := newControllerConfig("test-cluster")
cc.Spec.Platform = platform
cc := newControllerConfig("test-cluster-configcreate", platform)
mcp := newMachineConfigPool("master", map[string]string{"kubeletType": "small-pods"}, metav1.AddLabelToSelector(&metav1.LabelSelector{}, "node-role", "master"), "v0")
mcp2 := newMachineConfigPool("worker", map[string]string{"kubeletType": "large-pods"}, metav1.AddLabelToSelector(&metav1.LabelSelector{}, "node-role", "worker"), "v0")
kc1 := newKubeletConfig("smaller-max-pods", &kubeletconfigv1beta1.KubeletConfiguration{MaxPods: 100}, metav1.AddLabelToSelector(&metav1.LabelSelector{}, "kubeletType", "small-pods"))
Expand All @@ -289,6 +298,77 @@ func TestKubeletConfigCreate(t *testing.T) {
}
}

func TestKubeletConfigUpdates(t *testing.T) {
for _, platform := range []string{"aws", "none", "unrecognized"} {
t.Run(platform, func(t *testing.T) {
f := newFixture(t)

cc := newControllerConfig("test-cluster-configupdate", platform)
mcp := newMachineConfigPool("master", map[string]string{"kubeletType": "small-pods"}, metav1.AddLabelToSelector(&metav1.LabelSelector{}, "node-role", "master"), "v0")
mcp2 := newMachineConfigPool("worker", map[string]string{"kubeletType": "large-pods"}, metav1.AddLabelToSelector(&metav1.LabelSelector{}, "node-role", "worker"), "v0")
kc1 := newKubeletConfig("smaller-max-pods", &kubeletconfigv1beta1.KubeletConfiguration{MaxPods: 100}, metav1.AddLabelToSelector(&metav1.LabelSelector{}, "kubeletType", "small-pods"))
mcs := newMachineConfig(getManagedKey(mcp, kc1), map[string]string{"node-role": "master"}, "dummy://", []ignv2_2types.File{{}})

f.ccLister = append(f.ccLister, cc)
f.mcpLister = append(f.mcpLister, mcp)
f.mcpLister = append(f.mcpLister, mcp2)
f.mckLister = append(f.mckLister, kc1)
f.objects = append(f.objects, kc1)

f.expectGetMachineConfigAction(mcs)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc1, []uint8{0x7b, 0x22, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3a, 0x7b, 0x22, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x72, 0x73, 0x22, 0x3a, 0x5b, 0x22, 0x39, 0x39, 0x2d, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x2d, 0x68, 0x35, 0x35, 0x32, 0x6d, 0x2d, 0x73, 0x6d, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x2d, 0x6d, 0x61, 0x78, 0x2d, 0x70, 0x6f, 0x64, 0x73, 0x2d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x22, 0x5d, 0x7d, 0x7d})
f.expectUpdateKubeletConfig(kc1)

c, i := f.newController()
stopCh := make(chan struct{})
i.Start(stopCh)

err := c.syncHandler(getKey(kc1, t))
if err != nil {
t.Errorf("syncHandler returned: %v", err)
}

f.validateActions()
close(stopCh)

// Perform Update
f = newFixture(t)

// Modify config
kcUpdate := kc1.DeepCopy()
kcUpdate.Spec.KubeletConfig.MaxPods = 101

f.ccLister = append(f.ccLister, cc)
f.mcpLister = append(f.mcpLister, mcp)
f.mcpLister = append(f.mcpLister, mcp2)
f.mckLister = append(f.mckLister, kc1)
f.objects = append(f.objects, mcs, kcUpdate) // MachineConfig exists

c, i = f.newController()
stopCh = make(chan struct{})
i.Start(stopCh)

glog.Info("Applying update")

// Apply update
err = c.syncHandler(getKey(kcUpdate, t))
if err != nil {
t.Errorf("syncHandler returned: %v", err)
}

f.expectGetMachineConfigAction(mcs)
f.expectUpdateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kcUpdate, []uint8{0x7b, 0x22, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3a, 0x7b, 0x22, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x72, 0x73, 0x22, 0x3a, 0x5b, 0x22, 0x39, 0x39, 0x2d, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x2d, 0x6d, 0x77, 0x77, 0x74, 0x67, 0x2d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x22, 0x5d, 0x7d, 0x7d})
f.expectUpdateKubeletConfig(kcUpdate)

f.validateActions()

close(stopCh)
})
}
}

func TestKubeletConfigBlacklistedOptions(t *testing.T) {
failureTests := []struct {
name string
Expand Down