Cleanup dapper and code

.github/workflows/ci.yaml

@@ -24,13 +24,25 @@ on:
     - 'CODEOWNERS'
     - 'LICENSE'
 jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.62.2
   build:
     strategy:
       matrix:
         arch:
           - x64
           - arm64
-    name : CI
+    name : build
     runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
     outputs:
       k3sversions: ${{ steps.support.outputs.k3sversions }}
@@ -39,52 +51,44 @@ jobs:
         uses : actions/checkout@v4
         with :
           fetch-depth : 0
-      - name: Set K3s support output
-        id : support
-        run: ./.github/workflows/scripts/supported-versions.sh | awk '{print "k3sversions="$0}' >> $GITHUB_OUTPUT
+      - name: Install go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.23
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name : Install helm
+        run : ./.github/workflows/scripts/install-helm.sh
       - name : CI
         run : make ci
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: bro-build-artifacts-${{ matrix.arch }}
-          path: ./dist/artifacts
-
   test:
     name : integration-test
-    needs : [
-      build
-    ]
     runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
     strategy:
       matrix:
         arch:
           - x64
           - arm64
-        K3S_VERSION : ${{ fromJSON(needs.build.outputs.k3sversions) }}
+        #FIXME: temporarily hardcoded
+        K3S_VERSION :
+          - v1.28.1-k3s1 
+          - v1.31.0-k3s1
     steps:
       - name : Checkout repository
         uses : actions/checkout@v4
-      - name : Fetch build artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bro-build-artifacts-${{ matrix.arch }}
-          path: ./dist/artifacts/
-      - name : Debug
-        run : ls -R ./dist/artifacts
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name : Load backup-restore-operator image
-        run : docker image load -i ./dist/artifacts/backup-restore-operator.img
       - name: Install go
         uses: actions/setup-go@v5
         with:
           go-version: 1.23
+      - name : Install helm 
+        run : ./.github/workflows/scripts/install-helm.sh
+      - name : Setup helm charts
+        run : ./scripts/package-helm
+      - name : Debug
+        run : ls -R ./dist/artifacts
       - name : Install k3d
         run : ./.github/workflows/scripts/install-k3d.sh
-      - name : Install minio client
-        run : ./.github/workflows/scripts/install-mc.sh
-      - name : Setup k3d cluster
-        run : CLUSTER_NAME=backup-restore K3S_VERSION=${{ matrix.K3S_VERSION }} ./.github/workflows/scripts/setup-cluster.sh
-      - name : Run integration tests
-        run : ./scripts/integration
+      - name : Run e2e tests
+        run :
+          CLUSTER_NAME=backup-restore K3S_VERSION=${{ matrix.K3S_VERSION }} ./scripts/testenv 
+          cd e2e && KUBECONFIG=$KUBECONFIG CHART_NAMESPACE=cattle-resources-system go test -v -timeout 10m -count=1 ./...

.github/workflows/scripts/install-helm.sh

@@ -0,0 +1,5 @@
+curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+chmod 700 get_helm.sh
+./get_helm.sh
+
+helm plugin install https://github.com/quintush/helm-unittest

.github/workflows/scripts/setup-cluster.sh

@@ -65,6 +65,4 @@ kubectl cluster-info --context k3d-${CLUSTER_NAME}
 kubectl config use-context k3d-${CLUSTER_NAME}
 kubectl get nodes -o wide
 
-IMAGE=${REPO}/backup-restore-operator:${TAG}
 
-k3d image import ${IMAGE} -c $CLUSTER_NAME

.golangci.json

@@ -11,11 +11,11 @@
 		]
 	},
 	"run": {
-		"deadline": "5m"
+		"timeout": "5m"
 	},
 	"issues": {
 		"skip-files": [
 			"/zz_generated_"
 		]
 	}
-}
+}

.vscode/launch.json

