feat: add status conditions & e2e tests

Author: moolen

Makefile

@@ -14,7 +14,7 @@ all: controller
 
 # Run tests
 test: generate fmt vet manifests misspell
-	go test ./pkg/... -coverprofile cover.out
+	go test -v ./pkg/... -coverprofile cover.out
 
 e2e: generate manifests
 	go mod download

api/v1/harborrobotaccount_types.go

@@ -28,6 +28,7 @@ type HarborRobotAccountSpec struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Cluster
+// +kubebuilder:subresource:status
 
 // HarborRobotAccount is the Schema for the harborrobotaccounts API
 type HarborRobotAccount struct {

api/v1/types.go

@@ -102,12 +102,20 @@ type WebhookUpdatePayload struct {
 
 // HarborSyncStatus defines the observed state of HarborSync
 type HarborSyncStatus struct {
-	ProjectList []string `json:"managedProjects,omitempty"`
+	// +optional
+	ProjectList []ProjectStatus `json:"projectStatus,omitempty"`
 
 	// +optional
 	Conditions []HarborSyncStatusCondition `json:"conditions,omitempty"`
 }
 
+type ProjectStatus struct {
+	Name                    string      `json:"projectName"`
+	LastRobotReconciliation metav1.Time `json:"lastRobotReconciliation,omitempty"`
+	// +optional
+	ManagedNamespaces []string `json:"managedNamespaces,omitempty"`
+}
+
 type HarborSyncConditionType string
 
 const (
@@ -138,6 +146,7 @@ type RobotAccountCredential struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Cluster
+// +kubebuilder:subresource:status
 
 // HarborSync is the Schema for the harborsyncs API
 type HarborSync struct {

api/v1/zz_generated.deepcopy.go

@@ -15,6 +15,8 @@ spec:
     plural: harborrobotaccounts
     singular: harborrobotaccount
   scope: Cluster
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: HarborRobotAccount is the Schema for the harborrobotaccounts API
@@ -36,7 +38,8 @@ spec:
           properties:
             credential:
               description: RobotAccountCredential holds the robot account name & token
-                to access the harbor API
+                to access the harbor API this is also part of the webhook API change
+                here might impact downstream users
               properties:
                 created_at:
                   format: int64
@@ -56,11 +59,31 @@ spec:
         status:
           description: HarborRobotAccountStatus defines the observed state of HarborRobotAccount
           properties:
-            last_sync:
-              format: int64
-              type: integer
-          required:
-          - last_sync
+            conditions:
+              items:
+                properties:
+                  lastTransitionTime:
+                    format: date-time
+                    type: string
+                  message:
+                    type: string
+                  reason:
+                    type: string
+                  status:
+                    type: string
+                  type:
+                    type: string
+                required:
+                - status
+                - type
+                type: object
+              type: array
+            refreshTime:
+              description: refreshTime is the time and date the robot account was
+                fetched and the target secret updated
+              format: date-time
+              nullable: true
+              type: string
           type: object
       type: object
   version: v1

cmd/controller_standalone.go

@@ -15,6 +15,8 @@ spec:
     plural: harborsyncs
     singular: harborsync
   scope: Cluster
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: HarborSync is the Schema for the harborsyncs API
@@ -105,6 +107,42 @@ spec:
           type: object
         status:
           description: HarborSyncStatus defines the observed state of HarborSync
+          properties:
+            conditions:
+              items:
+                properties:
+                  lastTransitionTime:
+                    format: date-time
+                    type: string
+                  message:
+                    type: string
+                  reason:
+                    type: string
+                  status:
+                    type: string
+                  type:
+                    type: string
+                required:
+                - status
+                - type
+                type: object
+              type: array
+            projectStatus:
+              items:
+                properties:
+                  lastRobotReconciliation:
+                    format: date-time
+                    type: string
+                  managedNamespaces:
+                    items:
+                      type: string
+                    type: array
+                  projectName:
+                    type: string
+                required:
+                - projectName
+                type: object
+              type: array
           type: object
       type: object
   version: v1