Merge pull request #52 from nunnatsa/auto_sync_upstream_2024-01-08-09-36

openshift-merge-bot[bot] · web-flow · commit f7eac3c04b49 · 2024-01-13T22:57:52.000Z
Auto sync upstream 2024-01-08 09:36
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -38,17 +38,8 @@ spec:
           httpGet:
             path: /healthz
             port: healthz
-        volumeMounts:
-          - mountPath: /var/run/docker.sock
-            name: dockersock
-        securityContext:
-          privileged: true
       terminationGracePeriodSeconds: 10
       serviceAccountName: manager
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master
-      volumes:
-        - name: dockersock
-          hostPath:
-            path: /var/run/docker.sock
diff --git a/pkg/context/machine_context.go b/pkg/context/machine_context.go
@@ -66,7 +66,6 @@ func (c *MachineContext) PatchKubevirtMachine(patchHelper *patch.Helper) error {
 			infrav1.VMProvisionedCondition,
 			infrav1.BootstrapExecSucceededCondition,
 		),
-		conditions.WithStepCounterIf(c.KubevirtMachine.ObjectMeta.DeletionTimestamp.IsZero()),
 	)
 
 	// Patch the object, ignoring conflicts on the conditions owned by this controller.

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ func (c MachineContext) PatchKubevirtMachine(patchHelper patch.Helper) error {`
`66`	`66`	`infrav1.VMProvisionedCondition,`
`67`	`67`	`infrav1.BootstrapExecSucceededCondition,`
`68`	`68`	`),`
`69`		`- conditions.WithStepCounterIf(c.KubevirtMachine.ObjectMeta.DeletionTimestamp.IsZero()),`
`70`	`69`	`)`
`71`	`70`
`72`	`71`	`// Patch the object, ignoring conflicts on the conditions owned by this controller.`