@@ -0,0 +1,20 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug Operator",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/main.go",
+            "env": {
+                "CHART_NAMESPACE": "cattle-resources-system",
+                // uncomment if using remote backup locations, like s3
+                "CATTLE_DEV_MODE": "true",
+            },
+        }
+    ]
+}

Makefile

@@ -1,15 +1,8 @@
 TARGETS := $(shell ls scripts)
 
-.dapper:
-	@echo Downloading dapper
-	@curl -sL https://releases.rancher.com/dapper/latest/dapper-$$(uname -s)-$$(uname -m) > .dapper.tmp
-	@@chmod +x .dapper.tmp
-	@./.dapper.tmp -v
-	@mv .dapper.tmp .dapper
-
-$(TARGETS): .dapper
-	./.dapper $@
+$(TARGETS):
+	./scripts/$@
 
 .DEFAULT_GOAL := ci
 
-.PHONY: $(TARGETS)
+.PHONY: $(TARGETS)

cmd/operator/main.go

@@ -0,0 +1,70 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/rancher/backup-restore-operator/pkg/operator"
+	"github.com/rancher/wrangler/v3/pkg/kubeconfig"
+	"github.com/rancher/wrangler/v3/pkg/signals"
+	"github.com/sirupsen/logrus"
+)
+
+const (
+	LogFormat = "2006/01/02 15:04:05"
+)
+
+var (
+	Version                         = "v0.0.0-dev"
+	GitCommit                       = "HEAD"
+	LocalBackupStorageLocation      = "/var/lib/backups" // local within the pod, this is the mountPath for PVC
+	KubeConfig                      string
+	OperatorPVEnabled               string
+	OperatorS3BackupStorageLocation string
+	ChartNamespace                  string
+	Debug                           bool
+	Trace                           bool
+)
+
+func init() {
+	flag.StringVar(&KubeConfig, "kubeconfig", "", "Path to a kubeconfig. Only required if out-of-cluster.")
+	flag.BoolVar(&Debug, "debug", false, "Enable debug logging.")
+	flag.BoolVar(&Trace, "trace", false, "Enable trace logging.")
+
+	flag.Parse()
+	OperatorPVEnabled = os.Getenv("DEFAULT_PERSISTENCE_ENABLED")
+	OperatorS3BackupStorageLocation = os.Getenv("DEFAULT_S3_BACKUP_STORAGE_LOCATION")
+	ChartNamespace = os.Getenv("CHART_NAMESPACE")
+}
+
+func main() {
+	logrus.SetFormatter(&logrus.TextFormatter{FullTimestamp: true, ForceColors: true, TimestampFormat: LogFormat})
+	if Debug {
+		logrus.SetLevel(logrus.DebugLevel)
+		logrus.Debugf("Loglevel set to [%v]", logrus.DebugLevel)
+	}
+	if Trace {
+		logrus.SetLevel(logrus.TraceLevel)
+		logrus.Tracef("Loglevel set to [%v]", logrus.TraceLevel)
+	}
+
+	logrus.Infof("Starting backup-restore controller version %s (%s)", Version, GitCommit)
+	ctx := signals.SetupSignalContext()
+	restKubeConfig, err := kubeconfig.GetNonInteractiveClientConfig(KubeConfig).ClientConfig()
+	if err != nil {
+		logrus.Fatalf("failed to find kubeconfig: %v", err)
+	}
+
+	dm := os.Getenv("CATTLE_DEV_MODE")
+	runOptions := operator.RunOptions{
+		OperatorPVCEnabled:              OperatorPVEnabled != "",
+		OperatorS3BackupStorageLocation: OperatorS3BackupStorageLocation,
+		ChartNamespace:                  ChartNamespace,
+		UseLocalDriver:                  dm != "",
+		LocalDriverPath:                 "",
+	}
+
+	if err := operator.Run(ctx, restKubeConfig, runOptions); err != nil {
+		logrus.Fatalf("Error running operator: %s", err.Error())
+	}
+}

e2e/.gitignore

@@ -0,0 +1 @@
+backups/