Skip to content

Commit f9d4730

Browse files
committed
update go version to v1.23 in Makefile
Signed-off-by: pixiake <[email protected]>
1 parent 09b2776 commit f9d4730

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WORKDIR /tmp
1313
RUN apk add --no-cache ca-certificates
1414

1515
# Build the manager binary
16-
FROM golang:1.19 as builder
16+
FROM golang:1.23 as builder
1717

1818
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
1919
ARG goproxy=https://goproxy.cn,direct

Makefile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SHELL:=/usr/bin/env bash
66
#
77
# Go.
88
#
9-
GO_VERSION ?= 1.19.2
9+
GO_VERSION ?= 1.23.2
1010
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
1111

1212
# Use GOPROXY environment variable if set
@@ -241,7 +241,7 @@ verify-gen: generate ## Verify go generated files are up to date
241241

242242
.PHONY: kk
243243
kk:
244-
CGO_ENABLED=0 go build -trimpath -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kk github.com/kubesphere/kubekey/v3/cmd/kk;
244+
CGO_ENABLED=0 go build -trimpath -buildvcs=false -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kk github.com/kubesphere/kubekey/v3/cmd/kk;
245245

246246
ALL_MANAGERS = capkk k3s-bootstrap k3s-control-plane
247247

@@ -250,15 +250,15 @@ managers: $(addprefix manager-,$(ALL_MANAGERS)) ## Run all manager-* targets
250250

251251
.PHONY: manager-capkk
252252
manager-capkk: ## Build the capkk manager binary into the ./bin folder
253-
go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/manager github.com/kubesphere/kubekey/v3
253+
go build -trimpath -buildvcs=false -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/manager github.com/kubesphere/kubekey/v3
254254

255255
.PHONY: manager-k3s-bootstrap
256256
manager-k3s-bootstrap: ## Build the k3s bootstrap manager binary into the ./bin folder
257-
go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/k3s-bootstrap-manager github.com/kubesphere/kubekey/v3/bootstrap/k3s
257+
go build -trimpath -buildvcs=false -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/k3s-bootstrap-manager github.com/kubesphere/kubekey/v3/bootstrap/k3s
258258

259259
.PHONY: manager-k3s-control-plane
260260
manager-k3s-control-plane: ## Build the k3s control plane manager binary into the ./bin folder
261-
go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/k3s-control-plane-manager github.com/kubesphere/kubekey/v3/controlplane/k3s
261+
go build -trimpath -buildvcs=false -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/k3s-control-plane-manager github.com/kubesphere/kubekey/v3/controlplane/k3s
262262

263263
.PHONY: docker-pull-prerequisites
264264
docker-pull-prerequisites:
@@ -404,10 +404,6 @@ release-binaries: ## Build the binaries to publish with a release
404404
RELEASE_BINARY=./cmd/kk GOOS=linux GOARCH=amd64 $(MAKE) release-archive
405405
RELEASE_BINARY=./cmd/kk GOOS=linux GOARCH=arm64 $(MAKE) release-binary
406406
RELEASE_BINARY=./cmd/kk GOOS=linux GOARCH=arm64 $(MAKE) release-archive
407-
RELEASE_BINARY=./cmd/kk GOOS=darwin GOARCH=amd64 $(MAKE) release-binary
408-
RELEASE_BINARY=./cmd/kk GOOS=darwin GOARCH=amd64 $(MAKE) release-archive
409-
RELEASE_BINARY=./cmd/kk GOOS=darwin GOARCH=arm64 $(MAKE) release-binary
410-
RELEASE_BINARY=./cmd/kk GOOS=darwin GOARCH=arm64 $(MAKE) release-archive
411407

412408
release-binary: $(RELEASE_DIR)
413409
docker run \
@@ -419,7 +415,7 @@ release-binary: $(RELEASE_DIR)
419415
-v "$$(pwd):/workspace$(DOCKER_VOL_OPTS)" \
420416
-w /workspace \
421417
golang:$(GO_VERSION) \
422-
go build -a -trimpath -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS) -extldflags '-static'" \
418+
go build -a -trimpath -buildvcs=false -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS) -extldflags '-static'" \
423419
-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY)) $(RELEASE_BINARY)
424420

425421
release-archive: $(RELEASE_DIR)

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module github.com/kubesphere/kubekey/v3
22

33
go 1.23
44

5-
toolchain go1.23.2
6-
75
replace (
86
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
97
github.com/docker/docker => github.com/moby/moby v20.10.14+incompatible
@@ -237,7 +235,7 @@ require (
237235
golang.org/x/net v0.14.0 // indirect
238236
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
239237
golang.org/x/sync v0.1.0 // indirect
240-
golang.org/x/sys v0.27.0 // indirect
238+
golang.org/x/sys v0.28.0 // indirect
241239
golang.org/x/term v0.11.0 // indirect
242240
golang.org/x/text v0.12.0 // indirect
243241
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,8 +1681,8 @@ golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBc
16811681
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
16821682
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
16831683
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1684-
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
1685-
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1684+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
1685+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16861686
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
16871687
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
16881688
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

0 commit comments

Comments
 (0)