Merge branch 'main' into dependabot/go_modules/k8s.io/apimachinery-0.…

…30.2
scaleway · Jun 28, 2024 · bd9bcbd · bd9bcbd
2 parents 478a693 + 553e564
commit bd9bcbd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @yfodil
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
           restore-keys: ${{ runner.os }}-build-lint-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make modules.download modules.check
 
       # We could run 'make lint' but we prefer this action because it leaves
       # 'annotations' (i.e. it comments on PRs to point out linter violations).
@@ -105,7 +105,7 @@ jobs:
           restore-keys: ${{ runner.os }}-build-check-diff-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make modules.download modules.check
 
       - name: Check Diff
         run: make check-diff
@@ -138,7 +138,7 @@ jobs:
           restore-keys: ${{ runner.os }}-build-unit-tests-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make modules.download modules.check
 
       - name: Run Unit Tests
         run: make -j2 test
@@ -177,7 +177,7 @@ jobs:
           restore-keys: ${{ runner.os }}-build-unit-tests-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make modules.download modules.check
 
       - name: Deploying locally built provider package
         run: make local-deploy
@@ -232,7 +232,7 @@ jobs:
           restore-keys: ${{ runner.os }}-build-publish-artifacts-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make modules.download modules.check
 
       - name: Build Artifacts
         run: make -j2 build.all

diff --git 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
@@ -48,11 +48,12 @@ GO_SUBDIRS += cmd internal apis
 # ====================================================================================
 # Setup Kubernetes tools
 
-KIND_VERSION = v0.15.0
-UP_VERSION = v0.14.0
+KIND_VERSION = v0.23.0
+UP_VERSION = v0.31.0
 UP_CHANNEL = stable
-UPTEST_VERSION = v0.2.1
+UPTEST_VERSION = v0.12.0
 -include build/makelib/k8s_tools.mk
+CROSSPLANE_VERSION = 1.16.0
 
 # ====================================================================================
 # Setup Images
@@ -199,3 +200,6 @@ crossplane.help:
 help-special: crossplane.help
 
 .PHONY: crossplane.help help-special
+
+vendor: modules.download
+vendor.check: modules.check
diff --git a/build b/build
+19 −16		README.md
+0 −91		common.sh
+0 −102		cross/Dockerfile
+0 −36		cross/Makefile
+0 −51		cross/rsyncd.sh
+0 −34		cross/run.sh
+0 −29		cross/xvfb-chrome
+1 −1		makelib/common.mk
+18 −6		makelib/controlplane.mk
+0 −74		makelib/docs.mk
+23 −148		makelib/golang.mk
+34 −0		makelib/helm.mk
+0 −301		makelib/image.mk
+51 −22		makelib/k8s_tools.mk
+0 −185		makelib/local.mk
+6 −2		makelib/local.xpkg.mk
+0 −94		makelib/nodejs.mk
+5 −0		makelib/output.mk
+9 −0		makelib/xpkg.mk
+0 −76		makelib/yarnjs.mk
+0 −30		reset
+0 −175		run
+0 −46		scripts/load-configs.sh
+0 −165		scripts/localdev-deploy-component.sh
+0 −135		scripts/localdev-prepare.sh
+0 −36		scripts/localdev-remove-component.sh
+0 −87		scripts/localdev-scaffold.sh
+0 −61		scripts/utils.sh