Fix tests

Signed-off-by: d-kuro <[email protected]>
cybozu-go · Oct 25, 2023 · 22ca4f7 · 22ca4f7
1 parent 2450ca4
commit 22ca4f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/cmd/kubectl-moco/cmd/stop.go b/cmd/kubectl-moco/cmd/stop.go
@@ -45,6 +45,9 @@ func stopClustering(ctx context.Context, name string) error {
 
  orig := cluster.DeepCopy()
 
+ if cluster.Annotations == nil {
+ cluster.Annotations = make(map[string]string)
+ }
  cluster.Annotations[constants.AnnClusteringStopped] = "true"
 
  if equality.Semantic.DeepEqual(orig, cluster) {
@@ -79,6 +82,9 @@ func stopReconciliation(ctx context.Context, name string) error {
 
  orig := cluster.DeepCopy()
 
+ if cluster.Annotations == nil {
+ cluster.Annotations = make(map[string]string)
+ }
  cluster.Annotations[constants.AnnReconciliationStopped] = "true"
 
  if equality.Semantic.DeepEqual(orig, cluster) {

diff --git a/controllers/mysqlcluster_controller_test.go b/controllers/mysqlcluster_controller_test.go
@@ -1929,6 +1929,9 @@ var _ = Describe("MySQLCluster reconciler", func() {
  Expect(err).NotTo(HaveOccurred())
 
  By("setting reconcile stop annotation")
+ if cluster.Annotations == nil {
+ cluster.Annotations = map[string]string{}
+ }
  cluster.Annotations[constants.AnnReconciliationStopped] = "true"
  err = k8sClient.Update(ctx, cluster)
  Expect(err).NotTo(HaveOccurred())
@@ -1956,6 +1959,9 @@ var _ = Describe("MySQLCluster reconciler", func() {
  Expect(err).NotTo(HaveOccurred())
 
  By("setting clustering stop annotation")
+ if cluster.Annotations == nil {
+ cluster.Annotations = map[string]string{}
+ }
  cluster.Annotations[constants.AnnClusteringStopped] = "true"
  err = k8sClient.Update(ctx, cluster)
  Expect(err).NotTo(HaveOccurred())
@@ -1966,7 +1972,7 @@ var _ = Describe("MySQLCluster reconciler", func() {
  if err = k8sClient.Get(ctx, client.ObjectKey{Namespace: "test", Name: "test"}, cluster); err != nil {
  return err
  }
- cond := meta.FindStatusCondition(cluster.Status.Conditions, mocov1beta2.ConditionReconciliationActive)
+ cond := meta.FindStatusCondition(cluster.Status.Conditions, mocov1beta2.ConditionClusteringActive)
  if cond == nil {
  return fmt.Errorf("condition does not exists")
  }