Skip to content

Commit

Permalink
update components default version
Browse files Browse the repository at this point in the history
Signed-off-by: pixiake <[email protected]>
  • Loading branch information
pixiake committed Mar 16, 2023
1 parent c6afa38 commit 69cb87a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ verify-gen: generate ## Verify go generated files are up to date

.PHONY: kk
kk:
CGO_ENABLED=0 go build -trimpath -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/kk github.com/kubesphere/kubekey/v3/cmd/kk;
CGO_ENABLED=0 go build -trimpath -buildmode=pie -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS) -extldflags '-static' -s -w" -o $(BIN_DIR)/kk github.com/kubesphere/kubekey/v3/cmd/kk;

ALL_MANAGERS = capkk k3s-bootstrap k3s-control-plane

Expand Down Expand Up @@ -419,7 +419,7 @@ release-binary: $(RELEASE_DIR)
-v "$$(pwd):/workspace$(DOCKER_VOL_OPTS)" \
-w /workspace \
golang:$(GO_VERSION) \
go build -a -trimpath -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS) -extldflags '-static'" \
go build -a -trimpath -buildmode=pie -tags "$(BUILDTAGS)" -ldflags "$(LDFLAGS) -extldflags '-static' -s -w" \
-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY)) $(RELEASE_BINARY)

release-archive: $(RELEASE_DIR)
Expand Down
6 changes: 3 additions & 3 deletions cmd/kk/apis/kubekey/v1alpha2/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ const (
DefaultDNSDomain = "cluster.local"
DefaultArch = "amd64"
DefaultSSHTimeout = 30
DefaultEtcdVersion = "v3.4.13"
DefaultEtcdVersion = "v3.5.6"
DefaultEtcdPort = "2379"
DefaultDockerVersion = "20.10.8"
DefaultDockerVersion = "20.10.23"
DefaultContainerdVersion = "1.6.4"
DefaultRuncVersion = "v1.1.1"
DefaultCrictlVersion = "v1.24.0"
Expand All @@ -52,7 +52,7 @@ const (
DefaultCiliumVersion = "v1.11.6"
DefaultKubeovnVersion = "v1.10.6"
DefalutMultusVersion = "v3.8"
DefaultHelmVersion = "v3.9.0"
DefaultHelmVersion = "v3.11.1"
DefaultDockerComposeVersion = "v2.2.2"
DefaultRegistryVersion = "2"
DefaultHarborVersion = "v2.5.3"
Expand Down

0 comments on commit 69cb87a

Please sign in to comment.