-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
✨ update to cluster API 1.7.1 (#1281)
update to cluster API 1.7.1 - this commit updates golang dependencies to Cluster API 1.7.1 version. - this commit uses kind node image from fluxcd repo and we no longer kind image published on DockerHub at kindest/node. - updates cluster templates and node images. - this commit enables us to use 1.29.4 version while development using Tilt and kind setup.
- Loading branch information
Showing
881 changed files
with
55,968 additions
and
28,996 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -78,7 +78,9 @@ WORKER_CLUSTER_KUBECONFIG ?= ".workload-cluster-kubeconfig.yaml" | |
MGT_CLUSTER_KUBECONFIG ?= ".mgt-cluster-kubeconfig.yaml" | ||
|
||
# Kubebuilder. | ||
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0 | ||
# go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest | ||
# setup-envtest list | ||
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.3 | ||
|
||
##@ Binaries | ||
############ | ||
|
@@ -108,7 +110,7 @@ $(ENVSUBST): # Build envsubst from tools folder. | |
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/setup-envtest) | ||
setup-envtest: $(SETUP_ENVTEST) ## Build a local copy of setup-envtest | ||
$(SETUP_ENVTEST): # Build setup-envtest from tools folder. | ||
go install sigs.k8s.io/controller-runtime/tools/[email protected]20231206145619-1ea2be573f78 | ||
go install sigs.k8s.io/controller-runtime/tools/[email protected]20240507051437-479b723944e3 | ||
|
||
CTLPTL := $(abspath $(TOOLS_BIN_DIR)/ctlptl) | ||
ctlptl: $(CTLPTL) ## Build a local copy of ctlptl | ||
|
@@ -118,7 +120,7 @@ $(CTLPTL): | |
CLUSTERCTL := $(abspath $(TOOLS_BIN_DIR)/clusterctl) | ||
clusterctl: $(CLUSTERCTL) ## Build a local copy of clusterctl | ||
$(CLUSTERCTL): | ||
curl -sSLf https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/clusterctl-$$(go env GOOS)-$$(go env GOARCH) -o $(CLUSTERCTL) | ||
curl -sSLf https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/clusterctl-$$(go env GOOS)-$$(go env GOARCH) -o $(CLUSTERCTL) | ||
chmod a+rx $(CLUSTERCTL) | ||
|
||
HELM := $(abspath $(TOOLS_BIN_DIR)/helm) | ||
|
@@ -136,12 +138,12 @@ $(HCLOUD): | |
KIND := $(abspath $(TOOLS_BIN_DIR)/kind) | ||
kind: $(KIND) ## Build a local copy of kind | ||
$(KIND): | ||
go install sigs.k8s.io/kind@v0.20.0 | ||
go install sigs.k8s.io/kind@v0.22.0 | ||
|
||
KUBECTL := $(abspath $(TOOLS_BIN_DIR)/kubectl) | ||
kubectl: $(KUBECTL) ## Build a local copy of kubectl | ||
$(KUBECTL): | ||
curl -fsSL "https://dl.k8s.io/release/v1.28.4/bin/$$(go env GOOS)/$$(go env GOARCH)/kubectl" -o $(KUBECTL) | ||
curl -fsSL "https://dl.k8s.io/release/v1.29.4/bin/$$(go env GOOS)/$$(go env GOARCH)/kubectl" -o $(KUBECTL) | ||
chmod a+rx $(KUBECTL) | ||
|
||
go-binsize-treemap := $(abspath $(TOOLS_BIN_DIR)/go-binsize-treemap) | ||
|
@@ -501,7 +503,7 @@ test-e2e-feature: $(E2E_CONF_FILE) $(if $(SKIP_IMAGE_BUILD),,e2e-image) $(ARTIFA | |
|
||
.PHONY: test-e2e-feature-packer | ||
test-e2e-feature-packer: $(if $(SKIP_IMAGE_BUILD),,e2e-image) $(ARTIFACTS) | ||
GINKGO_FOKUS="'\[Feature Packer\]'" GINKGO_NODES=1 PACKER_IMAGE_NAME=templates/node-image/1.28.4-ubuntu-22-04-containerd ./hack/ci-e2e-capi.sh | ||
GINKGO_FOKUS="'\[Feature Packer\]'" GINKGO_NODES=1 PACKER_IMAGE_NAME=templates/node-image/1.29.4-ubuntu-22-04-containerd ./hack/ci-e2e-capi.sh | ||
|
||
.PHONY: test-e2e-lifecycle | ||
test-e2e-lifecycle: $(E2E_CONF_FILE) $(if $(SKIP_IMAGE_BUILD),,e2e-image) $(ARTIFACTS) | ||
|
@@ -513,7 +515,7 @@ test-e2e-upgrade-$(INFRA_SHORT): $(E2E_CONF_FILE) $(if $(SKIP_IMAGE_BUILD),,e2e- | |
|
||
.PHONY: test-e2e-upgrade-kubernetes | ||
test-e2e-upgrade-kubernetes: $(if $(SKIP_IMAGE_BUILD),,e2e-image) $(ARTIFACTS) | ||
GINKGO_FOKUS="'\[Upgrade Kubernetes\]'" GINKGO_NODES=2 PACKER_KUBERNETES_UPGRADE_FROM=templates/node-image/1.27.8-ubuntu-22-04-containerd PACKER_KUBERNETES_UPGRADE_TO=templates/node-image/1.28.4-ubuntu-22-04-containerd ./hack/ci-e2e-capi.sh | ||
GINKGO_FOKUS="'\[Upgrade Kubernetes\]'" GINKGO_NODES=2 PACKER_KUBERNETES_UPGRADE_FROM=templates/node-image/1.28.9-ubuntu-22-04-containerd PACKER_KUBERNETES_UPGRADE_TO=templates/node-image/1.29.4-ubuntu-22-04-containerd ./hack/ci-e2e-capi.sh | ||
|
||
.PHONY: test-e2e-conformance | ||
test-e2e-conformance: $(E2E_CONF_FILE) $(if $(SKIP_IMAGE_BUILD),,e2e-image) $(ARTIFACTS) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.