moving worker to cmd

Dockerfile.worker

@@ -21,15 +21,15 @@ COPY go.mod go.mod
 COPY go.sum go.sum
 RUN go mod download
 
-COPY worker/ worker/
+COPY cmd/worker/main.go cmd/worker/main.go
 COPY apis/ apis/
 COPY pkg/ pkg/
 
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o bin/worker worker/main.go
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o worker cmd/worker/main.go
 
 FROM gcr.io/distroless/static:nonroot
 WORKDIR /
-COPY --from=builder /workspace/bin/worker /usr/local/bin/
-USER 65534:65534
+COPY --from=builder /workspace/worker .
+USER 65532:65532
 
-ENTRYPOINT ["/usr/local/bin/worker"]
+ENTRYPOINT ["/worker"]

Makefile

@@ -69,7 +69,7 @@ clientset-gen:  ## Generate clientset
 
 build: generate fmt vet  ## Build manager binary.
 	go build -o bin/manager main.go
-	go build -o bin/worker worker/main.go
+	go build -o bin/worker cmd/worker/main.go
 
 run: install manifests generate  ## Run a controller from your host.
 	go run ./main.go -default-plugins-names ${PLUGINS} -worker-image ${WORKER_IMG}

worker/main.go → cmd/worker/main.go

@@ -17,11 +17,12 @@ package main
 import (
 	"time"
 
-	"github.com/undistro/zora/worker/run"
 	"go.uber.org/zap/zapcore"
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	"github.com/undistro/zora/pkg/worker/run"
 )
 
 var log = ctrl.Log.WithName("worker")

docs/cluster-scan.md

@@ -129,5 +129,5 @@ kubectl get clusterissues -l cluster=mycluster,scanID=fa4e63cc-5236-40f3-aa7f-59
 
     These docs should help you understand why it's an issue and how to fix it.
 
-    All URLs are available [here](https://github.com/undistro/zora/blob/main/worker/report/popeye/parse_types.go#L109) 
+    All URLs are available [here](https://github.com/undistro/zora/blob/main/pkg/worker/report/popeye/parse_types.go#L109) 
     and you can contribute to Zora adding new links. See our [contribution guidelines](https://github.com/undistro/zora/blob/main/CONTRIBUTING.md).

worker/config/config.go → pkg/worker/config/config.go

@@ -25,7 +25,7 @@ import (
 	"github.com/go-logr/logr"
 
 	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
-	"github.com/undistro/zora/worker/report/popeye"
+	"github.com/undistro/zora/pkg/worker/report/popeye"
 )
 
 const (

worker/report/parse.go → pkg/worker/report/parse.go

@@ -20,8 +20,10 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
+
 	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
-	"github.com/undistro/zora/worker/config"
+	"github.com/undistro/zora/pkg/worker/config"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 )

worker/report/parse_test.go → pkg/worker/report/parse_test.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
-	"github.com/undistro/zora/worker/config"
+	"github.com/undistro/zora/pkg/worker/config"
 )
 
 func TestParse(t *testing.T) {

worker/report/popeye/parse_test.go → pkg/worker/report/popeye/parse_test.go

@@ -233,7 +233,7 @@ func TestParse(t *testing.T) {
 			return cis[i].ID > cis[j].ID
 		})
 		for c := 0; c < len(cis); c++ {
-			for r, _ := range cis[c].Resources {
+			for r := range cis[c].Resources {
 				sort.Strings(cis[c].Resources[r])
 			}
 		}

worker/run/run.go → pkg/worker/run/run.go

@@ -22,14 +22,13 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/undistro/zora/pkg/clientset/versioned"
-	"github.com/undistro/zora/worker/config"
-	"github.com/undistro/zora/worker/report"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/pkg/clientset/versioned"
+	"github.com/undistro/zora/pkg/worker/config"
+	"github.com/undistro/zora/pkg/worker/report"
 )
 
 // CreateClusterIssues creates instances of <ClusterIssue> on the Kubernetes

worker/run/run_test.go → pkg/worker/run/run_test.go

@@ -20,7 +20,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/undistro/zora/worker/config"
+	"github.com/undistro/zora/pkg/worker/config"
 )
 
 func TestDone(t *testing.T) {