From f41584c2ccd545d98f1ffe218c6f973b828202f5 Mon Sep 17 00:00:00 2001 From: ChristianAvila Date: Sun, 9 Jun 2024 02:18:10 -0400 Subject: [PATCH 1/3] chores: Update build submodule and up up cli version up cli version is now compatible with docker >= 1.25 Signed-off-by: ChristianAvila --- .gitmodules | 2 +- Makefile | 4 ++-- build | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index c2fad47077..8f84209c8d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "build"] path = build - url = https://github.com/upbound/build + url = https://github.com/crossplane/build diff --git a/Makefile b/Makefile index ea2cecf0aa..a4202107af 100644 --- a/Makefile +++ b/Makefile @@ -45,9 +45,9 @@ GOLANGCILINT_VERSION = 1.54.2 # ==================================================================================== # Setup Kubernetes tools -UP_VERSION = v0.18.0 +UP_VERSION = v0.27.0 UP_CHANNEL = stable -UPTEST_VERSION = v0.5.0 +UPTEST_VERSION = v0.12.0 -include build/makelib/k8s_tools.mk diff --git a/build b/build index 2672eeb767..231258db28 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 2672eeb767636ec837aa7c63cd7e26e6089fa810 +Subproject commit 231258db281237379d8ec0c6e4af9d7c1ae5cc4a From 992b1b11f39256ec5489b7aaf7825408a230db13 Mon Sep 17 00:00:00 2001 From: ChristianAvila Date: Thu, 13 Jun 2024 19:29:53 -0400 Subject: [PATCH 2/3] chores: Use the updated command to manage go dependencies make vendor was deprecated in favor of modules.download and vendor.check to modules.check Signed-off-by: ChristianAvila --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ccffc8a80..425ae2d502 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: restore-keys: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check - name: Check Diff run: make check-diff @@ -132,7 +132,7 @@ jobs: restore-keys: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check # We could run 'make lint' to ensure our desired Go version, but we prefer # this action because it leaves 'annotations' (i.e. it comments on PRs to @@ -248,7 +248,7 @@ jobs: restore-keys: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check - name: Run Unit Tests run: make -j2 test @@ -308,7 +308,7 @@ jobs: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check - name: Build Helm Chart run: make -j2 build @@ -379,7 +379,7 @@ jobs: restore-keys: ${{ runner.os }}-pkg- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check - name: Build Artifacts run: make -j2 build.all From 8fa522d4dc5adcd86df66d338cd4c0c4354321da Mon Sep 17 00:00:00 2001 From: ChristianAvila Date: Thu, 4 Jul 2024 13:39:14 -0400 Subject: [PATCH 3/3] chores: Install goimports and use HELM as command Signed-off-by: ChristianAvila --- .github/workflows/ci.yml | 5 ++++- Makefile | 2 +- cluster/local/integration_tests.sh | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 425ae2d502..25a7274f8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ env: # Common versions GO_VERSION: '1.21.2' GOLANGCI_VERSION: 'v1.54.2' - DOCKER_BUILDX_VERSION: 'v0.10.0' + DOCKER_BUILDX_VERSION: 'v0.14.1' # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether @@ -35,6 +35,9 @@ jobs: uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4 with: go-version: ${{ env.GO_VERSION }} + + - name: Install goimports + run: go install golang.org/x/tools/cmd/goimports - name: Find the Go Build Cache id: go diff --git a/Makefile b/Makefile index a4202107af..1d3f68ddf8 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ manifests: e2e.run: test-integration # Run integration tests. -test-integration: $(KIND) $(KUBECTL) $(UP) $(HELM3) +test-integration: $(KIND) $(KUBECTL) $(UP) $(HELM) @$(INFO) running integration tests using kind $(KIND_VERSION) @KIND_NODE_IMAGE_TAG=${KIND_NODE_IMAGE_TAG} $(ROOT_DIR)/cluster/local/integration_tests.sh || $(FAIL) @$(OK) integration tests passed diff --git a/cluster/local/integration_tests.sh b/cluster/local/integration_tests.sh index 7b4c434d21..97debfa387 100755 --- a/cluster/local/integration_tests.sh +++ b/cluster/local/integration_tests.sh @@ -131,13 +131,13 @@ echo "${PVC_YAML}" | "${KUBECTL}" create -f - # install crossplane from stable channel echo_step "installing crossplane from stable channel" -"${HELM3}" repo add crossplane-stable https://charts.crossplane.io/stable/ +"${HELM}" repo add crossplane-stable https://charts.crossplane.io/stable/ chart_version="1.14.5" echo_info "using crossplane version ${chart_version}" echo # we replace empty dir with our PVC so that the /cache dir in the kind node # container is exposed to the crossplane pod -"${HELM3}" install crossplane --namespace crossplane-system crossplane-stable/crossplane --version ${chart_version} --wait --set packageCache.pvc=package-cache +"${HELM}" install crossplane --namespace crossplane-system crossplane-stable/crossplane --version ${chart_version} --wait --set packageCache.pvc=package-cache # ----------- integration tests echo_step "--- INTEGRATION TESTS ---"