Remove HarborProject LastApplyTime to fix reconciliation

Signed-off-by: Christian Löwel <mail@cloewel.de>
goharbor · Aug 18, 2023 · 4a4acfe · 4a4acfe
1 parent 4f460cb
commit 4a4acfe
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 21 deletions.
diff --git a/apis/goharbor.io/v1beta1/harborproject_types.go b/apis/goharbor.io/v1beta1/harborproject_types.go
@@ -137,9 +137,6 @@ type HarborProjectStatus struct {
 	// Message provides human-readable message.
 	// +kubebuilder:validation:Optional
 	Message string `json:"message,omitempty"`
-	// LastApplyTime represents the last apply configuration time.
-	// +kubebuilder:validation:Optional
-	LastApplyTime *metav1.Time `json:"lastApplyTime,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/apis/goharbor.io/v1beta1/zz_generated.deepcopy.go b/apis/goharbor.io/v1beta1/zz_generated.deepcopy.go
diff --git a/controllers/goharbor/project/harborproject.go b/controllers/goharbor/project/harborproject.go
@@ -9,7 +9,6 @@ import (
 	harborClient "github.com/goharbor/harbor-operator/pkg/rest"
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -49,8 +48,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.
 			hp.Status.Status = goharborv1beta1.HarborProjectStatusReady
 			hp.Status.Reason = ""
 			hp.Status.Message = ""
-			now := metav1.Now()
-			hp.Status.LastApplyTime = &now
 		}
 
 		log.Info("Reconcile end", "result", res, "error", err, "updateStatusError", r.Client.Status().Update(ctx, hp))

diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
@@ -13528,11 +13528,6 @@ spec:
           status:
             description: HarborProjectStatus defines the status of HarborProject.
             properties:
-              lastApplyTime:
-                description: LastApplyTime represents the last apply configuration
-                  time.
-                format: date-time
-                type: string
               membershipHash:
                 description: MembershipHash provides a way to quickly notice changes
                   in project membership.

diff --git a/manifests/harbor/deployment.yaml b/manifests/harbor/deployment.yaml
@@ -13528,11 +13528,6 @@ spec:
           status:
             description: HarborProjectStatus defines the status of HarborProject.
             properties:
-              lastApplyTime:
-                description: LastApplyTime represents the last apply configuration
-                  time.
-                format: date-time
-                type: string
               membershipHash:
                 description: MembershipHash provides a way to quickly notice changes
                   in project membership.