Merge pull request #75 from segmentio/mckern/shuffle-some-deck-chairs

Shuffle some deck chairs around a bit

Author: mckern

.buildkite/pipeline.yml

@@ -1,12 +1,12 @@
 # Fetch or build all required binaries
-FROM --platform=linux/amd64 golang:1.20 as builder
+FROM golang:1.21-bookworm as builder
 
 ARG VERSION_REF
 RUN test -n "${VERSION_REF}"
 
 ENV SRC github.com/segmentio/kubeapply
 
-RUN apt-get update && apt-get install --yes \
+RUN apt-get update && apt-get install --no-install-recommends --yes \
     curl \
     unzip \
     wget
@@ -16,24 +16,21 @@ RUN cd /usr/local/bin && /go/src/${SRC}/scripts/pull-deps.sh
 
 WORKDIR /go/src/${SRC}
 
-ENV CGO_ENABLED=1
-ENV GO111MODULE=on
-
 RUN make kubeapply VERSION_REF=${VERSION_REF} && \
     cp build/kubeapply /usr/local/bin
 RUN make kubeapply-lambda VERSION_REF=${VERSION_REF} && \
     cp build/kubeapply-lambda /usr/local/bin
 
-# Copy into final image
+# Copy into final image from builder
 FROM public.ecr.aws/lambda/provided:al2
 
 RUN yum install -y git unzip
 
 # Not sure if awscli is needed for running lambda, but keeping it here for now
 RUN curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o awscliv2.zip \
- && unzip awscliv2.zip \
- && ./aws/install \
- && rm -rf aws awscliv2.zip
+    && unzip awscliv2.zip \
+    && ./aws/install \
+    && rm -rf aws awscliv2.zip
 
 COPY --from=builder \
     /usr/local/bin/aws-iam-authenticator \

Dockerfile.lambda

@@ -2,7 +2,8 @@ ifndef VERSION_REF
 	VERSION_REF ?= $(shell git describe --tags --always --dirty="-dev")
 endif
 
-LDFLAGS := -ldflags='-X "main.VersionRef=$(VERSION_REF)"'
+LDFLAGS := -ldflags='-s -w -X "main.VersionRef=$(VERSION_REF)"'
+export GOFLAGS := -trimpath
 
 GOFILES = $(shell find . -iname '*.go' | grep -v -e vendor -e _modules -e _cache -e /data/)
 TEST_KUBECONFIG = .kube/kind-kubeapply-test.yaml
@@ -12,7 +13,7 @@ LAMBDAZIP := kubeapply-lambda-$(VERSION_REF).zip
 # Main targets
 .PHONY: kubeapply
 kubeapply: data
-	go build -o build/kubeapply $(LDFLAGS) ./cmd/kubeapply
+	go build $(LDFLAGS) -o build/kubeapply ./cmd/kubeapply
 
 .PHONY: install
 install: data
@@ -21,19 +22,19 @@ install: data
 # Lambda and server-related targets
 .PHONY: kubeapply-lambda
 kubeapply-lambda: data
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -tags lambda.norpc -o build/kubeapply-lambda $(LDFLAGS) ./cmd/kubeapply-lambda
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build $(LDFLAGS) -tags lambda.norpc -o build/kubeapply-lambda ./cmd/kubeapply-lambda
 
 .PHONY: kubeapply-lambda-kubeapply
 kubeapply-lambda-kubeapply: data
-	GOOS=linux GOARCH=amd64 go build -o build/kubeapply $(LDFLAGS) ./cmd/kubeapply
+	GOOS=linux GOARCH=amd64 go build $(LDFLAGS) -o build/kubeapply ./cmd/kubeapply
 
 .PHONY: lambda-zip
 lambda-zip: clean kubeapply-lambda kubeapply-lambda-kubeapply
 	$Q./scripts/create-lambda-bundle.sh $(LAMBDAZIP)
 
 .PHONY: kubeapply-server
 kubeapply-server: data
-	go build -o build/kubeapply-server $(LDFLAGS) ./cmd/kubeapply-server
+	go build $(LDFLAGS) -o build/kubeapply-server ./cmd/kubeapply-server
 
 # Test and formatting targets
 .PHONY: test
@@ -72,12 +73,9 @@ $(TEST_KUBECONFIG):
 .PHONY: go-bindata
 go-bindata:
 ifeq (, $(shell which go-bindata))
-	GO111MODULE=off go get -u github.com/kevinburke/go-bindata/...
+	go install github.com/kevinburke/go-bindata/v4/...@latest
 endif
 
 .PHONY: clean
 clean:
 	rm -Rf *.zip .kube build vendor
-
-publish:
-	./scripts/publish.sh