diff --git a/go.mod b/go.mod
index c2b6c539e..15cbdbd8a 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/golang/mock v1.5.0
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.17.0
-	github.com/openshift/api v0.0.0-20220322000322-9c4998a4d646
+	github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53
 	github.com/openshift/machine-api-operator v0.2.1-0.20220327131531-58ba8507d869
 	k8s.io/api v0.23.0
 	k8s.io/apimachinery v0.23.0
diff --git a/go.sum b/go.sum
index a92935b9a..e010f6489 100644
--- a/go.sum
+++ b/go.sum
@@ -552,8 +552,9 @@ github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQ
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/openshift/api v0.0.0-20211209135129-c58d9f695577/go.mod h1:DoslCwtqUpr3d/gsbq4ZlkaMEdYqKxuypsDjorcHhME=
-github.com/openshift/api v0.0.0-20220322000322-9c4998a4d646 h1:V68+yLIF5FGKRSnurrqr56KLpcuQsv5RYxwNF0XI2Jw=
 github.com/openshift/api v0.0.0-20220322000322-9c4998a4d646/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
+github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53 h1:WpOfczPbuY5llRH94DJRsGTsgm7d8iAA2b7m0+YXAqI=
+github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
 github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3 h1:SG1aqwleU6bGD0X4mhkTNupjVnByMYYuW4XbnCPavQU=
