Skip to content

Commit b10505d

Browse files
committed
update kustomize and golangci-lint
Signed-off-by: cpanato <[email protected]>
1 parent a57a353 commit b10505d

File tree

4 files changed

+3
-61
lines changed

4 files changed

+3
-61
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ENVSUBST_VER := v1.4.2
7171
ENVSUBST_BIN := envsubst
7272
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
7373

74-
GOLANGCI_LINT_VER := v1.55.2
74+
GOLANGCI_LINT_VER := v1.56.2
7575
GOLANGCI_LINT_BIN := golangci-lint
7676
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7777

@@ -199,7 +199,7 @@ test-junit: $(SETUP_ENVTEST) $(GOTESTSUM) ## Run tests with verbose setting and
199199
exit $$(cat $(ARTIFACTS)/junit.exitcode)
200200

201201
.PHONY: test-e2e
202-
test-e2e: ## Run the end-to-end tests
202+
test-e2e: $(KUSTOMIZE) ## Run the end-to-end tests
203203
$(MAKE) test-e2e-run
204204

205205
LOCAL_GINKGO_ARGS ?=
@@ -214,7 +214,7 @@ test-e2e-local: ## Run e2e tests
214214
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
215215
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)
216216
.PHONY: test-conformance
217-
test-conformance: ## Run conformance test on workload cluster.
217+
test-conformance: $(KUSTOMIZE) ## Run conformance test on workload cluster.
218218
$(MAKE) test-e2e-run GINKGO_FOCUS="Conformance Tests" E2E_ARGS='$(CONFORMANCE_E2E_ARGS)' GINKGO_ARGS='$(LOCAL_GINKGO_ARGS)'
219219

220220
## --------------------------------------

hack/ensure-kustomize.sh

Lines changed: 0 additions & 54 deletions
This file was deleted.

scripts/ci-conformance.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ make --directory="${REPO_ROOT}" "${KUBECTL##*/}" "${KIND##*/}"
3030

3131
# shellcheck source=hack/ensure-go.sh
3232
source "${REPO_ROOT}/hack/ensure-go.sh"
33-
# shellcheck source=hack/ensure-kustomize.sh
34-
source "${REPO_ROOT}/hack/ensure-kustomize.sh"
3533

3634
ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}"
3735
mkdir -p "${ARTIFACTS}/logs/"

scripts/ci-e2e.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ make --directory="${REPO_ROOT}" "${KUBECTL##*/}" "${KIND##*/}"
3030

3131
# shellcheck source=hack/ensure-go.sh
3232
source "${REPO_ROOT}/hack/ensure-go.sh"
33-
# shellcheck source=hack/ensure-kustomize.sh
34-
source "${REPO_ROOT}/hack/ensure-kustomize.sh"
3533

3634
# Configure e2e tests
3735
export GINKGO_NODES=3

0 commit comments

Comments
 (0)