Skip to content
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

🐛 fix ClusterClass control plane infrastructure machine template rotation #5158

Merged
merged 1 commit into from
Aug 26, 2021
Merged

🐛 fix ClusterClass control plane infrastructure machine template rotation #5158

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion controllers/topology/reconcile_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (r *ClusterReconciler) reconcileControlPlane(ctx context.Context, s *scope.
desired: s.Desired.ControlPlane.InfrastructureMachineTemplate,
compatibilityChecker: check.ReferencedObjectsAreCompatible,
templateNamer: func() string {
return controlPlaneInfrastructureMachineTemplateNamePrefix(s.Current.ControlPlane.Object.GetClusterName())
return controlPlaneInfrastructureMachineTemplateNamePrefix(s.Current.Cluster.Name)
},
},
)
Expand Down
8 changes: 4 additions & 4 deletions controllers/topology/reconcile_state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,20 +388,19 @@ func TestReconcileControlPlaneInfrastructureMachineTemplate(t *testing.T) {
updatedInfrastructureMachineTemplate := infrastructureMachineTemplate.DeepCopy()
err := unstructured.SetNestedField(updatedInfrastructureMachineTemplate.UnstructuredContent(), true, "spec", "differentSetting")
g.Expect(err).ToNot(HaveOccurred())
// Create Cluster object for test cases.
cluster := newFakeCluster(metav1.NamespaceDefault, "cluster").Obj()
// Create ControlPlaneObjects for test cases.
controlPlane1 := newFakeControlPlane(metav1.NamespaceDefault, "cp1").WithInfrastructureMachineTemplate(infrastructureMachineTemplate).Obj()
controlPlane1.SetClusterName("firstCluster")
// ControlPlane object with novel field in the spec.
controlPlane2 := controlPlane1.DeepCopy()
err = unstructured.SetNestedField(controlPlane2.UnstructuredContent(), true, "spec", "differentSetting")
g.Expect(err).ToNot(HaveOccurred())
controlPlane2.SetClusterName("firstCluster")
// ControlPlane object with a new label.
controlPlaneWithInstanceSpecificChanges := controlPlane1.DeepCopy()
controlPlaneWithInstanceSpecificChanges.SetLabels(map[string]string{"foo": "bar"})
// ControlPlane object with the same name as controlPlane1 but a different InfrastructureMachineTemplate
controlPlane3 := newFakeControlPlane(metav1.NamespaceDefault, "cp1").WithInfrastructureMachineTemplate(updatedInfrastructureMachineTemplate).Obj()
controlPlane3.SetClusterName("firstCluster")

tests := []struct {
name string
Expand Down Expand Up @@ -437,6 +436,7 @@ func TestReconcileControlPlaneInfrastructureMachineTemplate(t *testing.T) {
s := scope.New(nil)
s.Blueprint = blueprint
if tt.current != nil {
s.Current.Cluster = cluster
s.Current.ControlPlane = tt.current
if tt.current.Object != nil {
fakeObjs = append(fakeObjs, tt.current.Object)
Expand Down Expand Up @@ -482,7 +482,7 @@ func TestReconcileControlPlaneInfrastructureMachineTemplate(t *testing.T) {
item, err := contract.ControlPlane().InfrastructureMachineTemplate().Get(gotControlPlaneObject)
g.Expect(err).ToNot(HaveOccurred())
// This pattern should match return value in controlPlaneinfrastructureMachineTemplateNamePrefix
pattern := fmt.Sprintf("%s-controlplane-.*", tt.desired.Object.GetClusterName())
pattern := fmt.Sprintf("%s-controlplane-.*", s.Current.Cluster.Name)
fmt.Println(pattern, item.Name)
ok, err := regexp.Match(pattern, []byte(item.Name))
g.Expect(err).NotTo(HaveOccurred())
Expand Down