util/deprecated: use deprecated packages for paused

Author: chrischdi

util/deprecated/v1beta1/paused/paused.go

@@ -28,10 +28,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/annotations"
-	v1beta2conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
-	"sigs.k8s.io/cluster-api/util/patch"
+	v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2"
+	"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
 )
 
 // ConditionSetter combines the client.Object and Setter interface.
@@ -41,9 +41,9 @@ type ConditionSetter interface {
 }
 
 // EnsurePausedCondition sets the paused condition on the object and returns if it should be considered as paused.
-func EnsurePausedCondition(ctx context.Context, c client.Client, cluster *clusterv1.Cluster, obj ConditionSetter) (isPaused bool, requeue bool, err error) {
-	oldCondition := v1beta2conditions.Get(obj, clusterv1.PausedV1Beta2Condition)
-	newCondition := pausedCondition(c.Scheme(), cluster, obj, clusterv1.PausedV1Beta2Condition)
+func EnsurePausedCondition(ctx context.Context, c client.Client, cluster *clusterv1beta1.Cluster, obj ConditionSetter) (isPaused bool, requeue bool, err error) {
+	oldCondition := v1beta2conditions.Get(obj, clusterv1beta1.PausedV1Beta2Condition)
+	newCondition := pausedCondition(c.Scheme(), cluster, obj, clusterv1beta1.PausedV1Beta2Condition)
 
 	isPaused = newCondition.Status == metav1.ConditionTrue
 	pausedStatusChanged := oldCondition == nil || oldCondition.Status != newCondition.Status
@@ -81,7 +81,7 @@ func EnsurePausedCondition(ctx context.Context, c client.Client, cluster *cluste
 	v1beta2conditions.Set(obj, newCondition)
 
 	if err := patchHelper.Patch(ctx, obj, patch.WithOwnedV1Beta2Conditions{Conditions: []string{
-		clusterv1.PausedV1Beta2Condition,
+		clusterv1beta1.PausedV1Beta2Condition,
 	}}); err != nil {
 		return isPaused, false, err
 	}
@@ -90,7 +90,7 @@ func EnsurePausedCondition(ctx context.Context, c client.Client, cluster *cluste
 }
 
 // pausedCondition sets the paused condition on the object and returns if it should be considered as paused.
-func pausedCondition(scheme *runtime.Scheme, cluster *clusterv1.Cluster, obj ConditionSetter, targetConditionType string) metav1.Condition {
+func pausedCondition(scheme *runtime.Scheme, cluster *clusterv1beta1.Cluster, obj ConditionSetter, targetConditionType string) metav1.Condition {
 	if (cluster != nil && cluster.Spec.Paused) || annotations.HasPaused(obj) {
 		var messages []string
 		if cluster != nil && cluster.Spec.Paused {
@@ -107,7 +107,7 @@ func pausedCondition(scheme *runtime.Scheme, cluster *clusterv1.Cluster, obj Con
 		return metav1.Condition{
 			Type:               targetConditionType,
 			Status:             metav1.ConditionTrue,
-			Reason:             clusterv1.PausedV1Beta2Reason,
+			Reason:             clusterv1beta1.PausedV1Beta2Reason,
 			Message:            strings.Join(messages, ", "),
 			ObservedGeneration: obj.GetGeneration(),
 		}
@@ -116,7 +116,7 @@ func pausedCondition(scheme *runtime.Scheme, cluster *clusterv1.Cluster, obj Con
 	return metav1.Condition{
 		Type:               targetConditionType,
 		Status:             metav1.ConditionFalse,
-		Reason:             clusterv1.NotPausedV1Beta2Reason,
+		Reason:             clusterv1beta1.NotPausedV1Beta2Reason,
 		ObservedGeneration: obj.GetGeneration(),
 	}
 }

util/deprecated/v1beta1/paused/paused_test.go

@@ -27,20 +27,20 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	v1beta2conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
-	"sigs.k8s.io/cluster-api/util/test/builder"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2"
+	"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/test/builder"
 )
 
 func TestEnsurePausedCondition(t *testing.T) {
 	g := NewWithT(t)
 
 	scheme := runtime.NewScheme()
 	g.Expect(builder.AddTransitionV1Beta2ToScheme(scheme)).To(Succeed())
-	g.Expect(clusterv1.AddToScheme(scheme)).To(Succeed())
+	g.Expect(clusterv1beta1.AddToScheme(scheme)).To(Succeed())
 
 	// Cluster Case 1: unpaused
-	normalCluster := &clusterv1.Cluster{
+	normalCluster := &clusterv1beta1.Cluster{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "some-cluster",
 			Namespace: "default",
@@ -60,11 +60,11 @@ func TestEnsurePausedCondition(t *testing.T) {
 
 	// Object case 2: paused
 	pausedObj := obj.DeepCopy()
-	pausedObj.SetAnnotations(map[string]string{clusterv1.PausedAnnotation: ""})
+	pausedObj.SetAnnotations(map[string]string{clusterv1beta1.PausedAnnotation: ""})
 
 	tests := []struct {
 		name                             string
-		cluster                          *clusterv1.Cluster
+		cluster                          *clusterv1beta1.Cluster
 		object                           ConditionSetter
 		wantIsPaused                     bool
 		wantRequeueAfterGenerationChange bool
@@ -103,7 +103,7 @@ func TestEnsurePausedCondition(t *testing.T) {
 			g := NewWithT(t)
 			ctx := context.Background()
 
-			c := fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(&clusterv1.Cluster{}, &builder.Phase1Obj{}).
+			c := fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(&clusterv1beta1.Cluster{}, &builder.Phase1Obj{}).
 				WithObjects(tt.object, tt.cluster).Build()
 
 			g.Expect(c.Get(ctx, client.ObjectKeyFromObject(tt.object), tt.object)).To(Succeed())
@@ -135,15 +135,15 @@ func TestEnsurePausedCondition(t *testing.T) {
 }
 
 func assertCondition(g Gomega, object ConditionSetter, wantIsPaused bool) {
-	condition := v1beta2conditions.Get(object, clusterv1.PausedV1Beta2Condition)
+	condition := v1beta2conditions.Get(object, clusterv1beta1.PausedV1Beta2Condition)
 	g.Expect(condition.ObservedGeneration).To(Equal(object.GetGeneration()))
 	if wantIsPaused {
 		g.Expect(condition.Status).To(Equal(metav1.ConditionTrue))
-		g.Expect(condition.Reason).To(Equal(clusterv1.PausedV1Beta2Reason))
+		g.Expect(condition.Reason).To(Equal(clusterv1beta1.PausedV1Beta2Reason))
 		g.Expect(condition.Message).ToNot(BeEmpty())
 	} else {
 		g.Expect(condition.Status).To(Equal(metav1.ConditionFalse))
-		g.Expect(condition.Reason).To(Equal(clusterv1.NotPausedV1Beta2Reason))
+		g.Expect(condition.Reason).To(Equal(clusterv1beta1.NotPausedV1Beta2Reason))
 		g.Expect(condition.Message).To(BeEmpty())
 	}
 }