@@ -117,12 +117,12 @@ test: manifests generate fmt vet envtest ## Run tests.
117
117
e2etest :
118
118
make --no-print-directory _e2etest # Workaround to force the flag on Github Action
119
119
120
- _e2etest-infra : kind ctlptl tilt kuttl kustomize clusterctl envsubst
120
+ _e2etest-infra : kind ctlptl tilt kuttl kustomize clusterctl
121
121
@echo -n " LINODE_TOKEN=$( LINODE_TOKEN) " > config/default/.env.linode
122
122
$(CTLPTL ) apply -f .tilt/ctlptl-config.yaml
123
123
$(TILT ) ci --timeout 240s -f Tiltfile
124
124
125
- _e2etest : manifests generate envsubst _e2etest-infra
125
+ _e2etest : manifests generate _e2etest-infra
126
126
ROOT_DIR=" $( PWD) " $(KUTTL ) test --config e2e/kuttl-config.yaml
127
127
128
128
# # --------------------------------------
@@ -255,7 +255,6 @@ KIND ?= $(LOCALBIN)/kind
255
255
KUTTL ?= $(LOCALBIN ) /kubectl-kuttl
256
256
# setup-envtest does not have devbox support so always use CACHE_BIN
257
257
ENVTEST ?= $(CACHE_BIN ) /setup-envtest
258
- ENVSUBST ?= $(LOCALBIN ) /envsubst
259
258
HUSKY ?= $(LOCALBIN ) /husky
260
259
NILAWAY ?= $(LOCALBIN ) /nilaway
261
260
GOVULNC ?= $(LOCALBIN ) /govulncheck
@@ -268,13 +267,12 @@ CONTROLLER_TOOLS_VERSION ?= v0.14.0
268
267
TILT_VERSION ?= 0.33.6
269
268
KIND_VERSION ?= 0.20.0
270
269
KUTTL_VERSION ?= 0.15.0
271
- ENVSUBST_VERSION ?= v1.4.2
272
270
HUSKY_VERSION ?= v0.2.16
273
271
NILAWAY_VERSION ?= latest
274
272
GOVULNC_VERSION ?= v1.0.1
275
273
276
274
.PHONY : tools
277
- tools : $(KUSTOMIZE ) $(CTLPTL ) $(CLUSTERCTL ) $(CONTROLLER_GEN ) $(TILT ) $(KIND ) $(KUTTL ) $(ENVTEST ) $(ENVSUBST ) $( HUSKY ) $(NILAWAY ) $(GOVULNC )
275
+ tools : $(KUSTOMIZE ) $(CTLPTL ) $(CLUSTERCTL ) $(CONTROLLER_GEN ) $(TILT ) $(KIND ) $(KUTTL ) $(ENVTEST ) $(HUSKY ) $(NILAWAY ) $(GOVULNC )
278
276
279
277
.PHONY : kustomize
280
278
kustomize : $(KUSTOMIZE ) # # Download kustomize locally if necessary.
@@ -324,12 +322,6 @@ envtest: $(ENVTEST) ## Download setup-envtest locally if necessary.
324
322
$(ENVTEST ) : $(LOCALBIN )
325
323
GOBIN=$(CACHE_BIN ) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
326
324
327
- .PHONY : envsubst
328
- envsubst : $(ENVSUBST ) # # Download envsubst locally if necessary.
329
- $(ENVSUBST ) : $(LOCALBIN )
330
- curl -Lso $(ENVSUBST ) https://github.com/a8m/envsubst/releases/download/$(ENVSUBST_VERSION ) /envsubst-$(shell uname -s) -$(ARCH )
331
- chmod +x $(ENVSUBST )
332
-
333
325
.PHONY : husky
334
326
husky : $(HUSKY ) # # Download husky locally if necessary.
335
327
@echo Execute install command to enable git hooks: ./bin/husky install
0 commit comments