Merge pull request #12393 from sivchari/v1beta2-rename-conditions

⚠️  conditions: add V1Beta1 suffix and remove V1Beta2 suffix from condition types and reasons in CAPD v1beta2 packages

Author: k8s-ci-robot

test/infrastructure/docker/api/v1beta2/devcluster_types.go

@@ -29,44 +29,44 @@ const (
 	ListenerAnnotationName = "inmemorycluster.infrastructure.cluster.x-k8s.io/listener"
 )
 
-// DevCluster's v1Beta2 conditions that apply to all the supported backends.
+// DevCluster's conditions that apply to all the supported backends.
 
-// DevCluster's Ready condition and corresponding reasons that will be used in v1Beta2 API version.
+// DevCluster's Ready condition and corresponding reasons.
 const (
-	// DevClusterReadyV1Beta2Condition is true if
+	// DevClusterReadyCondition is true if
 	// - The DevCluster's is using a docker backend and LoadBalancerAvailable is true.
-	DevClusterReadyV1Beta2Condition = clusterv1.ReadyCondition
+	DevClusterReadyCondition = clusterv1.ReadyCondition
 
-	// DevClusterReadyV1Beta2Reason surfaces when the DevCluster readiness criteria is met.
-	DevClusterReadyV1Beta2Reason = clusterv1.ReadyReason
+	// DevClusterReadyReason surfaces when the DevCluster readiness criteria is met.
+	DevClusterReadyReason = clusterv1.ReadyReason
 
-	// DevClusterNotReadyV1Beta2Reason surfaces when the DevCluster readiness criteria is not met.
-	DevClusterNotReadyV1Beta2Reason = clusterv1.NotReadyReason
+	// DevClusterNotReadyReason surfaces when the DevCluster readiness criteria is not met.
+	DevClusterNotReadyReason = clusterv1.NotReadyReason
 
-	// DevClusterReadyUnknownV1Beta2Reason surfaces when at least one DevCluster readiness criteria is unknown
+	// DevClusterReadyUnknownReason surfaces when at least one DevCluster readiness criteria is unknown
 	// and no DevCluster readiness criteria is not met.
-	DevClusterReadyUnknownV1Beta2Reason = clusterv1.ReadyUnknownReason
+	DevClusterReadyUnknownReason = clusterv1.ReadyUnknownReason
 )
 
-// DevCluster's v1Beta2 conditions that apply to the docker backend.
+// DevCluster's conditions that apply to the docker backend.
 
-// LoadBalancerAvailable condition and corresponding reasons that will be used in v1Beta2 API version for a DevCluster's docker backend.
+// LoadBalancerAvailable condition and corresponding reasons for a DevCluster's docker backend.
 const (
-	// DevClusterDockerLoadBalancerAvailableV1Beta2Condition documents the availability of the container that implements
+	// DevClusterDockerLoadBalancerAvailableCondition documents the availability of the container that implements
 	// the load balancer for a DevCluster's docker backend..
-	DevClusterDockerLoadBalancerAvailableV1Beta2Condition string = "LoadBalancerAvailable"
+	DevClusterDockerLoadBalancerAvailableCondition string = "LoadBalancerAvailable"
 
-	// DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason surfaces when the container that implements
+	// DevClusterDockerLoadBalancerNotAvailableReason surfaces when the container that implements
 	// the load balancer for a DevCluster's docker backend is not available.
-	DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason = clusterv1.NotAvailableReason
+	DevClusterDockerLoadBalancerNotAvailableReason = clusterv1.NotAvailableReason
 
-	// DevClusterDockerLoadBalancerAvailableV1Beta2Reason surfaces when the container that implements
+	// DevClusterDockerLoadBalancerAvailableReason surfaces when the container that implements
 	// the load balancer for a DevCluster's docker backend is available.
-	DevClusterDockerLoadBalancerAvailableV1Beta2Reason = clusterv1.AvailableReason
+	DevClusterDockerLoadBalancerAvailableReason = clusterv1.AvailableReason
 
-	// DevClusterDockerLoadBalancerDeletingV1Beta2Reason surfaces when the container that implements
+	// DevClusterDockerLoadBalancerDeletingReason surfaces when the container that implements
 	// the load balancer for a DevCluster's docker backend is deleting.
-	DevClusterDockerLoadBalancerDeletingV1Beta2Reason = clusterv1.DeletingReason
+	DevClusterDockerLoadBalancerDeletingReason = clusterv1.DeletingReason
 )
 
 // DevClusterSpec defines the desired state of the DevCluster infrastructure.

test/infrastructure/docker/api/v1beta2/devmachine_types.go

