Cherry pick #2081 #2046 #2091 #2072

.dockerignore

@@ -1 +1,31 @@
-vendor
+.github/
+.idea/
+.vscode/
+bin/
+charts/
+docs/
+config/
+examples/
+hack/
+manifest/
+spark-docker/
+sparkctl/
+test/
+vendor/
+.dockerignore
+.DS_Store
+.gitignore
+.gitlab-ci.yaml
+.golangci.yaml
+.pre-commit-config.yaml
+ADOPTERS.md
+CODE_OF_CONDUCT.md
+codecov.ymal
+CONTRIBUTING.md
+cover.out
+Dockerfile
+LICENSE
+OWNERS
+PROJECT
+README.md
+test.sh

.github/workflows/main.yaml

@@ -18,6 +18,11 @@ jobs:
         with:
           fetch-depth: "0"
 
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
       - name: The API documentation hasn't changed
         run: |
           make build-api-docs
@@ -42,7 +47,7 @@ jobs:
 
       - name: build sparkctl
         run: |
-          make all
+          make build-sparkctl
 
   build-spark-operator:
     runs-on: ubuntu-latest
@@ -57,18 +62,17 @@ jobs:
         with:
           go-version-file: "go.mod"
 
-      - name: Run gofmt check
-        run: make fmt-check
+      - name: Run go fmt check
+        run: make go-fmt
 
-      - name: Run static analysis
-        run: make static-analysis
+      - name: Run go vet
+        run: make go-vet
 
       - name: Run unit tests
         run: make unit-test
 
       - name: Build Spark-Operator Docker Image
-        run: |
-          docker build -t docker.io/kubeflow/spark-operator:latest .
+        run: make docker-build IMAGE_TAG=latest
 
       - name: Check changes in resources used in docker file
         run: |

.gitignore

@@ -1,9 +1,11 @@
-.vscode/
+bin/
 vendor/
-spark-operator
-.idea/
-**/*.iml
+cover.out
 sparkctl/sparkctl
-spark-on-k8s-operator
 sparkctl/sparkctl-linux-amd64
 sparkctl/sparkctl-darwin-amd64
+**/*.iml
+
+# Various IDEs
+.idea/
+.vscode/

.golangci.yaml

@@ -0,0 +1,39 @@
+run:
+  deadline: 5m
+
+linters:
+  enable:
+  - revive
+  - gci
+  - depguard
+  - godot
+  - testifylint
+  - unconvert
+
+issues:
+  exclude-rules:
+  # Disable errcheck linter for test files.
+  - path: _test.go
+    linters:
+    - errcheck
+
+linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/kubeflow/spark-operator)
+  depguard:
+    Main:
+      files:
+        - $all
+        - "!$test"
+      listMode: Lax
+      deny:
+        reflect: Please don't use reflect package
+    Test:
+      files:
+        - $test
+      listMode: Lax
+      deny:
+        reflect: Please don't use reflect package

.pre-commit-config.yaml

@@ -7,3 +7,4 @@ repos:
           # Make the tool search for charts only under the `charts` directory
           - --chart-search-root=charts
           - --template-files=README.md.gotmpl
+          - --sort-values-order=file

Dockerfile

@@ -16,33 +16,26 @@
 
 ARG SPARK_IMAGE=spark:3.5.0
 
-FROM golang:1.22-alpine as builder
+FROM golang:1.22.5 AS builder
 
 WORKDIR /workspace
 
-# Copy the Go Modules manifests
-COPY go.mod go.mod
-COPY go.sum go.sum
-# Cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer
-RUN go mod download
+COPY . .
 
-# Copy the go source code
-COPY main.go main.go
-COPY pkg/ pkg/
-
-# Build
 ARG TARGETARCH
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a -o /usr/bin/spark-operator main.go
+
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on make build-operator
 
 FROM ${SPARK_IMAGE}
+
 USER root
-COPY --from=builder /usr/bin/spark-operator /usr/bin/
-RUN apt-get update --allow-releaseinfo-change \
-    && apt-get update \
+
+RUN apt-get update \
     && apt-get install -y tini \
     && rm -rf /var/lib/apt/lists/*
 
+COPY --from=builder /workspace/bin/spark-operator /usr/bin/spark-operator
+
 COPY entrypoint.sh /usr/bin/
 
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]