Merge branch 'main' into tt-hase

mercari · Oct 11, 2023 · 063b961 · 063b961
2 parents 67a9504 + f24677d
commit 063b961
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/controllers/tortoise_controller.go b/controllers/tortoise_controller.go
@@ -99,6 +99,11 @@ func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 	}
 
 	defer func() {
+		if tortoise == nil {
+			logger.Error(reterr, "get error during the reconciliation, but cannot record the event because tortoise object is nil", "tortoise", req.NamespacedName)
+			return
+		}
+
 		tortoise = r.TortoiseService.RecordReconciliationFailure(tortoise, reterr, now)
 		_, err = r.TortoiseService.UpdateTortoiseStatus(ctx, tortoise, now, false)
 		if err != nil {

diff --git a/pkg/hpa/service.go b/pkg/hpa/service.go
@@ -72,7 +72,7 @@ func (c *Service) InitializeHPA(ctx context.Context, tortoise *autoscalingv1beta
 		return tortoise, fmt.Errorf("create hpa: %w", err)
 	}
 
-	c.recorder.Event(tortoise, corev1.EventTypeNormal, "HPACreated", fmt.Sprintf("Initialized a HPA %s/%s", tortoise.Namespace, tortoise.Status.Targets.HorizontalPodAutoscaler))
+	c.recorder.Event(tortoise, corev1.EventTypeNormal, "HPACreated", fmt.Sprintf("Initialized a HPA %s/%s for a created tortoise", tortoise.Namespace, tortoise.Status.Targets.HorizontalPodAutoscaler))
 
 	return tortoise, nil
 }
@@ -354,6 +354,8 @@ func (c *Service) UpdateHPASpecFromTortoiseAutoscalingPolicy(ctx context.Context
 		}
 		// No need to edit container resource phase.
 
+		c.recorder.Event(tortoise, corev1.EventTypeNormal, "HPADeleted", fmt.Sprintf("Deleted a HPA %s/%s because tortoise has no resource to scale horizontally", tortoise.Namespace, tortoise.Status.Targets.HorizontalPodAutoscaler))
+
 		return tortoise, nil
 	}
 
@@ -368,11 +370,18 @@ func (c *Service) UpdateHPASpecFromTortoiseAutoscalingPolicy(ctx context.Context
 			if err != nil {
 				return tortoise, fmt.Errorf("initialize hpa: %w", err)
 			}
+
+			c.recorder.Event(tortoise, corev1.EventTypeNormal, "HPACreated", fmt.Sprintf("Initialized a HPA %s/%s because tortoise has resource to scale horizontally", tortoise.Namespace, tortoise.Status.Targets.HorizontalPodAutoscaler))
 			return tortoise, nil
 		}
 		return tortoise, fmt.Errorf("failed to get hpa on tortoise: %w", err)
 	}
 
+	// make sure it's managed by tortoise
+	if v, ok := hpa.Annotations[annotation.ManagedByTortoiseAnnotation]; !ok || v != "true" {
+		return tortoise, fmt.Errorf("the HPA %s/%s is specified in tortoise, but not managed by tortoise", hpa.Namespace, hpa.Name)
+	}
+
 	var newhpa *v2.HorizontalPodAutoscaler
 	var isHpaEdited bool
 	newhpa, tortoise, isHpaEdited = c.addHPAMetricsFromTortoiseAutoscalingPolicy(ctx, tortoise, hpa, now)
@@ -396,6 +405,8 @@ func (c *Service) UpdateHPASpecFromTortoiseAutoscalingPolicy(ctx context.Context
 		return tortoise, err
 	}
 
+	c.recorder.Event(tortoise, corev1.EventTypeNormal, "HPAUpdated", fmt.Sprintf("Updated a HPA %s/%s because the autoscaling policy is changed in the tortoise", tortoise.Namespace, tortoise.Status.Targets.HorizontalPodAutoscaler))
+
 	return tortoise, nil
 }
 

diff --git a/pkg/hpa/service_test.go b/pkg/hpa/service_test.go
@@ -1179,9 +1179,11 @@ func TestService_UpdateHPASpecFromTortoiseAutoscalingPolicy(t *testing.T) {
 			},
 			initialHPA: &v2.HorizontalPodAutoscaler{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:        "hpa",
-					Namespace:   "default",
-					Annotations: map[string]string{},
+					Name:      "hpa",
+					Namespace: "default",
+					Annotations: map[string]string{
+						annotation.ManagedByTortoiseAnnotation: "true",
+					},
 				},
 				Spec: v2.HorizontalPodAutoscalerSpec{
 					MinReplicas: ptrInt32(1),
@@ -1281,6 +1283,9 @@ func TestService_UpdateHPASpecFromTortoiseAutoscalingPolicy(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "hpa",
 					Namespace: "default",
+					Annotations: map[string]string{
+						annotation.ManagedByTortoiseAnnotation: "true",
+					},
 				},
 				Spec: v2.HorizontalPodAutoscalerSpec{
 					MinReplicas: ptrInt32(1),
@@ -1415,9 +1420,11 @@ func TestService_UpdateHPASpecFromTortoiseAutoscalingPolicy(t *testing.T) {
 			},
 			initialHPA: &v2.HorizontalPodAutoscaler{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:        "hpa",
-					Namespace:   "default",
-					Annotations: map[string]string{},
+					Name:      "hpa",
+					Namespace: "default",
+					Annotations: map[string]string{
+						annotation.ManagedByTortoiseAnnotation: "true",
+					},
 				},
 				Spec: v2.HorizontalPodAutoscalerSpec{
 					MinReplicas: ptrInt32(1),
@@ -1528,6 +1535,9 @@ func TestService_UpdateHPASpecFromTortoiseAutoscalingPolicy(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "hpa",
 					Namespace: "default",
+					Annotations: map[string]string{
+						annotation.ManagedByTortoiseAnnotation: "true",
+					},
 				},
 				Spec: v2.HorizontalPodAutoscalerSpec{
 					MinReplicas: ptrInt32(1),