diff --git a/pkg/actuators/machine/machine_scope.go b/pkg/actuators/machine/machine_scope.go
index 04a374f74..759f6097c 100644
--- a/pkg/actuators/machine/machine_scope.go
+++ b/pkg/actuators/machine/machine_scope.go
@@ -10,6 +10,7 @@ import (
 	machineapierros "github.com/openshift/machine-api-operator/pkg/controller/machine"
 	awsclient "github.com/openshift/machine-api-provider-aws/pkg/client"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -160,7 +161,7 @@ func (s *machineScope) getUserData() ([]byte, error) {
 	return userData, nil
 }
 
-func (s *machineScope) setProviderStatus(instance *ec2.Instance, condition machinev1beta1.AWSMachineProviderCondition) error {
+func (s *machineScope) setProviderStatus(instance *ec2.Instance, condition metav1.Condition) error {
 	klog.Infof("%s: Updating status", s.machine.Name)
 
 	networkAddresses := []corev1.NodeAddress{}
@@ -191,7 +192,7 @@ func (s *machineScope) setProviderStatus(instance *ec2.Instance, condition machi
 	klog.Infof("%s: finished calculating AWS status", s.machine.Name)
 
 	s.machine.Status.Addresses = networkAddresses
-	s.providerStatus.Conditions = setAWSMachineProviderCondition(condition, s.providerStatus.Conditions)
+	s.providerStatus.Conditions = setCondition(condition, s.providerStatus.Conditions)
 
 	return nil
 }
diff --git a/pkg/actuators/machine/utils.go b/pkg/actuators/machine/utils.go
index 42a090871..7cd9e75df 100644
--- a/pkg/actuators/machine/utils.go
+++ b/pkg/actuators/machine/utils.go
@@ -271,17 +271,16 @@ func terminateInstances(client awsclient.Client, instances []*ec2.Instance) ([]*
 	return output.TerminatingInstances, nil
 }
 
-// setAWSMachineProviderCondition sets the condition for the machine and
+// setCondition sets the condition for the machine and
 // returns the new slice of conditions.
 // If the machine does not already have a condition with the specified type,
 // a condition will be added to the slice
 // If the machine does already have a condition with the specified type,
 // the condition will be updated if either of the following are true.
-func setAWSMachineProviderCondition(condition machinev1beta1.AWSMachineProviderCondition, conditions []machinev1beta1.AWSMachineProviderCondition) []machinev1beta1.AWSMachineProviderCondition {
+func setCondition(condition metav1.Condition, conditions []metav1.Condition) []metav1.Condition {
 	now := metav1.Now()
 
-	if existingCondition := findProviderCondition(conditions, condition.Type); existingCondition == nil {
-		condition.LastProbeTime = now
+	if existingCondition := findCondition(conditions, condition.Type); existingCondition == nil {
 		condition.LastTransitionTime = now
 		conditions = append(conditions, condition)
 	} else {
@@ -291,7 +290,7 @@ func setAWSMachineProviderCondition(condition machinev1beta1.AWSMachineProviderC
 	return conditions
 }
 
-func findProviderCondition(conditions []machinev1beta1.AWSMachineProviderCondition, conditionType machinev1beta1.ConditionType) *machinev1beta1.AWSMachineProviderCondition {
+func findCondition(conditions []metav1.Condition, conditionType string) *metav1.Condition {
 	for i := range conditions {
 		if conditions[i].Type == conditionType {
 			return &conditions[i]
@@ -300,7 +299,7 @@ func findProviderCondition(conditions []machinev1beta1.AWSMachineProviderConditi
 	return nil
 }
 
-func updateExistingCondition(newCondition, existingCondition *machinev1beta1.AWSMachineProviderCondition) {
+func updateExistingCondition(newCondition, existingCondition *metav1.Condition) {
 	if !shouldUpdateCondition(newCondition, existingCondition) {
 		return
 	}
@@ -311,10 +310,9 @@ func updateExistingCondition(newCondition, existingCondition *machinev1beta1.AWS
 	existingCondition.Status = newCondition.Status
 	existingCondition.Reason = newCondition.Reason
 	existingCondition.Message = newCondition.Message
-	existingCondition.LastProbeTime = newCondition.LastProbeTime
 }
 
-func shouldUpdateCondition(newCondition, existingCondition *machinev1beta1.AWSMachineProviderCondition) bool {
+func shouldUpdateCondition(newCondition, existingCondition *metav1.Condition) bool {
 	return newCondition.Reason != existingCondition.Reason || newCondition.Message != existingCondition.Message
 }
 
@@ -390,19 +388,19 @@ func extractNodeAddresses(instance *ec2.Instance, domainNames []string) ([]corev
 	return addresses, nil
 }
 
-func conditionSuccess() machinev1beta1.AWSMachineProviderCondition {
-	return machinev1beta1.AWSMachineProviderCondition{
-		Type:    machinev1beta1.MachineCreation,
-		Status:  corev1.ConditionTrue,
+func conditionSuccess() metav1.Condition {
+	return metav1.Condition{
+		Type:    string(machinev1beta1.MachineCreation),
+		Status:  metav1.ConditionTrue,
 		Reason:  machinev1beta1.MachineCreationSucceededConditionReason,
 		Message: "Machine successfully created",
 	}
 }
 
-func conditionFailed() machinev1beta1.AWSMachineProviderCondition {
-	return machinev1beta1.AWSMachineProviderCondition{
-		Type:   machinev1beta1.MachineCreation,
-		Status: corev1.ConditionFalse,
+func conditionFailed() metav1.Condition {
+	return metav1.Condition{
+		Type:   string(machinev1beta1.MachineCreation),
+		Status: metav1.ConditionFalse,
 		Reason: machinev1beta1.MachineCreationFailedConditionReason,
 	}
 }
diff --git a/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
index ceb8b7e6d..24f379c13 100644
--- a/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
+++ b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
@@ -65,6 +65,7 @@ spec:
                         enum:
                           - openshift-samples
                           - baremetal
+                          - marketplace
                       x-kubernetes-list-type: atomic
                     baselineCapabilitySet:
                       description: baselineCapabilitySet selects an initial set of optional capabilities to enable, which can be extended via additionalEnabledCapabilities.  If unset, the cluster will choose a default, and the default may change over time. The current default is vCurrent.
@@ -167,6 +168,7 @@ spec:
                         enum:
                           - openshift-samples
                           - baremetal
+                          - marketplace
                       x-kubernetes-list-type: atomic
                     knownCapabilities:
                       description: knownCapabilities lists all the capabilities known to the current cluster.
@@ -177,6 +179,7 @@ spec:
                         enum:
                           - openshift-samples
                           - baremetal
+                          - marketplace
                       x-kubernetes-list-type: atomic
                 conditionalUpdates:
                   description: conditionalUpdates contains the list of updates that may be recommended for this cluster if it meets specific required conditions. Consumers interested in the set of updates that are actually recommended for this cluster should use availableUpdates. This list may be empty if no updates are recommended, if the update service is unavailable, or if an empty or invalid channel has been specified.
diff --git a/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
index 4ba6c01cf..e9895002f 100644
--- a/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
+++ b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
@@ -6,6 +6,7 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
+    capability.openshift.io/name: "marketplace"
   name: operatorhubs.config.openshift.io
 spec:
   group: config.openshift.io
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
index 95fe8dfd9..e1ecba1cb 100644
--- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
@@ -53,7 +53,7 @@ spec:
                       hostname:
                         description: hostname is the hostname that should be used by the route.
                         type: string
-                        format: hostname
+                        pattern: ^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$|^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$
                       name:
                         description: "name is the logical name of the route to customize. \n The namespace and name of this componentRoute must match a corresponding entry in the list of status.componentRoutes if the route is to be customized."
                         type: string
@@ -226,13 +226,13 @@ spec:
                         type: array
                         minItems: 1
                         items:
-                          description: Hostname is an alias for hostname string validation.
+                          description: "Hostname is an alias for hostname string validation. \n The left operand of the | is the original kubebuilder hostname validation format, which is incorrect because it allows upper case letters, disallows hyphen or number in the TLD, and allows labels to start/end in non-alphanumeric characters.  See https://bugzilla.redhat.com/show_bug.cgi?id=2039256. ^([a-zA-Z0-9\\p{S}\\p{L}]((-?[a-zA-Z0-9\\p{S}\\p{L}]{0,62})?)|([a-zA-Z0-9\\p{S}\\p{L}](([a-zA-Z0-9-\\p{S}\\p{L}]{0,61}[a-zA-Z0-9\\p{S}\\p{L}])?)(\\.)){1,}([a-zA-Z\\p{L}]){2,63})$ \n The right operand of the | is a new pattern that mimics the current API route admission validation on hostname, except that it allows hostnames longer than the maximum length: ^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$ \n Both operand patterns are made available so that modifications on ingress spec can still happen after an invalid hostname was saved via validation by the incorrect left operand of the | operator."
                           type: string
-                          format: hostname
+                          pattern: ^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$|^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$
                       defaultHostname:
                         description: defaultHostname is the hostname of this route prior to customization.
                         type: string
-                        format: hostname
+                        pattern: ^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$|^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$
                       name:
                         description: "name is the logical name of the route to customize. It does not have to be the actual name of a route resource but it cannot be renamed. \n The namespace and name of this componentRoute must match a corresponding entry in the list of spec.componentRoutes if the route is to be customized."
                         type: string
diff --git a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
index cd907699f..52248a68e 100644
--- a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
+++ b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
@@ -225,7 +225,7 @@ type UpdateHistory struct {
 type ClusterID string
 
 // ClusterVersionCapability enumerates optional, core cluster components.
-// +kubebuilder:validation:Enum=openshift-samples;baremetal
+// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace
 type ClusterVersionCapability string
 
 const (
@@ -240,6 +240,11 @@ const (
 	// baremetal operator which is responsible for running the metal3
 	// deployment.
 	ClusterVersionCapabilityBaremetal ClusterVersionCapability = "baremetal"
+
+	// ClusterVersionCapabilityMarketplace manages the Marketplace operator which
+	// supplies Operator Lifecycle Manager (OLM) users with default catalogs of
+	// "optional" operators.
+	ClusterVersionCapabilityMarketplace ClusterVersionCapability = "marketplace"
 )
 
 // ClusterVersionCapabilitySet defines sets of cluster version capabilities.
@@ -269,10 +274,12 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers
 	ClusterVersionCapabilitySet4_11: {
 		ClusterVersionCapabilityOpenShiftSamples,
 		ClusterVersionCapabilityBaremetal,
+		ClusterVersionCapabilityMarketplace,
 	},
 	ClusterVersionCapabilitySetCurrent: {
 		ClusterVersionCapabilityOpenShiftSamples,
 		ClusterVersionCapabilityBaremetal,
+		ClusterVersionCapabilityMarketplace,
 	},
 }
 
diff --git a/vendor/github.com/openshift/api/config/v1/types_ingress.go b/vendor/github.com/openshift/api/config/v1/types_ingress.go
index 2c6bed3cb..9ca88efd7 100644
--- a/vendor/github.com/openshift/api/config/v1/types_ingress.go
+++ b/vendor/github.com/openshift/api/config/v1/types_ingress.go
@@ -91,7 +91,20 @@ type IngressSpec struct {
 type ConsumingUser string
 
 // Hostname is an alias for hostname string validation.
-// +kubebuilder:validation:Format=hostname
+//
+// The left operand of the | is the original kubebuilder hostname validation format, which is incorrect because it
+// allows upper case letters, disallows hyphen or number in the TLD, and allows labels to start/end in non-alphanumeric
+// characters.  See https://bugzilla.redhat.com/show_bug.cgi?id=2039256.
+// ^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$
+//
+// The right operand of the | is a new pattern that mimics the current API route admission validation on hostname,
+// except that it allows hostnames longer than the maximum length:
+// ^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$
+//
+// Both operand patterns are made available so that modifications on ingress spec can still happen after an invalid hostname
+// was saved via validation by the incorrect left operand of the | operator.
+//
+// +kubebuilder:validation:Pattern=`^([a-zA-Z0-9\p{S}\p{L}]((-?[a-zA-Z0-9\p{S}\p{L}]{0,62})?)|([a-zA-Z0-9\p{S}\p{L}](([a-zA-Z0-9-\p{S}\p{L}]{0,61}[a-zA-Z0-9\p{S}\p{L}])?)(\.)){1,}([a-zA-Z\p{L}]){2,63})$|^(([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})[\.]){0,}([a-z0-9][-a-z0-9]{0,61}[a-z0-9]|[a-z0-9]{1,63})$`
 type Hostname string
 
 type IngressStatus struct {
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/types_awsprovider.go b/vendor/github.com/openshift/api/machine/v1beta1/types_awsprovider.go
index 7d789f698..75c81f37f 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/types_awsprovider.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/types_awsprovider.go
@@ -296,25 +296,5 @@ type AWSMachineProviderStatus struct {
 	// Conditions is a set of conditions associated with the Machine to indicate
 	// errors or other status
 	// +optional
-	Conditions []AWSMachineProviderCondition `json:"conditions,omitempty"`
-}
-
-// AWSMachineProviderCondition is a condition in a AWSMachineProviderStatus.
-type AWSMachineProviderCondition struct {
-	// Type is the type of the condition.
-	Type ConditionType `json:"type"`
-	// Status is the status of the condition.
-	Status corev1.ConditionStatus `json:"status"`
-	// LastProbeTime is the last time we probed the condition.
-	// +optional
-	LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
-	// LastTransitionTime is the last time the condition transitioned from one status to another.
-	// +optional
-	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
-	// Reason is a unique, one-word, CamelCase reason for the condition's last transition.
-	// +optional
-	Reason string `json:"reason,omitempty"`
-	// Message is a human-readable message indicating details about last transition.
-	// +optional
-	Message string `json:"message,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/types_azureprovider.go b/vendor/github.com/openshift/api/machine/v1beta1/types_azureprovider.go
index 45e408d91..914e73478 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/types_azureprovider.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/types_azureprovider.go
@@ -143,7 +143,7 @@ type AzureMachineProviderStatus struct {
 	// Conditions is a set of conditions associated with the Machine to indicate
 	// errors or other status.
 	// +optional
-	Conditions []AzureMachineProviderCondition `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // VMState describes the state of an Azure virtual machine.
@@ -282,8 +282,26 @@ type DataDisk struct {
 	// +optional
 	// +kubebuilder:validation:Enum=None;ReadOnly;ReadWrite
 	CachingType CachingTypeOption `json:"cachingType,omitempty"`
+	// DeletionPolicy specifies the data disk deletion policy upon Machine deletion.
+	// Possible values are "Delete","Detach".
+	// When "Delete" is used the data disk is deleted when the Machine is deleted.
+	// When "Detach" is used the data disk is detached from the Machine and retained when the Machine is deleted.
+	// +kubebuilder:validation:Enum=Delete;Detach
+	// +kubebuilder:validation:Required
+	DeletionPolicy DiskDeletionPolicyType `json:"deletionPolicy"`
 }
 
+// DiskDeletionPolicyType defines the possible values for DeletionPolicy.
+type DiskDeletionPolicyType string
+
+// These are the valid DiskDeletionPolicyType values.
+const (
+	// DiskDeletionPolicyTypeDelete means the DiskDeletionPolicyType is "Delete".
+	DiskDeletionPolicyTypeDelete DiskDeletionPolicyType = "Delete"
+	// DiskDeletionPolicyTypeDetach means the DiskDeletionPolicyType is "Detach".
+	DiskDeletionPolicyTypeDetach DiskDeletionPolicyType = "Detach"
+)
+
 // CachingTypeOption defines the different values for a CachingType.
 type CachingTypeOption string
 
@@ -364,26 +382,6 @@ type SecurityProfile struct {
 	EncryptionAtHost *bool `json:"encryptionAtHost,omitempty"`
 }
 
-// AzureMachineProviderCondition is a condition in a AzureMachineProviderStatus
-type AzureMachineProviderCondition struct {
-	// Type is the type of the condition.
-	Type ConditionType `json:"type"`
-	// Status is the status of the condition.
-	Status corev1.ConditionStatus `json:"status"`
-	// LastProbeTime is the last time we probed the condition.
-	// +optional
-	LastProbeTime metav1.Time `json:"lastProbeTime"`
-	// LastTransitionTime is the last time the condition transitioned from one status to another.
-	// +optional
-	LastTransitionTime metav1.Time `json:"lastTransitionTime"`
-	// Reason is a unique, one-word, CamelCase reason for the condition's last transition.
-	// +optional
-	Reason string `json:"reason"`
-	// Message is a human-readable message indicating details about last transition.
-	// +optional
-	Message string `json:"message"`
-}
-
 // AzureUltraSSDCapabilityState defines the different states of an UltraSSDCapability
 type AzureUltraSSDCapabilityState string
 
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/types_gcpprovider.go b/vendor/github.com/openshift/api/machine/v1beta1/types_gcpprovider.go
index 4970bd7e2..6daac65eb 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/types_gcpprovider.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/types_gcpprovider.go
@@ -199,25 +199,5 @@ type GCPMachineProviderStatus struct {
 	// Conditions is a set of conditions associated with the Machine to indicate
 	// errors or other status
 	// +optional
-	Conditions []GCPMachineProviderCondition `json:"conditions,omitempty"`
-}
-
-// GCPMachineProviderCondition is a condition in a GCPMachineProviderStatus
-type GCPMachineProviderCondition struct {
-	// Type is the type of the condition.
-	Type ConditionType `json:"type"`
-	// Status is the status of the condition.
-	Status corev1.ConditionStatus `json:"status"`
-	// LastProbeTime is the last time we probed the condition.
-	// +optional
-	LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
-	// LastTransitionTime is the last time the condition transitioned from one status to another.
-	// +optional
-	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
-	// Reason is a unique, one-word, CamelCase reason for the condition's last transition.
-	// +optional
-	Reason string `json:"reason,omitempty"`
-	// Message is a human-readable message indicating details about last transition.
-	// +optional
-	Message string `json:"message,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go b/vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
index 9d28632f8..2cf75675d 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
@@ -114,26 +114,6 @@ type Workspace struct {
 	ResourcePool string `gcfg:"resourcepool-path,omitempty" json:"resourcePool,omitempty"`
 }
 
-// VSphereMachineProviderCondition is a condition in a VSphereMachineProviderStatus.
-type VSphereMachineProviderCondition struct {
-	// Type is the type of the condition.
-	Type ConditionType `json:"type"`
-	// Status is the status of the condition.
-	Status corev1.ConditionStatus `json:"status"`
-	// LastProbeTime is the last time we probed the condition.
-	// +optional
-	LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
-	// LastTransitionTime is the last time the condition transitioned from one status to another.
-	// +optional
-	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
-	// Reason is a unique, one-word, CamelCase reason for the condition's last transition.
-	// +optional
-	Reason string `json:"reason,omitempty"`
-	// Message is a human-readable message indicating details about last transition.
-	// +optional
-	Message string `json:"message,omitempty"`
-}
-
 // VSphereMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field.
 // It contains VSphere-specific status information.
 // Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).
@@ -149,7 +129,7 @@ type VSphereMachineProviderStatus struct {
 	InstanceState *string `json:"instanceState,omitempty"`
 	// Conditions is a set of conditions associated with the Machine to indicate
 	// errors or other status
-	Conditions []VSphereMachineProviderCondition `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 	// TaskRef is a managed object reference to a Task related to the machine.
 	// This value is set automatically at runtime and should not be set or
 	// modified by users.
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.deepcopy.go
index fdabf1112..f9f13cebb 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.deepcopy.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.deepcopy.go
@@ -12,24 +12,6 @@ import (
 	intstr "k8s.io/apimachinery/pkg/util/intstr"
 )
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AWSMachineProviderCondition) DeepCopyInto(out *AWSMachineProviderCondition) {
-	*out = *in
-	in.LastProbeTime.DeepCopyInto(&out.LastProbeTime)
-	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSMachineProviderCondition.
-func (in *AWSMachineProviderCondition) DeepCopy() *AWSMachineProviderCondition {
-	if in == nil {
-		return nil
-	}
-	out := new(AWSMachineProviderCondition)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AWSMachineProviderConfig) DeepCopyInto(out *AWSMachineProviderConfig) {
 	*out = *in
@@ -154,7 +136,7 @@ func (in *AWSMachineProviderStatus) DeepCopyInto(out *AWSMachineProviderStatus)
 	}
 	if in.Conditions != nil {
 		in, out := &in.Conditions, &out.Conditions
-		*out = make([]AWSMachineProviderCondition, len(*in))
+		*out = make([]metav1.Condition, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -205,24 +187,6 @@ func (in *AWSResourceReference) DeepCopy() *AWSResourceReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AzureMachineProviderCondition) DeepCopyInto(out *AzureMachineProviderCondition) {
-	*out = *in
-	in.LastProbeTime.DeepCopyInto(&out.LastProbeTime)
-	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AzureMachineProviderCondition.
-func (in *AzureMachineProviderCondition) DeepCopy() *AzureMachineProviderCondition {
-	if in == nil {
-		return nil
-	}
-	out := new(AzureMachineProviderCondition)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AzureMachineProviderSpec) DeepCopyInto(out *AzureMachineProviderSpec) {
 	*out = *in
@@ -317,7 +281,7 @@ func (in *AzureMachineProviderStatus) DeepCopyInto(out *AzureMachineProviderStat
 	}
 	if in.Conditions != nil {
 		in, out := &in.Conditions, &out.Conditions
-		*out = make([]AzureMachineProviderCondition, len(*in))
+		*out = make([]metav1.Condition, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -624,24 +588,6 @@ func (in *GCPKMSKeyReference) DeepCopy() *GCPKMSKeyReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GCPMachineProviderCondition) DeepCopyInto(out *GCPMachineProviderCondition) {
-	*out = *in
-	in.LastProbeTime.DeepCopyInto(&out.LastProbeTime)
-	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GCPMachineProviderCondition.
-func (in *GCPMachineProviderCondition) DeepCopy() *GCPMachineProviderCondition {
-	if in == nil {
-		return nil
-	}
-	out := new(GCPMachineProviderCondition)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *GCPMachineProviderSpec) DeepCopyInto(out *GCPMachineProviderSpec) {
 	*out = *in
@@ -757,7 +703,7 @@ func (in *GCPMachineProviderStatus) DeepCopyInto(out *GCPMachineProviderStatus)
 	}
 	if in.Conditions != nil {
 		in, out := &in.Conditions, &out.Conditions
-		*out = make([]GCPMachineProviderCondition, len(*in))
+		*out = make([]metav1.Condition, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -1618,24 +1564,6 @@ func (in *UnhealthyCondition) DeepCopy() *UnhealthyCondition {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *VSphereMachineProviderCondition) DeepCopyInto(out *VSphereMachineProviderCondition) {
-	*out = *in
-	in.LastProbeTime.DeepCopyInto(&out.LastProbeTime)
-	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VSphereMachineProviderCondition.
-func (in *VSphereMachineProviderCondition) DeepCopy() *VSphereMachineProviderCondition {
-	if in == nil {
-		return nil
-	}
-	out := new(VSphereMachineProviderCondition)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *VSphereMachineProviderSpec) DeepCopyInto(out *VSphereMachineProviderSpec) {
 	*out = *in
@@ -1694,7 +1622,7 @@ func (in *VSphereMachineProviderStatus) DeepCopyInto(out *VSphereMachineProvider
 	}
 	if in.Conditions != nil {
 		in, out := &in.Conditions, &out.Conditions
-		*out = make([]VSphereMachineProviderCondition, len(*in))
+		*out = make([]metav1.Condition, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
index 8d3a010f0..5016a6999 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
@@ -11,20 +11,6 @@ package v1beta1
 // Those methods can be generated by using hack/update-swagger-docs.sh
 
 // AUTO-GENERATED FUNCTIONS START HERE
-var map_AWSMachineProviderCondition = map[string]string{
-	"":                   "AWSMachineProviderCondition is a condition in a AWSMachineProviderStatus.",
-	"type":               "Type is the type of the condition.",
-	"status":             "Status is the status of the condition.",
-	"lastProbeTime":      "LastProbeTime is the last time we probed the condition.",
-	"lastTransitionTime": "LastTransitionTime is the last time the condition transitioned from one status to another.",
-	"reason":             "Reason is a unique, one-word, CamelCase reason for the condition's last transition.",
-	"message":            "Message is a human-readable message indicating details about last transition.",
-}
-
-func (AWSMachineProviderCondition) SwaggerDoc() map[string]string {
-	return map_AWSMachineProviderCondition
-}
-
 var map_AWSMachineProviderConfig = map[string]string{
 	"":                     "AWSMachineProviderConfig is the Schema for the awsmachineproviderconfigs API Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).",
 	"ami":                  "AMI is the reference to the AMI from which to create the machine instance.",
@@ -164,20 +150,6 @@ func (TagSpecification) SwaggerDoc() map[string]string {
 	return map_TagSpecification
 }
 
-var map_AzureMachineProviderCondition = map[string]string{
-	"":                   "AzureMachineProviderCondition is a condition in a AzureMachineProviderStatus",
-	"type":               "Type is the type of the condition.",
-	"status":             "Status is the status of the condition.",
-	"lastProbeTime":      "LastProbeTime is the last time we probed the condition.",
-	"lastTransitionTime": "LastTransitionTime is the last time the condition transitioned from one status to another.",
-	"reason":             "Reason is a unique, one-word, CamelCase reason for the condition's last transition.",
-	"message":            "Message is a human-readable message indicating details about last transition.",
-}
-
-func (AzureMachineProviderCondition) SwaggerDoc() map[string]string {
-	return map_AzureMachineProviderCondition
-}
-
 var map_AzureMachineProviderSpec = map[string]string{
 	"":                          "AzureMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an Azure virtual machine. It is used by the Azure machine actuator to create a single Machine. Required parameters such as location that are not specified by this configuration, will be defaulted by the actuator. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).",
 	"userDataSecret":            "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance",
@@ -224,12 +196,13 @@ func (AzureMachineProviderStatus) SwaggerDoc() map[string]string {
 }
 
 var map_DataDisk = map[string]string{
-	"":            "DataDisk specifies the parameters that are used to add one or more data disks to the machine. A Data Disk is a managed disk that's attached to a virtual machine to store application data. It differs from an OS Disk as it doesn't come with a pre-installed OS, and it cannot contain the boot volume. It is registered as SCSI drive and labeled with the chosen `lun`. e.g. for `lun: 0` the raw disk device will be available at `/dev/disk/azure/scsi1/lun0`.\n\nAs the Data Disk disk device is attached raw to the virtual machine, it will need to be partitioned, formatted with a filesystem and mounted, in order for it to be usable. This can be done by creating a custom userdata Secret with custom Ignition configuration to achieve the desired initialization. At this stage the previously defined `lun` is to be used as the \"device\" key for referencing the raw disk device to be initialized. Once the custom userdata Secret has been created, it can be referenced in the Machine's `.providerSpec.userDataSecret`. For further guidance and examples, please refer to the official OpenShift docs.",
-	"nameSuffix":  "NameSuffix is the suffix to be appended to the machine name to generate the disk name. Each disk name will be in format <machineName>_<nameSuffix>. NameSuffix name must start and finish with an alphanumeric character and can only contain letters, numbers, underscores, periods or hyphens. The overall disk name must not exceed 80 chars in length.",
-	"diskSizeGB":  "DiskSizeGB is the size in GB to assign to the data disk.",
-	"managedDisk": "ManagedDisk specifies the Managed Disk parameters for the data disk. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is a ManagedDisk with with storageAccountType: \"Premium_LRS\" and diskEncryptionSet.id: \"Default\".",
-	"lun":         "Lun Specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM. This value is also needed for referencing the data disks devices within userdata to perform disk initialization through Ignition (e.g. partition/format/mount). The value must be between 0 and 63.",
-	"cachingType": "CachingType specifies the caching requirements. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is CachingTypeNone.",
+	"":               "DataDisk specifies the parameters that are used to add one or more data disks to the machine. A Data Disk is a managed disk that's attached to a virtual machine to store application data. It differs from an OS Disk as it doesn't come with a pre-installed OS, and it cannot contain the boot volume. It is registered as SCSI drive and labeled with the chosen `lun`. e.g. for `lun: 0` the raw disk device will be available at `/dev/disk/azure/scsi1/lun0`.\n\nAs the Data Disk disk device is attached raw to the virtual machine, it will need to be partitioned, formatted with a filesystem and mounted, in order for it to be usable. This can be done by creating a custom userdata Secret with custom Ignition configuration to achieve the desired initialization. At this stage the previously defined `lun` is to be used as the \"device\" key for referencing the raw disk device to be initialized. Once the custom userdata Secret has been created, it can be referenced in the Machine's `.providerSpec.userDataSecret`. For further guidance and examples, please refer to the official OpenShift docs.",
+	"nameSuffix":     "NameSuffix is the suffix to be appended to the machine name to generate the disk name. Each disk name will be in format <machineName>_<nameSuffix>. NameSuffix name must start and finish with an alphanumeric character and can only contain letters, numbers, underscores, periods or hyphens. The overall disk name must not exceed 80 chars in length.",
+	"diskSizeGB":     "DiskSizeGB is the size in GB to assign to the data disk.",
+	"managedDisk":    "ManagedDisk specifies the Managed Disk parameters for the data disk. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is a ManagedDisk with with storageAccountType: \"Premium_LRS\" and diskEncryptionSet.id: \"Default\".",
+	"lun":            "Lun Specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM. This value is also needed for referencing the data disks devices within userdata to perform disk initialization through Ignition (e.g. partition/format/mount). The value must be between 0 and 63.",
+	"cachingType":    "CachingType specifies the caching requirements. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is CachingTypeNone.",
+	"deletionPolicy": "DeletionPolicy specifies the data disk deletion policy upon Machine deletion. Possible values are \"Delete\",\"Detach\". When \"Delete\" is used the data disk is deleted when the Machine is deleted. When \"Detach\" is used the data disk is detached from the Machine and retained when the Machine is deleted.",
 }
 
 func (DataDisk) SwaggerDoc() map[string]string {
@@ -365,20 +338,6 @@ func (GCPKMSKeyReference) SwaggerDoc() map[string]string {
 	return map_GCPKMSKeyReference
 }
 
-var map_GCPMachineProviderCondition = map[string]string{
-	"":                   "GCPMachineProviderCondition is a condition in a GCPMachineProviderStatus",
-	"type":               "Type is the type of the condition.",
-	"status":             "Status is the status of the condition.",
-	"lastProbeTime":      "LastProbeTime is the last time we probed the condition.",
-	"lastTransitionTime": "LastTransitionTime is the last time the condition transitioned from one status to another.",
-	"reason":             "Reason is a unique, one-word, CamelCase reason for the condition's last transition.",
-	"message":            "Message is a human-readable message indicating details about last transition.",
-}
-
-func (GCPMachineProviderCondition) SwaggerDoc() map[string]string {
-	return map_GCPMachineProviderCondition
-}
-
 var map_GCPMachineProviderSpec = map[string]string{
 	"":                   "GCPMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an GCP virtual machine. It is used by the GCP machine actuator to create a single Machine. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).",
 	"userDataSecret":     "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance",
@@ -687,20 +646,6 @@ func (NetworkSpec) SwaggerDoc() map[string]string {
 	return map_NetworkSpec
 }
 
-var map_VSphereMachineProviderCondition = map[string]string{
-	"":                   "VSphereMachineProviderCondition is a condition in a VSphereMachineProviderStatus.",
-	"type":               "Type is the type of the condition.",
-	"status":             "Status is the status of the condition.",
-	"lastProbeTime":      "LastProbeTime is the last time we probed the condition.",
-	"lastTransitionTime": "LastTransitionTime is the last time the condition transitioned from one status to another.",
-	"reason":             "Reason is a unique, one-word, CamelCase reason for the condition's last transition.",
-	"message":            "Message is a human-readable message indicating details about last transition.",
-}
-
-func (VSphereMachineProviderCondition) SwaggerDoc() map[string]string {
-	return map_VSphereMachineProviderCondition
-}
-
 var map_VSphereMachineProviderSpec = map[string]string{
 	"":                  "VSphereMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an VSphere virtual machine. It is used by the vSphere machine actuator to create a single Machine. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).",
 	"userDataSecret":    "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance",
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ae36dfed1..670b247e8 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -253,7 +253,7 @@ github.com/onsi/gomega/matchers/support/goraph/edge
 github.com/onsi/gomega/matchers/support/goraph/node
 github.com/onsi/gomega/matchers/support/goraph/util
 github.com/onsi/gomega/types
-# github.com/openshift/api v0.0.0-20220322000322-9c4998a4d646
+# github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53
 ## explicit; go 1.16
 github.com/openshift/api/config/v1
 github.com/openshift/api/machine/v1