Minor fixes

Author: mohamed-essam

Dockerfile

@@ -1,19 +1,22 @@
-FROM golang:1.22.2 AS builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.23.1 AS builder
 
 COPY . /go/src/github.com/instabug/netbird-gitops/
 WORKDIR /go/src/github.com/instabug/netbird-gitops/
 RUN set -Eeux && \
     go mod download && \
     go mod verify
 
-RUN GOOS=linux GOARCH=amd64 \
-    go build \
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
+
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
     -o app cmd/*
 
-FROM alpine:3.17.1
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20.3
 RUN apk --no-cache add ca-certificates
 WORKDIR /root/
 COPY --from=builder /go/src/github.com/instabug/netbird-gitops/app .
 
-EXPOSE 8123
-ENTRYPOINT ["./app"]
+ENTRYPOINT ["/root/app"]

cmd/main.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
 	"github.com/Instabug/netbird-gitops/pkg/controller"
 	"github.com/go-git/go-git/v5/plumbing/transport"
@@ -31,6 +32,7 @@ var (
 	gitPassword           = flag.String("git-password", os.Getenv("GIT_PASSWORD"), "git basic auth password, must be defined if --git-auth-method is basic")
 	gitPrivateKeyPath     = flag.String("git-private-key-path", os.Getenv("GIT_PRIVATE_KEY_PATH"), "git SSH private key path, must be defined if --git-auth-method is ssh")
 	gitPrivateKeyPassword = flag.String("git-private-key-password", os.Getenv("GIT_PRIVATE_KEY_PASSWORD"), "git SSH private key password (if any)")
+	syncFrequency         = flag.Duration("sync-frequency", time.Minute, "Time between syncs")
 	netbirdToken          = flag.String("netbird-token", os.Getenv("NETBIRD_TOKEN"), "NetBird Management API token")
 	netbirdManagementAPI  = flag.String("netbird-mgmt-api", os.Getenv("NETBIRD_MANAGEMENT_API"), "NetBird Management API URL")
 	logLevel              = flag.String("log-level", os.Getenv("LOG_LEVEL"), "Log level (debug, info, warn, error)")

pkg/controller/controller.go

@@ -13,6 +13,7 @@ import (
 	"github.com/Instabug/netbird-gitops/pkg/client"
 	"github.com/Instabug/netbird-gitops/pkg/data"
 	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/nikoksr/notify"
 	"gopkg.in/yaml.v3"
@@ -35,6 +36,7 @@ type Options struct {
 	NetBirdToken    string
 	NetBirdAPI      string
 	SyncOnceAndExit bool
+	PollFrequency   time.Duration
 }
 
 // NewController init
@@ -52,10 +54,11 @@ func (c *Controller) Start(ctx context.Context) error {
 	slog.Info("Cloning repository")
 	os.RemoveAll(localRepoPath)
 	repo, err := git.PlainCloneContext(ctx, localRepoPath, false, &git.CloneOptions{
-		URL:          c.GitRepoURL,
-		RemoteName:   "origin",
-		Auth:         c.GitAuth,
-		SingleBranch: true,
+		URL:           c.GitRepoURL,
+		ReferenceName: plumbing.NewBranchReferenceName(c.GitBranch),
+		RemoteName:    "origin",
+		Auth:          c.GitAuth,
+		SingleBranch:  true,
 	})
 	if err != nil {
 		return fmt.Errorf("Failed to initialize repo pull: %w", err)
@@ -99,10 +102,11 @@ func (c *Controller) Start(ctx context.Context) error {
 		}
 		slog.Info("Pulling changes")
 		err = workTree.PullContext(ctx, &git.PullOptions{
-			RemoteName:   "origin",
-			RemoteURL:    c.GitRepoURL,
-			Auth:         c.GitAuth,
-			SingleBranch: true,
+			RemoteName:    "origin",
+			RemoteURL:     c.GitRepoURL,
+			ReferenceName: plumbing.NewBranchReferenceName(c.GitBranch),
+			Auth:          c.GitAuth,
+			SingleBranch:  true,
 		})
 		if err != nil && err != git.NoErrAlreadyUpToDate {
 			slog.Error("Failed to pull repo", "err", err)