From c2723bb5c883314fc5816d0b240bf05eef5baf1c Mon Sep 17 00:00:00 2001 From: YZ775 Date: Wed, 26 Jul 2023 03:55:52 +0000 Subject: [PATCH] rename Signed-off-by: YZ775 --- api/v1beta1/mysqlcluster_types.go | 2 +- api/v1beta2/mysqlcluster_types.go | 2 +- controllers/mysqlcluster_controller.go | 6 ++-- controllers/mysqlcluster_controller_test.go | 36 ++++++++++----------- e2e/upgrade_test.go | 6 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/api/v1beta1/mysqlcluster_types.go b/api/v1beta1/mysqlcluster_types.go index a6fb6a5b1..e64897ed3 100644 --- a/api/v1beta1/mysqlcluster_types.go +++ b/api/v1beta1/mysqlcluster_types.go @@ -291,7 +291,7 @@ const ( ConditionInitialized string = "Initialized" ConditionAvailable string = "Available" ConditionHealthy string = "Healthy" - ConditionUpdated string = "Updated" + ConditionUpToDate string = "UpToDate" ) // BackupStatus represents the status of the last successful backup. diff --git a/api/v1beta2/mysqlcluster_types.go b/api/v1beta2/mysqlcluster_types.go index 308eed963..198ae5a13 100644 --- a/api/v1beta2/mysqlcluster_types.go +++ b/api/v1beta2/mysqlcluster_types.go @@ -605,7 +605,7 @@ const ( ConditionInitialized string = "Initialized" ConditionAvailable string = "Available" ConditionHealthy string = "Healthy" - ConditionUpdated string = "Updated" + ConditionUpToDate string = "UpToDate" ) // BackupStatus represents the status of the last successful backup. diff --git a/controllers/mysqlcluster_controller.go b/controllers/mysqlcluster_controller.go index e2cc94633..539462b34 100644 --- a/controllers/mysqlcluster_controller.go +++ b/controllers/mysqlcluster_controller.go @@ -1879,14 +1879,14 @@ func (r *MySQLClusterReconciler) UpdateStatus(ctx context.Context, req ctrl.Requ cluster.Status.ReconcileInfo.ReconcileVersion = 1 needUpdate = true } - conditionUpdated := meta.FindStatusCondition(cluster.Status.Conditions, mocov1beta2.ConditionUpdated) + ConditionUpToDate := meta.FindStatusCondition(cluster.Status.Conditions, mocov1beta2.ConditionUpToDate) // if current status and new status are different, update status - if conditionUpdated == nil || conditionUpdated.Status != updated { + if ConditionUpToDate == nil || ConditionUpToDate.Status != updated { needUpdate = true } if needUpdate { cond := metav1.Condition{ - Type: mocov1beta2.ConditionUpdated, + Type: mocov1beta2.ConditionUpToDate, Status: updated, Reason: reason, Message: "the current state is " + reason, diff --git a/controllers/mysqlcluster_controller_test.go b/controllers/mysqlcluster_controller_test.go index f25568c4c..0b76cc7b7 100644 --- a/controllers/mysqlcluster_controller_test.go +++ b/controllers/mysqlcluster_controller_test.go @@ -1614,7 +1614,7 @@ var _ = Describe("MySQLCluster reconciler", func() { }).Should(Succeed()) }) - It("should sets ConditionUpdated to be true when StatefulSet is ready", func() { + It("should sets ConditionUpToDate to be true when StatefulSet is ready", func() { cluster := testNewMySQLCluster("test") err := k8sClient.Create(ctx, cluster) Expect(err).NotTo(HaveOccurred()) @@ -1646,18 +1646,18 @@ var _ = Describe("MySQLCluster reconciler", func() { if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster2); err != nil { return err } - conditionUpdated := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpdated) - if conditionUpdated == nil { + ConditionUpToDate := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpToDate) + if ConditionUpToDate == nil { return fmt.Errorf("not yet updated") } - if conditionUpdated.Status != metav1.ConditionTrue { + if ConditionUpToDate.Status != metav1.ConditionTrue { return fmt.Errorf("not yet updated") } return nil }).Should(Succeed()) }) - It("should not sets ConditionUpdated to be true when StatefulSet is not ready", func() { + It("should not sets ConditionUpToDate to be true when StatefulSet is not ready", func() { cluster := testNewMySQLCluster("test") err := k8sClient.Create(ctx, cluster) Expect(err).NotTo(HaveOccurred()) @@ -1689,11 +1689,11 @@ var _ = Describe("MySQLCluster reconciler", func() { if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster2); err != nil { return err } - conditionUpdated := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpdated) - if conditionUpdated == nil { + ConditionUpToDate := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpToDate) + if ConditionUpToDate == nil { return fmt.Errorf("not yet updated") } - if conditionUpdated.Status != metav1.ConditionTrue { + if ConditionUpToDate.Status != metav1.ConditionTrue { return fmt.Errorf("not yet updated") } return nil @@ -1717,15 +1717,15 @@ var _ = Describe("MySQLCluster reconciler", func() { if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster2); err != nil { return err } - conditionUpdated := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpdated) - if conditionUpdated == nil { + ConditionUpToDate := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpToDate) + if ConditionUpToDate == nil { return fmt.Errorf("not yet updated") } if err != nil { return err } - if conditionUpdated.Status != metav1.ConditionFalse { - fmt.Printf("condition: %+v\n", conditionUpdated) + if ConditionUpToDate.Status != metav1.ConditionFalse { + fmt.Printf("condition: %+v\n", ConditionUpToDate) return fmt.Errorf("not yet updated") } return nil @@ -1749,11 +1749,11 @@ var _ = Describe("MySQLCluster reconciler", func() { if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster2); err != nil { return err } - conditionUpdated := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpdated) - if conditionUpdated == nil { + ConditionUpToDate := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpToDate) + if ConditionUpToDate == nil { return fmt.Errorf("not yet updated") } - if conditionUpdated.Status != metav1.ConditionTrue { + if ConditionUpToDate.Status != metav1.ConditionTrue { return fmt.Errorf("not yet updated") } return nil @@ -1777,11 +1777,11 @@ var _ = Describe("MySQLCluster reconciler", func() { if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster2); err != nil { return err } - conditionUpdated := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpdated) - if conditionUpdated == nil { + ConditionUpToDate := meta.FindStatusCondition(cluster2.Status.Conditions, mocov1beta2.ConditionUpToDate) + if ConditionUpToDate == nil { return fmt.Errorf("not yet updated") } - if conditionUpdated.Status != metav1.ConditionFalse { + if ConditionUpToDate.Status != metav1.ConditionFalse { return fmt.Errorf("not yet updated") } return nil diff --git a/e2e/upgrade_test.go b/e2e/upgrade_test.go index 4fb1887e0..fc3bce7e3 100644 --- a/e2e/upgrade_test.go +++ b/e2e/upgrade_test.go @@ -155,11 +155,11 @@ var _ = Context("upgrade", func() { if err != nil { return err } - conditionUpdated := meta.FindStatusCondition(cluster.Status.Conditions, mocov1beta2.ConditionUpdated) - if conditionUpdated == nil { + ConditionUpToDate := meta.FindStatusCondition(cluster.Status.Conditions, mocov1beta2.ConditionUpToDate) + if ConditionUpToDate == nil { return fmt.Errorf("statefulset is not updated yet") } - if conditionUpdated.Status != metav1.ConditionTrue { + if ConditionUpToDate.Status != metav1.ConditionTrue { return fmt.Errorf("statefulset is not updated yet") } return nil