@@ -23,65 +23,65 @@ import (
 // Conditions and condition Reasons for the DockerMachine object.
 
 const (
-	// ContainerProvisionedCondition documents the status of the provisioning of the container
+	// ContainerProvisionedV1Beta1Condition documents the status of the provisioning of the container
 	// generated by a DockerMachine.
 	//
 	// NOTE: When the container provisioning starts the process completes almost immediately and within
 	// the same reconciliation, so the user will always see a transition from Wait to Provisioned without
 	// having evidence that the operation is started/is in progress.
-	ContainerProvisionedCondition clusterv1.ConditionType = "ContainerProvisioned"
+	ContainerProvisionedV1Beta1Condition clusterv1.ConditionType = "ContainerProvisioned"
 
-	// WaitingForClusterInfrastructureReason (Severity=Info) documents a DockerMachine waiting for the cluster
+	// WaitingForClusterInfrastructureV1Beta1Reason (Severity=Info) documents a DockerMachine waiting for the cluster
 	// infrastructure to be ready before starting to create the container that provides the DockerMachine
 	// infrastructure.
-	WaitingForClusterInfrastructureReason = "WaitingForClusterInfrastructure"
+	WaitingForClusterInfrastructureV1Beta1Reason = "WaitingForClusterInfrastructure"
 
-	// WaitingForBootstrapDataReason (Severity=Info) documents a DockerMachine waiting for the bootstrap
+	// WaitingForBootstrapDataV1Beta1Reason (Severity=Info) documents a DockerMachine waiting for the bootstrap
 	// script to be ready before starting to create the container that provides the DockerMachine infrastructure.
-	WaitingForBootstrapDataReason = "WaitingForBootstrapData"
+	WaitingForBootstrapDataV1Beta1Reason = "WaitingForBootstrapData"
 
-	// ContainerProvisioningFailedReason (Severity=Warning) documents a DockerMachine controller detecting
+	// ContainerProvisioningFailedV1Beta1Reason (Severity=Warning) documents a DockerMachine controller detecting
 	// an error while provisioning the container that provides the DockerMachine infrastructure; those kind of
 	// errors are usually transient and failed provisioning are automatically re-tried by the controller.
-	ContainerProvisioningFailedReason = "ContainerProvisioningFailed"
+	ContainerProvisioningFailedV1Beta1Reason = "ContainerProvisioningFailed"
 
-	// ContainerDeletedReason (Severity=Error) documents a DockerMachine controller detecting
+	// ContainerDeletedV1Beta1Reason (Severity=Error) documents a DockerMachine controller detecting
 	// the underlying container has been deleted unexpectedly.
-	ContainerDeletedReason = "ContainerDeleted"
+	ContainerDeletedV1Beta1Reason = "ContainerDeleted"
 )
 
 const (
-	// BootstrapExecSucceededCondition provides an observation of the DockerMachine bootstrap process.
+	// BootstrapExecSucceededV1Beta1Condition provides an observation of the DockerMachine bootstrap process.
 	// 	It is set based on successful execution of bootstrap commands and on the existence of
 	//	the /run/cluster-api/bootstrap-success.complete file.
 	// The condition gets generated after ContainerProvisionedCondition is True.
 	//
 	// NOTE as a difference from other providers, container provisioning and bootstrap are directly managed
 	// by the DockerMachine controller (not by cloud-init).
-	BootstrapExecSucceededCondition clusterv1.ConditionType = "BootstrapExecSucceeded"
+	BootstrapExecSucceededV1Beta1Condition clusterv1.ConditionType = "BootstrapExecSucceeded"
 
-	// BootstrappingReason documents (Severity=Info) a DockerMachine currently executing the bootstrap
+	// BootstrappingV1Beta1Reason documents (Severity=Info) a DockerMachine currently executing the bootstrap
 	// script that creates the Kubernetes node on the newly provisioned machine infrastructure.
-	BootstrappingReason = "Bootstrapping"
+	BootstrappingV1Beta1Reason = "Bootstrapping"
 
-	// BootstrapFailedReason documents (Severity=Warning) a DockerMachine controller detecting an error while
+	// BootstrapFailedV1Beta1Reason documents (Severity=Warning) a DockerMachine controller detecting an error while
 	// bootstrapping the Kubernetes node on the machine just provisioned; those kind of errors are usually
 	// transient and failed bootstrap are automatically re-tried by the controller.
-	BootstrapFailedReason = "BootstrapFailed"
+	BootstrapFailedV1Beta1Reason = "BootstrapFailed"
 )
 
 // Conditions and condition Reasons for the DockerCluster object.
 
 const (
-	// LoadBalancerAvailableCondition documents the availability of the container that implements the cluster load balancer.
+	// LoadBalancerAvailableV1Beta1Condition documents the availability of the container that implements the cluster load balancer.
 	//
 	// NOTE: When the load balancer provisioning starts the process completes almost immediately and within
 	// the same reconciliation, so the user will always see a transition from no condition to available without
 	// having evidence that the operation is started/is in progress.
-	LoadBalancerAvailableCondition clusterv1.ConditionType = "LoadBalancerAvailable"
+	LoadBalancerAvailableV1Beta1Condition clusterv1.ConditionType = "LoadBalancerAvailable"
 
-	// LoadBalancerProvisioningFailedReason (Severity=Warning) documents a DockerCluster controller detecting
+	// LoadBalancerProvisioningFailedV1Beta1Reason (Severity=Warning) documents a DockerCluster controller detecting
 	// an error while provisioning the container that provides the cluster load balancer.; those kind of
 	// errors are usually transient and failed provisioning are automatically re-tried by the controller.
-	LoadBalancerProvisioningFailedReason = "LoadBalancerProvisioningFailed"
+	LoadBalancerProvisioningFailedV1Beta1Reason = "LoadBalancerProvisioningFailed"
 )