Merge pull request #6 from open-component-model/update-controller

chore(update): updating the git-sync controller to work with latest ocm-controller

Author: Skarlso

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 ARG TARGETOS
 ARG TARGETARCH
 

api/v1alpha1/gitsync_types.go

@@ -6,8 +6,6 @@
 package v1alpha1
 
 import (
-	"time"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -28,7 +26,7 @@ type CommitTemplate struct {
 type GitSyncSpec struct {
 	ComponentRef   Ref             `json:"componentRef"`
 	SnapshotRef    Ref             `json:"snapshotRef"`
-	Interval       time.Duration   `json:"interval"`
+	Interval       metav1.Duration `json:"interval"`
 	URL            string          `json:"url"`
 	Branch         string          `json:"branch"`
 	AuthRef        Ref             `json:"authRef"`

api/v1alpha1/zz_generated.deepcopy.go

@@ -75,11 +75,7 @@ spec:
                 - namespace
                 type: object
               interval:
-                description: A Duration represents the elapsed time between two instants
-                  as an int64 nanosecond count. The representation limits the largest
-                  representable duration to approximately 290 years.
-                format: int64
-                type: integer
+                type: string
               prune:
                 type: boolean
               snapshotRef:

config/crd/bases/delivery.ocm.software_gitsyncs.yaml

@@ -31,6 +31,7 @@ spec:
         - /manager
         args:
         - --leader-elect
+        - --oci-registry-addr=registry.ocm-system.svc.cluster.local:5000
         image: open-component-model/git-sync-controller:latest
         name: manager
         securityContext:

config/manager/deployment.yaml

@@ -12,6 +12,7 @@ rules:
   verbs:
   - get
   - list
+  - watch
 - apiGroups:
   - delivery.ocm.software
   resources:

config/rbac/role.yaml

@@ -1,12 +1,23 @@
 apiVersion: delivery.ocm.software/v1alpha1
 kind: GitSync
 metadata:
-  labels:
-    app.kubernetes.io/name: gitsync
-    app.kubernetes.io/instance: gitsync-sample
-    app.kubernetes.io/part-of: git-sync-controller
-    app.kuberentes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: git-sync-controller
-  name: gitsync-sample
+  name: git-sync-sample
+  namespace: ocm-system
 spec:
-  # TODO(user): Add fields here
+  authRef:
+    name: git-sync-secret
+    namespace: ocm-system
+  branch: main
+  commitTemplate:
+    email: <email>
+    message: "Update made from git-sync-controller"
+    name: Gergely Brautigam
+  interval: 10m0s
+  subPath: ./application/podinfo
+  url: https://github.com/Skarlso/test
+  componentRef:
+    name: ocm-test-component
+    namespace: ocm-system
+  snapshotRef:
+    name: ocm-test-snapshot
+    namespace: ocm-system

config/samples/delivery_v1alpha1_gitsync.yaml

@@ -10,11 +10,11 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/pkg/runtime/patch"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/cluster-api/util/patch"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -37,7 +37,7 @@ type GitSyncReconciler struct {
 //+kubebuilder:rbac:groups=delivery.ocm.software,resources=gitsyncs/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=delivery.ocm.software,resources=gitsyncs/finalizers,verbs=update
 //+kubebuilder:rbac:groups=delivery.ocm.software,resources=ocmresources,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list
+//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
 //+kubebuilder:rbac:groups=delivery.ocm.software,resources=snapshots,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=delivery.ocm.software,resources=snapshots/status,verbs=get;update;patch
 
@@ -65,32 +65,32 @@ func (r *GitSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		Namespace: gitSync.Spec.SnapshotRef.Namespace,
 		Name:      gitSync.Spec.SnapshotRef.Name,
 	}, snapshot); err != nil {
-		return requeue(gitSync.Spec.Interval), fmt.Errorf("failed to find snapshot: %w", err)
+		return ctrl.Result{}, fmt.Errorf("failed to find snapshot: %w", err)
 	}
 	authSecret := &corev1.Secret{}
 	if err := r.Get(ctx, types.NamespacedName{
 		Namespace: gitSync.Spec.AuthRef.Namespace,
 		Name:      gitSync.Spec.AuthRef.Name,
 	}, authSecret); err != nil {
-		return requeue(gitSync.Spec.Interval), fmt.Errorf("failed to find authentication secret: %w", err)
+		return ctrl.Result{}, fmt.Errorf("failed to find authentication secret: %w", err)
 	}
 
 	// trim any trailing `/` and then just add.
-	log.V(4).Info("crafting artifact URL to download from", "url", snapshot.Status.Image)
+	log.V(4).Info("crafting artifact URL to download from", "url", snapshot.Status.RepositoryURL)
 	opts := &providers.PushOptions{
-		URL:         gitSync.Spec.URL,
-		Message:     gitSync.Spec.CommitTemplate.Message,
-		Name:        gitSync.Spec.CommitTemplate.Name,
-		Email:       gitSync.Spec.CommitTemplate.Email,
-		SnapshotURL: snapshot.Status.Image,
-		Branch:      gitSync.Spec.Branch,
-		SubPath:     gitSync.Spec.SubPath,
+		URL:      gitSync.Spec.URL,
+		Message:  gitSync.Spec.CommitTemplate.Message,
+		Name:     gitSync.Spec.CommitTemplate.Name,
+		Email:    gitSync.Spec.CommitTemplate.Email,
+		Snapshot: snapshot,
+		Branch:   gitSync.Spec.Branch,
+		SubPath:  gitSync.Spec.SubPath,
 	}
 	r.parseAuthSecret(authSecret, opts)
 
 	digest, err := r.Git.Push(ctx, opts)
 	if err != nil {
-		return requeue(gitSync.Spec.Interval), fmt.Errorf("failed to push to git repository: %w", err)
+		return ctrl.Result{}, fmt.Errorf("failed to push to git repository: %w", err)
 	}
 	// Initialize the patch helper.
 	patchHelper, err := patch.NewHelper(gitSync, r.Client)
@@ -111,12 +111,6 @@ func (r *GitSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	return ctrl.Result{}, nil
 }
 
-func requeue(seconds time.Duration) ctrl.Result {
-	return ctrl.Result{
-		RequeueAfter: seconds * time.Second,
-	}
-}
-
 // SetupWithManager sets up the controller with the Manager.
 func (r *GitSyncReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).