fix: move syncPerdio into reconciler

Signed-off-by: dntosas <ntosas@gmail.com>

Author: dntosas

.golangci.yml

@@ -7,4 +7,4 @@ linters:
     - godox
     - lll
     - depguard
-    - mnd
+    - mnd

Makefile

@@ -46,7 +46,7 @@ test: envtest ## Run go tests against code.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -v -mod=vendor `go list ./...` -coverprofile cover.out
 
 .PHONY: ci
-ci: fmt vet lint test ## Run go fmt/vet/lint/tests against the code.
+ci: fmt vet test ## Run go fmt/vet/lint/tests against the code.
 
 .PHONY: modsync
 modsync: ## Run go mod tidy && vendor.

charts/capi2argo-cluster-operator/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.4.1
+appVersion: 1.4.2
 description: Capi-2-Argo Cluster Operator (CACO) converts ClusterAPI Cluster credentials into ArgoCD Cluster definitions and keep them synchronized.
 home: https://github.com/dntosas/capi2argo-cluster-operator
 keywords:
@@ -11,7 +11,7 @@ maintainers:
 name: capi2argo-cluster-operator
 sources:
 - https://github.com/dntosas/capi2argo-cluster-operator
-version: 1.4.1
+version: 1.4.2
 dependencies:
 - name: common
   repository: "https://charts.bitnami.com/bitnami"

charts/capi2argo-cluster-operator/values.yaml

@@ -12,7 +12,7 @@ replicaCount: 1
 image:
   registry: ghcr.io
   repository: dntosas/capi2argo-cluster-operator
-  tag: v1.4.1
+  tag: v1.4.2
   pullPolicy: Always
   pullSecrets: []
 

controllers/capi2argo_reconciler.go

@@ -6,6 +6,7 @@ import (
 	goErr "errors"
 	"os"
 	"strconv"
+	"time"
 
 	"slices"
 	"strings"
@@ -44,8 +45,9 @@ func init() {
 // Capi2Argo reconciles a Secret object.
 type Capi2Argo struct {
 	client.Client
-	Log    logr.Logger
-	Scheme *runtime.Scheme
+	Log        logr.Logger
+	Scheme     *runtime.Scheme
+	SyncPeriod time.Duration
 }
 
 // +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
@@ -288,7 +290,7 @@ func (r *Capi2Argo) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resul
 
 		log.Info("ArgoSecret is in-sync with CapiCluster, skipping...")
 
-		return ctrl.Result{}, nil
+		return ctrl.Result{RequeueAfter: r.SyncPeriod}, nil
 	}
 
 	return ctrl.Result{}, nil

controllers/capi_cluster.go

@@ -9,6 +9,8 @@ import (
 )
 
 // CapiClusterSecretType represents the CAPI managed secret type.
+//
+//nolint:gosec
 const CapiClusterSecretType corev1.SecretType = "cluster.x-k8s.io/secret"
 
 // CapiCluster is an one-on-one representation of KubeConfig fields.

main.go

@@ -33,7 +33,6 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
@@ -45,10 +44,10 @@ var (
 	setupLog = ctrl.Log.WithName("setup")
 )
 
+// +kubebuilder:scaffold:scheme
 func init() {
 	utilruntime.Must(clusterv1.AddToScheme(scheme))
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	//+kubebuilder:scaffold:scheme
 }
 
 func main() {
@@ -86,9 +85,6 @@ func main() {
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "37cf8926.capi-cluster.x-argoproj.io",
-		Cache: cache.Options{
-			SyncPeriod: &syncDuration,
-		},
 		Metrics: server.Options{
 			BindAddress: metricsAddr,
 		},
@@ -111,9 +107,10 @@ func main() {
 	}
 
 	if err = (&controllers.Capi2Argo{
-		Client: mgr.GetClient(),
-		Log:    ctrl.Log.WithName("capi2argo"),
-		Scheme: mgr.GetScheme(),
+		Client:     mgr.GetClient(),
+		Log:        ctrl.Log.WithName("capi2argo"),
+		Scheme:     mgr.GetScheme(),
+		SyncPeriod: syncDuration,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Capi2Argo")
 		os.Exit(1)