Skip to content

Commit 7367492

Browse files
authored
Merge pull request #777 from cprivitere/cprivitere/issue709
✨ Use same kustomize version as upstream cluster-api
2 parents fa95e86 + dd5d715 commit 7367492

File tree

2 files changed

+2955
-2952
lines changed

2 files changed

+2955
-2952
lines changed

Makefile

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,23 @@ GOLANGCI_LINT_VER := v1.55.2
8888
GOLANGCI_LINT_BIN := golangci-lint
8989
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
9090

91-
# Keep at 4.0.4 until we figure out how to get later verisons to not mangle the calico yamls
92-
# HACK bump latest version once https://github.com/kubernetes-sigs/kustomize/issues/947 is fixed
93-
KUSTOMIZE_VER := v4.0.4
91+
# Sync to version in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/Makefile
92+
KUSTOMIZE_VER := v4.5.2
9493
KUSTOMIZE_BIN := kustomize
95-
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
94+
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
95+
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
9696

9797
# Sync to github.com/onsi/ginkgo verison in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
9898
GINKGO_VER := v2.17.1
9999
GINKGO_BIN := ginkgo
100100
GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER))
101101
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
102102

103+
YQ_VER := v4.35.2
104+
YQ_BIN := yq
105+
YQ := $(abspath $(TOOLS_BIN_DIR)/$(YQ_BIN)-$(YQ_VER))
106+
YQ_PKG := github.com/mikefarah/yq/v4
107+
103108
TIMEOUT := $(shell command -v timeout || command -v gtimeout)
104109

105110
# Define Docker related variables. Releases should modify and double check these vars.
@@ -241,13 +246,8 @@ $(ENVSUBST): ## Build envsubst from tools folder.
241246
$(GOLANGCI_LINT): ## Build golangci-lint from tools folder.
242247
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
243248

244-
## HACK replace with $(GO_INSTALL) once https://github.com/kubernetes-sigs/kustomize/issues/947 is fixed
245-
$(KUSTOMIZE): ## Put kustomize into tools folder.
246-
mkdir -p $(TOOLS_BIN_DIR)
247-
rm -f $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)*
248-
curl -fsSL "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash -s -- $(KUSTOMIZE_VER:v%=%) $(TOOLS_BIN_DIR)
249-
mv "$(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)" $(KUSTOMIZE)
250-
ln -sf $(KUSTOMIZE) "$(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)"
249+
$(KUSTOMIZE): # Build kustomize from tools folder.
250+
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
251251

252252
$(CONTROLLER_GEN): ## Build controller-gen from tools folder.
253253
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER)
@@ -258,6 +258,9 @@ $(CONVERSION_GEN): ## Build conversion-gen.
258258
$(GINKGO): # Build ginkgo from tools folder.
259259
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(GINKGO_PKG) $(GINKGO_BIN) $(GINKGO_VER)
260260

261+
$(YQ): # Build yq.
262+
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(YQ_PKG) $(YQ_BIN) ${YQ_VER}
263+
261264
## --------------------------------------
262265
## Linting
263266
## --------------------------------------
@@ -288,7 +291,7 @@ generate-templates: $(KUSTOMIZE) ## Generate cluster templates
288291
$(KUSTOMIZE) build templates/experimental-kube-vip-crs-cni --load-restrictor LoadRestrictionsNone > templates/cluster-template-kube-vip-crs-cni.yaml
289292
$(KUSTOMIZE) build templates/experimental-kube-vip --load-restrictor LoadRestrictionsNone > templates/cluster-template-kube-vip.yaml
290293
$(KUSTOMIZE) build templates/experimental-crs-cni --load-restrictor LoadRestrictionsNone > templates/cluster-template-crs-cni.yaml
291-
$(KUSTOMIZE) build templates/addons/calico > templates/addons/calico.yaml
294+
$(KUSTOMIZE) build templates/addons/calico | $(YQ) > templates/addons/calico.yaml
292295

293296
.PHONY: generate-go
294297
generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate targets

0 commit comments

Comments
 (0)