[v2] Consolidate go.mod

operator/.dockerignore → .dockerignore

@@ -3,11 +3,15 @@
 *.txt
 *.out
 *.yaml
+*.yml
 *_test.go
 .dockerignore
 .gitignore
-/bin
-/config
-/examples
+.git
+bin
+config
+examples
+deploy
+hack
 Dockerfile
 Makefile

.goreleaser.yml

@@ -74,7 +74,7 @@ dockers:
     goarch: amd64
 
     # Path to the Dockerfile (from the project root).
-    dockerfile: operator/Dockerfile
+    dockerfile: Dockerfile
 
     # Templates of the Docker image names.
     image_templates:

Dockerfile

@@ -0,0 +1,44 @@
+# Build a base image with modules cached.
+FROM --platform=${BUILDPLATFORM} golang:1.23 AS base
+
+COPY /go.mod go.mod
+COPY /go.sum go.sum
+
+ENV GOCACHE=/root/.cache/go-build
+ENV GOMODCACHE=/go/pkg/mod
+RUN --mount=type=cache,target=${GOMODCACHE} \
+    go mod download
+
+# Build the operator.
+FROM --platform=${BUILDPLATFORM} base AS op-builder
+ARG TARGETOS
+ARG TARGETARCH
+
+ARG VERSION
+RUN --mount=type=cache,target=${GOCACHE} \
+    --mount=type=cache,target=${GOMODCACHE} \
+    --mount=type=bind,source=/agent,target=./agent \
+    --mount=type=bind,source=/operator,target=./operator \
+    CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} \
+    go build -a -o /manager -ldflags="-X github.com/pulumi/pulumi-kubernetes-operator/v2/operator/version.Version=${VERSION}" ./operator/cmd/main.go
+
+# Build the agent.
+FROM --platform=${BUILDPLATFORM} base AS agent-builder
+ARG TARGETOS
+ARG TARGETARCH
+
+ARG VERSION
+RUN --mount=type=cache,target=${GOCACHE} \
+    --mount=type=cache,target=${GOMODCACHE} \
+    --mount=type=bind,source=/agent,target=./agent \
+    CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} \
+    go build -a -o /agent -ldflags "-X github.com/pulumi/pulumi-kubernetes-operator/v2/agent/version.Version=${VERSION}" ./agent/main.go
+
+# Use distroless as minimal base image to package the manager binary
+# Refer to https://github.com/GoogleContainerTools/distroless for more details
+FROM gcr.io/distroless/static-debian12:debug-nonroot
+COPY --from=op-builder /manager /manager
+COPY --from=agent-builder /agent /agent
+USER 65532:65532
+
+ENTRYPOINT ["/manager"]

agent/cmd/serve.go

@@ -24,8 +24,8 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/pulumi/pulumi-kubernetes-operator/agent/pkg/server"
-	"github.com/pulumi/pulumi-kubernetes-operator/agent/version"
+	"github.com/pulumi/pulumi-kubernetes-operator/v2/agent/pkg/server"
+	"github.com/pulumi/pulumi-kubernetes-operator/v2/agent/version"
 	"github.com/pulumi/pulumi/sdk/v3/go/auto"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"

agent/cmd/version.go

@@ -16,7 +16,7 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/pulumi/pulumi-kubernetes-operator/agent/version"
+	"github.com/pulumi/pulumi-kubernetes-operator/v2/agent/version"
 	"github.com/spf13/cobra"
 )