Support for checking sync status for RootSyncSet (#3625)

kptdev · Oct 21, 2022 · 2781133 · 2781133
1 parent d4ae450
commit 2781133
Show file tree

Hide file tree

Showing 7 changed files with 620 additions and 50 deletions.
diff --git a/porch/controllers/config/crd/bases/config.porch.kpt.dev_rootsyncsets.yaml b/porch/controllers/config/crd/bases/config.porch.kpt.dev_rootsyncsets.yaml
@@ -60,8 +60,6 @@ spec:
                       type: string
                     namespace:
                       type: string
-                  required:
-                  - namespace
                   type: object
                 type: array
               template:
@@ -108,6 +106,21 @@ spec:
           status:
             description: RootSyncSetStatus defines the observed state of RootSyncSet
             properties:
+              clusterRefStatuses:
+                items:
+                  properties:
+                    apiVersion:
+                      type: string
+                    kind:
+                      type: string
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                    syncStatus:
+                      type: string
+                  type: object
+                type: array
               conditions:
                 description: Conditions describes the reconciliation state of the
                   object.

diff --git a/porch/controllers/main.go b/porch/controllers/main.go
@@ -49,7 +49,7 @@ import (
 var (
 	reconcilers = map[string]newReconciler{
 		"rootsyncsets": func() Reconciler {
-			return &rootsyncset.RootSyncSetReconciler{}
+			return rootsyncset.NewRootSyncSetReconciler()
 		},
 		"remoterootsyncsets": func() Reconciler {
 			return &remoterootsyncset.RemoteRootSyncSetReconciler{}

diff --git a/porch/controllers/rootsyncsets/api/v1alpha1/rootsyncset_types.go b/porch/controllers/rootsyncsets/api/v1alpha1/rootsyncset_types.go
@@ -28,7 +28,7 @@ type ClusterRef struct {
 	ApiVersion string `json:"apiVersion,omitempty"`
 	Kind       string `json:"kind,omitempty"`
 	Name       string `json:"name,omitempty"`
-	Namespace  string `json:"namespace,'omitempty'"`
+	Namespace  string `json:"namespace,omitempty"`
 }
 
 type RootSyncInfo struct {
@@ -65,6 +65,16 @@ type SecretReference struct {
 type RootSyncSetStatus struct {
 	// Conditions describes the reconciliation state of the object.
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
+	ClusterRefStatuses []ClusterRefStatus `json:"clusterRefStatuses,omitempty"`
+}
+
+type ClusterRefStatus struct {
+	ApiVersion string `json:"apiVersion,omitempty"`
+	Kind       string `json:"kind,omitempty"`
+	Name       string `json:"name,omitempty"`
+	Namespace  string `json:"namespace,omitempty"`
+	SyncStatus string `json:"syncStatus,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/porch/controllers/rootsyncsets/api/v1alpha1/zz_generated.deepcopy.go b/porch/controllers/rootsyncsets/api/v1alpha1/zz_generated.deepcopy.go