diff --git a/internal/controller/controllers/bmh_agent_controller.go b/internal/controller/controllers/bmh_agent_controller.go index cbc295629f..7a03506e2c 100644 --- a/internal/controller/controllers/bmh_agent_controller.go +++ b/internal/controller/controllers/bmh_agent_controller.go @@ -1359,6 +1359,9 @@ func (r *BMACReconciler) newSpokeBMH(log logrus.FieldLogger, bmh *bmh_v1alpha1.B }, } mutateFn := func() error { + // inspection must be disabled when providing hardware details + // ensure it is always disabled even for converged + setAnnotation(&bmhSpoke.ObjectMeta, BMH_INSPECT_ANNOTATION, "disabled") bmhSpoke.Spec = bmh.Spec // remove the credentials from the spoke's Spec so // that BMO will set the status to unmanaged diff --git a/internal/controller/controllers/bmh_agent_controller_test.go b/internal/controller/controllers/bmh_agent_controller_test.go index ed1c874d3c..39bb476ee1 100644 --- a/internal/controller/controllers/bmh_agent_controller_test.go +++ b/internal/controller/controllers/bmh_agent_controller_test.go @@ -1068,7 +1068,7 @@ var _ = Describe("bmac reconcile", func() { }) Context("when agent role worker and cluster deployment is set", func() { - It("should set spoke BMH when agent is not installing", func() { + It("should not create spoke BMH when agent is not installing", func() { configMap := &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Name: "root-ca", @@ -1105,7 +1105,7 @@ var _ = Describe("bmac reconcile", func() { err = spokeClient.Get(ctx, types.NamespacedName{Name: machineName, Namespace: OPENSHIFT_MACHINE_API_NAMESPACE}, spokeMachine) Expect(err).NotTo(BeNil()) }) - It("should not set spoke BMH when agent is installing", func() { + It("should create spoke BMH when agent is installing", func() { configMap := &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Name: "root-ca", @@ -1143,6 +1143,7 @@ var _ = Describe("bmac reconcile", func() { Expect(spokeBMH.ObjectMeta.Annotations).To(HaveKey(BMH_HARDWARE_DETAILS_ANNOTATION)) Expect(spokeBMH.ObjectMeta.Annotations[BMH_HARDWARE_DETAILS_ANNOTATION]).To(Equal(updatedHost.ObjectMeta.Annotations[BMH_HARDWARE_DETAILS_ANNOTATION])) Expect(spokeBMH.ObjectMeta.Annotations).ToNot(HaveKey(BMH_DETACHED_ANNOTATION)) + Expect(spokeBMH.ObjectMeta.Annotations[BMH_INSPECT_ANNOTATION]).To(Equal("disabled")) Expect(spokeBMH.Spec.Image).To(Equal(updatedHost.Spec.Image)) Expect(spokeBMH.Spec.ConsumerRef.Kind).To(Equal("Machine")) Expect(spokeBMH.Spec.ConsumerRef.Name).To(Equal(machineName))