update from upstream

.gitignore

@@ -15,3 +15,6 @@
 # vendor/
 bin/
 dist/
+
+# macOS
+.DS_Store

.golangci.yaml

@@ -1,15 +1,29 @@
+version: "2"
 run:
-  timeout: 30m
-  tests: false # TODO lint tests too
-
+  tests: false
 linters:
-  disable-all: true
+  default: none
   enable:
+    - errcheck
     - gocritic
-    - gosimple
     - govet
-    - errcheck
     - ineffassign
     - staticcheck
-    - stylecheck
-    - typecheck
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.goreleaser.yaml

@@ -1,3 +1,4 @@
+version: 2
 project_name: cloud-provider-kind
 builds:
   - env: [CGO_ENABLED=0]

Dockerfile

@@ -5,7 +5,8 @@ COPY go.mod go.sum ./
 RUN go mod download
 # build
 COPY . .
-RUN make build
+ARG TARGETARCH
+RUN GOARCH=$TARGETARCH make build
 
 # build real cloud-provider-kind image
 FROM docker:29.1

Makefile

@@ -28,19 +28,32 @@ lint:
 	hack/lint.sh
 
 update:
-	go mod tidy && go mod vendor
+	go mod tidy
 
 # get image name from directory we're building
-IMAGE_NAME=cloud-provider-kind
+IMAGE_NAME?=cloud-provider-kind
 # docker image registry, default to upstream
 REGISTRY?=gcr.io/k8s-staging-kind
 # tag based on date-sha
 TAG?=$(shell echo "$$(date +v%Y%m%d)-$$(git describe --always --dirty)")
 # the full image tag
-IMAGE?=$(REGISTRY)/$(IMAGE_NAME):$(TAG)
+CPK_IMAGE?=$(REGISTRY)/$(IMAGE_NAME):$(TAG)
+PLATFORMS?=linux/amd64,linux/arm64
+
+.PHONY: ensure-buildx
+ensure-buildx:
+	./hack/init-buildx.sh
 
-# required to enable buildx
-export DOCKER_CLI_EXPERIMENTAL=enabled
 image-build:
-# docker buildx build --platform=${PLATFORMS} $(OUTPUT) --progress=$(PROGRESS) -t ${IMAGE} --pull $(EXTRA_BUILD_OPT) .
-	docker build . -t ${IMAGE}
+	docker buildx build . \
+		--tag="${CPK_IMAGE}" \
+		--load
+
+image-push:
+	docker buildx build . \
+		--platform="${PLATFORMS}" \
+		--tag="${CPK_IMAGE}" \
+		--push
+
+.PHONY: release # Build a multi-arch docker image
+release: ensure-buildx image-push

OWNERS

@@ -3,3 +3,4 @@
 approvers:
   - aojea
   - bentheelder
+  - stmcginnis