OADP-5245: Operator SDK update guidelines

.dockerignore

@@ -1,6 +1,9 @@
+# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
+# Ignore build and test binaries.
+bin/
+
 *.md
 blogs
-bin
 .vscode
 .github
 .devcontainer

.gitignore

@@ -1,12 +1,35 @@
-bin/
-.vscode/
-.idea/
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+bin/*
+Dockerfile.cross
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Go workspace file
+go.work
+
+# Kubernetes Generated files - skip generated files, except for vendored files
+!vendor/**/zz_generated.*
+
+# editor and IDE paraphernalia
+.idea
+.vscode
+*.swp
+*.swo
+*~
+
+# OADP
 tests/e2e/e2e.test
-cover.out
-.DS_Store
 tests/e2e/templates/*.yaml
+.DS_Store
+test-upgrade/
 # `operator-sdk run bundle` caches files in this directory
 cache/
-*.test
-
-test-upgrade/

Dockerfile

@@ -13,18 +13,23 @@ COPY go.sum go.sum
 RUN go mod download
 
 # Copy the go source
-COPY main.go main.go
+COPY cmd/main.go cmd/main.go
 COPY api/ api/
+COPY internal/controller/ internal/controller/
 COPY pkg/ pkg/
-COPY controllers/ controllers/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -mod=mod -a -o /go/src/manager main.go
+# the GOARCH has not a default value to allow the binary be built according to the host where the command
+# was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO
+# the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
+# by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -mod=mod -a -o /go/src/manager cmd/main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM registry.access.redhat.com/ubi9-minimal
 WORKDIR /
 COPY --from=builder /go/src/manager .
 USER 65532:65532
+
 ENTRYPOINT ["/manager"]