Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

code clean: controlPane -> controlPlane #220

Merged
merged 1 commit into from
Sep 11, 2019
Merged

code clean: controlPane -> controlPlane #220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions controllers/kubeadmconfig_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ func TestKubeadmConfigReconciler_Reconcile_RequeueJoiningNodesIfControlPlaneNotI
workerMachine := newWorkerMachine(cluster)
workerJoinConfig := newWorkerJoinKubeadmConfig(workerMachine)

controlPaneMachine := newControlPlaneMachine(cluster)
controlPaneJoinConfig := newControlPlaneJoinKubeadmConfig(controlPaneMachine, "control-plane-join-cfg")
controlPlaneMachine := newControlPlaneMachine(cluster)
controlPlaneJoinConfig := newControlPlaneJoinKubeadmConfig(controlPlaneMachine, "control-plane-join-cfg")

testcases := []struct {
name string
Expand All @@ -246,14 +246,14 @@ func TestKubeadmConfigReconciler_Reconcile_RequeueJoiningNodesIfControlPlaneNotI
name: "requeue a secondary control plane when the control plane is not yet initialized",
request: ctrl.Request{
NamespacedName: types.NamespacedName{
Namespace: controlPaneJoinConfig.Namespace,
Name: controlPaneJoinConfig.Name,
Namespace: controlPlaneJoinConfig.Namespace,
Name: controlPlaneJoinConfig.Name,
},
},
objects: []runtime.Object{
cluster,
controlPaneMachine,
controlPaneJoinConfig,
controlPlaneMachine,
controlPlaneJoinConfig,
},
},
}
Expand Down Expand Up @@ -384,14 +384,14 @@ func TestKubeadmConfigReconciler_Reconcile_ErrorIfJoiningControlPlaneHasInvalidC
cluster.Status.ControlPlaneInitialized = true
cluster.Status.APIEndpoints = []clusterv1.APIEndpoint{{Host: "100.105.150.1", Port: 6443}}

controlPaneMachine := newControlPlaneMachine(cluster)
controlPaneJoinConfig := newControlPlaneJoinKubeadmConfig(controlPaneMachine, "control-plane-join-cfg")
controlPaneJoinConfig.Spec.JoinConfiguration.ControlPlane = nil // Makes controlPaneJoinConfig invalid for a control plane machine
controlPlaneMachine := newControlPlaneMachine(cluster)
controlPlaneJoinConfig := newControlPlaneJoinKubeadmConfig(controlPlaneMachine, "control-plane-join-cfg")
controlPlaneJoinConfig.Spec.JoinConfiguration.ControlPlane = nil // Makes controlPlaneJoinConfig invalid for a control plane machine

objects := []runtime.Object{
cluster,
controlPaneMachine,
controlPaneJoinConfig,
controlPlaneMachine,
controlPlaneJoinConfig,
}
myclient := fake.NewFakeClientWithScheme(setupScheme(), objects...)

Expand Down Expand Up @@ -463,15 +463,15 @@ func TestReconcileIfJoinNodesAndControlPlaneIsReady(t *testing.T) {
workerMachine := newWorkerMachine(cluster)
workerJoinConfig := newWorkerJoinKubeadmConfig(workerMachine)

controlPaneMachine := newControlPlaneMachine(cluster)
controlPaneJoinConfig := newControlPlaneJoinKubeadmConfig(controlPaneMachine, "control-plane-join-cfg")
controlPlaneMachine := newControlPlaneMachine(cluster)
controlPlaneJoinConfig := newControlPlaneJoinKubeadmConfig(controlPlaneMachine, "control-plane-join-cfg")

objects := []runtime.Object{
cluster,
workerMachine,
workerJoinConfig,
controlPaneMachine,
controlPaneJoinConfig,
controlPlaneMachine,
controlPlaneJoinConfig,
}
objects = append(objects, createSecrets(t, cluster)...)
myclient := fake.NewFakeClientWithScheme(setupScheme(), objects...)
Expand Down