Skip to content

Commit 1dfe997

Browse files
committed
chore: addd trimpath flag to make build more reproducible
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
1 parent cb2d69f commit 1dfe997

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ARG ldflags
5151
RUN --mount=type=cache,target=/root/.cache/go-build \
5252
--mount=type=cache,target=/go/pkg/mod \
5353
CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
54-
go build -ldflags "${ldflags} -extldflags '-static'" \
54+
go build -trimpath -ldflags "${ldflags} -extldflags '-static'" \
5555
-o manager ${package}
5656

5757
# Production image

Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,15 @@ kind-cluster: ## Create a new kind cluster designed for testing with Tilt
179179

180180
.PHONY: manager-core
181181
manager-core: ## Build core manager binary
182-
go build -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/manager sigs.k8s.io/cluster-api
182+
go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/manager sigs.k8s.io/cluster-api
183183

184184
.PHONY: manager-kubeadm-bootstrap
185185
manager-kubeadm-bootstrap: ## Build kubeadm bootstrap manager
186-
go build -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kubeadm-bootstrap-manager sigs.k8s.io/cluster-api/bootstrap/kubeadm
186+
go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kubeadm-bootstrap-manager sigs.k8s.io/cluster-api/bootstrap/kubeadm
187187

188188
.PHONY: manager-kubeadm-control-plane
189189
manager-kubeadm-control-plane: ## Build kubeadm control plane manager
190-
go build -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kubeadm-control-plane-manager sigs.k8s.io/cluster-api/controlplane/kubeadm
190+
go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kubeadm-control-plane-manager sigs.k8s.io/cluster-api/controlplane/kubeadm
191191

192192
.PHONY: managers
193193
managers: ## Build all managers
@@ -197,31 +197,31 @@ managers: ## Build all managers
197197

198198
.PHONY: clusterctl
199199
clusterctl: ## Build clusterctl binary
200-
go build -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/clusterctl sigs.k8s.io/cluster-api/cmd/clusterctl
200+
go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/clusterctl sigs.k8s.io/cluster-api/cmd/clusterctl
201201

202202
$(SETUP_ENVTEST): $(TOOLS_DIR)/go.mod # Build setup-envtest from tools folder.
203-
cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/setup-envtest sigs.k8s.io/controller-runtime/tools/setup-envtest
203+
cd $(TOOLS_DIR); go build -trimpath -tags=tools -o $(BIN_DIR)/setup-envtest sigs.k8s.io/controller-runtime/tools/setup-envtest
204204

205205
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
206-
cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
206+
cd $(TOOLS_DIR); go build -trimpath -tags=tools -o $(BIN_DIR)/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
207207

208208
$(GOTESTSUM): $(TOOLS_DIR)/go.mod # Build gotestsum from tools folder.
209-
cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/gotestsum gotest.tools/gotestsum
209+
cd $(TOOLS_DIR); go build -trimpath -tags=tools -o $(BIN_DIR)/gotestsum gotest.tools/gotestsum
210210

211211
$(CONVERSION_GEN): $(TOOLS_DIR)/go.mod
212-
cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/conversion-gen k8s.io/code-generator/cmd/conversion-gen
212+
cd $(TOOLS_DIR); go build -trimpath -tags=tools -o $(BIN_DIR)/conversion-gen k8s.io/code-generator/cmd/conversion-gen
213213

214214
$(CONVERSION_VERIFIER): $(TOOLS_DIR)/go.mod
215215
cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/conversion-verifier sigs.k8s.io/cluster-api/hack/tools/conversion-verifier
216216

217217
$(GO_APIDIFF): $(TOOLS_DIR)/go.mod
218-
cd $(TOOLS_DIR) && go build -tags=tools -o $(GO_APIDIFF_BIN) github.com/joelanford/go-apidiff
218+
cd $(TOOLS_DIR) && go build -trimpath -tags=tools -o $(GO_APIDIFF_BIN) github.com/joelanford/go-apidiff
219219

220220
$(ENVSUBST): $(TOOLS_DIR)/go.mod
221-
cd $(TOOLS_DIR) && go build -tags=tools -o $(ENVSUBST_BIN) github.com/drone/envsubst/v2/cmd/envsubst
221+
cd $(TOOLS_DIR) && go build -trimpath -tags=tools -o $(ENVSUBST_BIN) github.com/drone/envsubst/v2/cmd/envsubst
222222

223223
$(YQ): $(TOOLS_DIR)/go.mod
224-
cd $(TOOLS_DIR) && go build -tags=tools -o $(YQ_BIN) github.com/mikefarah/yq/v4
224+
cd $(TOOLS_DIR) && go build -trimpath -tags=tools -o $(YQ_BIN) github.com/mikefarah/yq/v4
225225

226226
$(KUSTOMIZE): # Download kustomize using hack script into tools folder.
227227
hack/ensure-kustomize.sh

0 commit comments

Comments
 (0)