Skip to content

Bug 2033489: allow baremetal platform to skip syncing #156

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 1 commit into from
Dec 17, 2021
Merged

Bug 2033489: allow baremetal platform to skip syncing #156

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 pkg/controllers/cloud_config_sync_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (r *CloudConfigReconciler) isCloudConfigSyncNeeded(platformStatus *configv1
return false, fmt.Errorf("platformStatus is required")
}
switch platformStatus.Type {
case configv1.AWSPlatformType: // aws ccm does not use cloud-config at the moment
case configv1.AWSPlatformType, configv1.BareMetalPlatformType: // aws ccm does not use cloud-config at the moment
return false, nil
default:
return true, nil
Expand Down
12 changes: 12 additions & 0 deletions pkg/controllers/cloud_config_sync_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,18 @@ var _ = Describe("Cloud config sync reconciler", func() {
Expect(len(allCMs.Items)).To(BeZero())
})

It("should skip config sync for BareMetal platform", func() {
infraResource := makeInfrastructureResource(configv1.BareMetalPlatformType)
Expect(cl.Create(ctx, infraResource)).To(Succeed())
infraResource.Status = makeInfraStatus(infraResource.Spec.PlatformSpec.Type)
Expect(cl.Status().Update(ctx, infraResource.DeepCopy())).To(Succeed())
_, err := reconciler.Reconcile(context.TODO(), ctrl.Request{})
Expect(err).To(BeNil())
allCMs := &corev1.ConfigMapList{}
Expect(cl.List(ctx, allCMs, &client.ListOptions{Namespace: targetNamespaceName})).To(Succeed())
Expect(len(allCMs.Items)).To(BeZero())
})

It("should perform config sync for Azure platform", func() {
infraResource := makeInfrastructureResource(configv1.AzurePlatformType)
Expect(cl.Create(ctx, infraResource)).To(Succeed())
Expand Down