add labels and annotations to rollouts api

rollouts/api/v1alpha1/remoterootsync_types.go

@@ -30,6 +30,7 @@ type RemoteRootSyncSpec struct {
 
 	ClusterRef ClusterRef    `json:"clusterRef,omitempty"`
 	Template   *RootSyncInfo `json:"template,omitempty"`
+	Metadata   *Metadata     `json:"metadata,omitempty"`
 }
 
 type RootSyncInfo struct {
@@ -54,6 +55,12 @@ type GitInfo struct {
 	NoSSLVerify            bool            `json:"noSSLVerify,omitempty"`
 }
 
+// Metadata specifies labels and annotations to add to the RSync object.
+type Metadata struct {
+	Labels      map[string]string `json:"labels,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty"`
+}
+
 // RemoteRootSyncStatus defines the observed state of RemoteRootSync
 type RemoteRootSyncStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster

rollouts/api/v1alpha1/rollout_types.go

@@ -128,13 +128,16 @@ type SyncTemplate struct {
 
 // RootSyncTemplate represent the sync template for RootSync.
 type RootSyncTemplate struct {
-	SourceFormat string   `json:"sourceFormat,omitempty"`
-	Git          *GitInfo `json:"git,omitempty"`
+	SourceFormat string    `json:"sourceFormat,omitempty"`
+	Git          *GitInfo  `json:"git,omitempty"`
+	Metadata     *Metadata `json:"metadata,omitempty"`
 }
 
+// RepoSyncTemplate represent the sync template for RepoSync.
 type RepoSyncTemplate struct {
-	SourceFormat string   `json:"sourceFormat,omitempty"`
-	Git          *GitInfo `json:"git,omitempty"`
+	SourceFormat string    `json:"sourceFormat,omitempty"`
+	Git          *GitInfo  `json:"git,omitempty"`
+	Metadata     *Metadata `json:"metadata,omitempty"`
 }
 
 // +kubebuilder:validation:Enum=AllClusters;Custom

rollouts/config/crd/bases/gitops.kpt.dev_remoterootsyncs.yaml

@@ -58,6 +58,19 @@ spec:
                 required:
                 - name
                 type: object
+              metadata:
+                description: Metadata specifies labels and annotations to add to the
+                  RSync object.
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
+                type: object
               template:
                 properties:
                   spec:

rollouts/config/crd/bases/gitops.kpt.dev_rollouts.yaml

@@ -184,6 +184,8 @@ spec:
                   RSync object used to syncing the packages.
                 properties:
                   repoSync:
+                    description: RepoSyncTemplate represent the sync template for
+                      RepoSync.
                     properties:
                       git:
                         properties:
@@ -217,6 +219,19 @@ spec:
                         - auth
                         - repo
                         type: object
+                      metadata:
+                        description: Metadata specifies labels and annotations to
+                          add to the RSync object.
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                        type: object
                       sourceFormat:
                         type: string
                     type: object
@@ -256,6 +271,19 @@ spec:
                         - auth
                         - repo
                         type: object
+                      metadata:
+                        description: Metadata specifies labels and annotations to
+                          add to the RSync object.
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                        type: object
                       sourceFormat:
                         type: string
                     type: object

rollouts/controllers/remoterootsync_controller.go

@@ -263,19 +263,23 @@ func (r *RemoteRootSyncReconciler) pruneWatches(rrsnn types.NamespacedName, clus
 func BuildObjectsToApply(remoterootsync *gitopsv1alpha1.RemoteRootSync) (*unstructured.Unstructured, error) {
 	newRootSync, err := runtime.DefaultUnstructuredConverter.ToUnstructured(remoterootsync.Spec.Template)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to convert to unstructured type: %w", err)
 	}
+
 	u := unstructured.Unstructured{Object: newRootSync}
 	u.SetGroupVersionKind(rootSyncGVK)
 	u.SetName(remoterootsync.Name)
 	u.SetNamespace(rootSyncNamespace)
-	u.SetLabels(map[string]string{
-		remoteRootSyncNameLabel:      remoterootsync.Name,
-		remoteRootSyncNamespaceLabel: remoterootsync.Namespace,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert to unstructured type: %w", err)
+
+	labels := make(map[string]string)
+	if remoterootsync.Spec.Metadata != nil {
+		u.SetAnnotations(remoterootsync.Spec.Metadata.Annotations)
+		labels = remoterootsync.Spec.Metadata.Labels
 	}
+	labels[remoteRootSyncNameLabel] = remoterootsync.Name
+	labels[remoteRootSyncNamespaceLabel] = remoterootsync.Namespace
+	u.SetLabels(labels)
+
 	return &u, nil
 }
 

rollouts/controllers/rollout_controller.go

@@ -510,11 +510,18 @@ func (r *RolloutReconciler) rolloutTargets(ctx context.Context, rollout *gitopsv
 
 	for _, target := range targets.ToBeCreated {
 		rootSyncSpec := toRootSyncSpec(target.packageRef)
+		var metadata *gitopsv1alpha1.Metadata
+
+		if rollout != nil && rollout.Spec.SyncTemplate != nil &&
+			rollout.Spec.SyncTemplate.RootSync != nil {
+			metadata = rollout.Spec.SyncTemplate.RootSync.Metadata
+		}
 		rrs := newRemoteRootSync(rollout,
 			gitopsv1alpha1.ClusterRef{Name: target.cluster.Name},
 			rootSyncSpec,
 			pkgID(target.packageRef),
 			wave.Name,
+			metadata,
 		)
 
 		if maxConcurrent > concurrentUpdates {
@@ -685,7 +692,12 @@ func isRRSErrored(rss *gitopsv1alpha1.RemoteRootSync) bool {
 }
 
 // Given a package identifier and cluster, create a RemoteRootSync object.
-func newRemoteRootSync(rollout *gitopsv1alpha1.Rollout, clusterRef gitopsv1alpha1.ClusterRef, rssSpec *gitopsv1alpha1.RootSyncSpec, pkgID string, waveName string) *gitopsv1alpha1.RemoteRootSync {
+func newRemoteRootSync(rollout *gitopsv1alpha1.Rollout,
+	clusterRef gitopsv1alpha1.ClusterRef,
+	rssSpec *gitopsv1alpha1.RootSyncSpec,
+	pkgID string,
+	waveName string,
+	metadata *gitopsv1alpha1.Metadata) *gitopsv1alpha1.RemoteRootSync {
 	t := true
 	clusterName := clusterRef.Name[strings.LastIndex(clusterRef.Name, "/")+1:]
 
@@ -711,6 +723,7 @@ func newRemoteRootSync(rollout *gitopsv1alpha1.Rollout, clusterRef gitopsv1alpha
 			Template: &gitopsv1alpha1.RootSyncInfo{
 				Spec: rssSpec,
 			},
+			Metadata: metadata,
 		},
 	}
 }