Skip to content

Commit 8379134

Browse files
committed
move kind to go tools
1 parent 5e68a3e commit 8379134

4 files changed

Lines changed: 8 additions & 10 deletions

File tree

Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -345,19 +345,17 @@ KUBECTL ?= $(LOCALBIN)/kubectl
345345
CLUSTERCTL ?= $(LOCALBIN)/clusterctl
346346
KUBEBUILDER ?= $(LOCALBIN)/kubebuilder
347347
TILT ?= $(LOCALBIN)/tilt
348-
KIND ?= $(LOCALBIN)/kind
349348
GOLANGCI_LINT_KAL ?= $(CACHE_BIN)/golangci-lint-kube-api-linter
350349

351350
## Tool Versions
352351
CLUSTERCTL_VERSION ?= v1.11.1
353352
KUBECTL_VERSION ?= v1.28.0
354353
KUBEBUILDER_VERSION ?= v3.15.1
355354
TILT_VERSION ?= 0.33.10
356-
KIND_VERSION ?= 0.23.0
357355
CHAINSAW_VERSION ?= v0.2.13
358356

359357
.PHONY: tools
360-
tools: $(CLUSTERCTL) $(KUBECTL) $(KUBEBUILDER) $(TILT) $(KIND)
358+
tools: $(CLUSTERCTL) $(KUBECTL) $(KUBEBUILDER) $(TILT)
361359
go install tool
362360
##@ we can't manage this with go tools because it causes a panic due to missing CRDs when running chainsaw
363361
go install github.com/kyverno/chainsaw@$(CHAINSAW_VERSION)
@@ -389,12 +387,6 @@ $(TILT): $(LOCALBIN)
389387
fi; \
390388
curl -fsSL https://github.com/tilt-dev/tilt/releases/download/v$(TILT_VERSION)/tilt.$(TILT_VERSION).$$TILT_OS.$(ARCH).tar.gz | tar -xzvm -C $(LOCALBIN) tilt
391389

392-
.PHONY: kind
393-
kind: $(KIND) ## Download kind locally if necessary.
394-
$(KIND): $(LOCALBIN)
395-
curl -Lso $(KIND) https://github.com/kubernetes-sigs/kind/releases/download/v$(KIND_VERSION)/kind-$(OS)-$(ARCH_SHORT)
396-
chmod +x $(KIND)
397-
398390
.PHONY: golangci-lint-kal
399391
golangci-lint-kal: $(GOLANGCI_LINT_KAL)
400392
$(GOLANGCI_LINT_KAL): tools # Build golangci-lint-kal from custom configuration.

devbox.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"docker@latest",
55
"go-tools@latest",
66
"go@1.25",
7-
"kind@latest",
87
"tilt@latest",
98
"mdbook@latest",
109
"mdbook-admonish@latest",

go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ require (
3838
require (
3939
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
4040
4d63.com/gochecknoglobals v0.2.2 // indirect
41+
al.essio.dev/pkg/shellescape v1.5.1 // indirect
4142
cel.dev/expr v0.24.0 // indirect
4243
cloud.google.com/go v0.121.2 // indirect
4344
cloud.google.com/go/auth v0.16.5 // indirect
@@ -243,6 +244,7 @@ require (
243244
github.com/opencontainers/go-digest v1.0.0 // indirect
244245
github.com/opencontainers/image-spec v1.1.1 // indirect
245246
github.com/peak/s5cmd/v2 v2.3.0 // indirect
247+
github.com/pelletier/go-toml v1.9.5 // indirect
246248
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
247249
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
248250
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
@@ -447,5 +449,6 @@ tool (
447449
k8s.io/code-generator/cmd/conversion-gen
448450
sigs.k8s.io/controller-runtime/tools/setup-envtest
449451
sigs.k8s.io/controller-tools/cmd/controller-gen
452+
sigs.k8s.io/kind
450453
sigs.k8s.io/kustomize/kustomize/v5
451454
)

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
4d63.com/gocheckcompilerdirectives v1.3.0/go.mod h1:ofsJ4zx2QAuIP/NO/NAh1ig6R1Fb18/GI7RVMwz7kAY=
33
4d63.com/gochecknoglobals v0.2.2 h1:H1vdnwnMaZdQW/N+NrkT1SZMTBmcwHe9Vq8lJcYYTtU=
44
4d63.com/gochecknoglobals v0.2.2/go.mod h1:lLxwTQjL5eIesRbvnzIP3jZtG140FnTdz+AlMa+ogt0=
5+
al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=
6+
al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
57
cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
68
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
79
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
@@ -740,6 +742,8 @@ github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH
740742
github.com/peak/s5cmd/v2 v2.3.0 h1:g8KSD2o4pcyzUsAaWsn7TGb+j4w+/mI1B5NmfDR0Bbs=
741743
github.com/peak/s5cmd/v2 v2.3.0/go.mod h1:RwBSmJcT25Y5EbdbMXDxvPRvO4hbfsi7Rc69FczeIss=
742744
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
745+
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
746+
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
743747
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
744748
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
745749
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=

0 commit comments

Comments
 (0)