Skip to content

Commit c742efe

Browse files
chore: remove duplicate entry of golangci version (#236)
* chore: remove duplicate entry of golangci version Signed-off-by: Jesús Fernández <[email protected]> * chore: bump up versions for crossplane 1.20 Signed-off-by: Jesús Fernández <[email protected]> * chore: restore changes Signed-off-by: Jesús Fernández <[email protected]> --------- Signed-off-by: Jesús Fernández <[email protected]>
1 parent 71c4b3a commit c742efe

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,19 @@ NPROCS ?= 1
2323
# to half the number of CPU cores.
2424
GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))
2525

26-
GOLANGCILINT_VERSION ?= 1.63.4
26+
GOLANGCILINT_VERSION ?= 2.1.2
2727
GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider
2828
GO_LDFLAGS += -X $(GO_PROJECT)/pkg/version.Version=$(VERSION)
2929
GO_SUBDIRS += cmd pkg apis
3030
GO111MODULE = on
31-
GOLANGCILINT_VERSION = 2.1.2
3231
-include build/makelib/golang.mk
3332

3433
# ====================================================================================
3534
# Setup Kubernetes tools
36-
KIND_NODE_IMAGE_TAG ?= v1.23.4
37-
DOCKER_REGISTRY ?= "xpkg.upbound.io"
35+
KIND_NODE_IMAGE_TAG ?= v1.30.13
36+
KIND_VERSION ?= v0.29.0
37+
KUBECTL_VERSION ?= v1.30.13
38+
CROSSPLANE_CLI_VERSION ?= v1.20.0
3839
-include build/makelib/k8s_tools.mk
3940

4041
# ====================================================================================

cluster/local/integration_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ EOF
102102

103103
echo_step "tag controller image and load it into kind cluster"
104104

105-
docker tag "${CONTROLLER_IMAGE}" "xpkg.upbound.io/${PACKAGE_NAME}"
106-
"${KIND}" load docker-image "xpkg.upbound.io/${PACKAGE_NAME}" --name="${K8S_CLUSTER}"
105+
docker tag "${CONTROLLER_IMAGE}" "xpkg.crossplane.io/${PACKAGE_NAME}"
106+
"${KIND}" load docker-image "xpkg.crossplane.io/${PACKAGE_NAME}" --name="${K8S_CLUSTER}"
107107

108108
echo_step "create crossplane-system namespace"
109109

0 commit comments

Comments
 (0)