Merge branch 'main' into flagbug

mercari · Oct 4, 2023 · f69fc5b · f69fc5b
2 parents 3e9d7a4 + f88ebae
commit f69fc5b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= ghcr.io/mercari/tortoise:v0.0.31
+IMG ?= ghcr.io/mercari/tortoise:v0.0.32
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.27.1
 

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/mercari/tortoise
-  newTag: v0.0.31
+  newTag: v0.0.32
diff --git a/controllers/tortoise_controller.go b/controllers/tortoise_controller.go
@@ -69,12 +69,6 @@ type TortoiseReconciler struct {
 //+kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs=get;list;watch;create;update;patch;delete
 
 func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
-	defer func() {
-		if reterr != nil {
-			r.EventRecorder.Event(&autoscalingv1beta1.Tortoise{}, "Warning", "ReconcileError", reterr.Error())
-		}
-	}()
-
 	logger := log.FromContext(ctx)
 	now := time.Now()
 
@@ -89,6 +83,11 @@ func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 		logger.Error(err, "failed to get tortoise", "tortoise", req.NamespacedName)
 		return ctrl.Result{}, err
 	}
+	defer func() {
+		if reterr != nil {
+			r.EventRecorder.Event(tortoise, "Warning", "ReconcileError", reterr.Error())
+		}
+	}()
 
 	if !tortoise.ObjectMeta.DeletionTimestamp.IsZero() {
 		// Tortoise is deleted by user and waiting for finalizer.

diff --git a/manifests/default/apps_v1_deployment_tortoise-controller-manager.yaml b/manifests/default/apps_v1_deployment_tortoise-controller-manager.yaml
@@ -47,7 +47,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: ghcr.io/mercari/tortoise:v0.0.31
+        image: ghcr.io/mercari/tortoise:v0.0.32
         livenessProbe:
           httpGet:
             path: /healthz