fix: update observedGeneration when sync failed (#320)

* fix: aci cache v2

* fix: update observedGeneration when sync failed

* fix: update observed generation

Author: ColdsteelRail

.github/workflows/ci.yaml

@@ -30,7 +30,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Cache Go Dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

.github/workflows/e2e.yaml

@@ -28,7 +28,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Cache Go Dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -98,7 +98,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Cache Go Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Cache Go Dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

pkg/controllers/collaset/collaset_controller.go

@@ -221,7 +221,7 @@ func (r *CollaSetReconciler) DoReconcile(
 	resources *collasetutils.RelatedResources) (
 	*time.Duration, *appsv1alpha1.CollaSetStatus, error) {
 	podWrappers, requeueAfter, syncErr := r.doSync(ctx, instance, resources)
-	return requeueAfter, calculateStatus(instance, resources, podWrappers, syncErr), syncErr
+	return requeueAfter, calculateStatus(instance, resources, podWrappers), syncErr
 }
 
 // doSync is responsible for reconcile Pods with CollaSet spec.
@@ -257,12 +257,9 @@ func (r *CollaSetReconciler) doSync(
 func calculateStatus(
 	instance *appsv1alpha1.CollaSet,
 	resources *collasetutils.RelatedResources,
-	podWrappers []*collasetutils.PodWrapper,
-	syncErr error) *appsv1alpha1.CollaSetStatus {
+	podWrappers []*collasetutils.PodWrapper) *appsv1alpha1.CollaSetStatus {
 	newStatus := resources.NewStatus
-	if syncErr == nil {
-		newStatus.ObservedGeneration = instance.Generation
-	}
+	newStatus.ObservedGeneration = instance.Generation
 
 	var scheduledReplicas, readyReplicas, availableReplicas, replicas, updatedReplicas, operatingReplicas,
 		updatedReadyReplicas, updatedAvailableReplicas int32