Merge pull request #809 from erhancagirici/xp-v2-upjet-v2

crossplane v2: Generate namespace-scoped MRs

Author: erhancagirici

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
   workflow_dispatch: {}
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.24"
 
 jobs:
   detect-noop:
@@ -57,7 +57,7 @@ jobs:
           make schema-version-diff
 
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
@@ -105,7 +105,7 @@ jobs:
         run: make lint
 
   check-diff:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
@@ -155,7 +155,7 @@ jobs:
           path: _output/skipped_resources.csv
 
   unit-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
@@ -185,7 +185,7 @@ jobs:
         run: make -j2 test
 
   local-deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
@@ -215,7 +215,7 @@ jobs:
         run: make local-deploy
 
   check-examples:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     needs: detect-noop
     if: ${{ needs.detect-noop.outputs.noop != 'true' }}
 

.github/workflows/uptest-trigger.yml

@@ -9,7 +9,7 @@ on:
     types: [created]
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.24"
 
 jobs:
   check-permissions:
@@ -96,7 +96,7 @@ jobs:
       - check-permissions
       - get-example-list
     if: ${{ (needs.check-permissions.outputs.permission == 'admin' || needs.check-permissions.outputs.permission == 'write') && github.event.issue.pull_request != null && contains(github.event.comment.body, '/test-examples')}}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
 
     steps:
       - name: Cleanup Disk

.golangci.yml

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 run:
-  timeout: 10m
+  timeout: 90m
 
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"

Makefile

@@ -51,7 +51,7 @@ export GOPRIVATE = github.com/upbound/*
 GO_REQUIRED_VERSION ?= 1.21
 # GOLANGCILINT_VERSION is inherited from build submodule by default.
 # Uncomment below if you need to override the version.
-# GOLANGCILINT_VERSION ?= 1.54.0
+GOLANGCILINT_VERSION ?= 1.64.8
 
 RUN_BUILDTAGGER ?= false
 # if RUN_BUILDTAGGER is set to "true", we will use build constraints
@@ -66,7 +66,7 @@ endif
 SUBPACKAGES ?= monolith
 GO_STATIC_PACKAGES ?= $(GO_PROJECT)/cmd/generator ${SUBPACKAGES:%=$(GO_PROJECT)/cmd/provider/%}
 GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.Version=$(VERSION)
-GO_SUBDIRS += cmd internal apis
+GO_SUBDIRS += cmd internal apis generate
 GO111MODULE = on
 
 export SUBPACKAGES := $(SUBPACKAGES)
@@ -76,16 +76,16 @@ export SUBPACKAGES := $(SUBPACKAGES)
 # ====================================================================================
 # Setup Kubernetes tools
 
-KIND_VERSION = v0.15.0
+KIND_VERSION = v0.29.0
 # dependency for up
-UP_VERSION = v0.39.0
-UP_CHANNEL = stable
+UP_VERSION = v0.40.0-0.rc.3
+UP_CHANNEL = alpha
 UPTEST_VERSION = v0.11.1
 UPTEST_LOCAL_VERSION = v0.13.0
 UPTEST_LOCAL_CHANNEL = stable
 KUSTOMIZE_VERSION = v5.3.0
 YQ_VERSION = v4.40.5
-CROSSPLANE_VERSION = 1.14.6
+CROSSPLANE_VERSION = 1.20.0
 CRDDIFF_VERSION = v0.12.1
 
 export UP_VERSION := $(UP_VERSION)
@@ -234,6 +234,15 @@ build-provider.%:
 XPKG_SKIP_DEP_RESOLUTION := true
 
 local-deploy.%: controlplane.up
+	# uptest workaround for the behavior change at Crossplane 1.15 default registry
+	# XP RBAC manager has a check for packages from the same provider family
+	# that they come from the same org and assign RBACs for all providers.
+	# This got broken for locally deployed dev packages through crossplane/build submodule,
+	# therefore cannot get necessary RBACs.
+    # TODO: Remove this when https://github.com/crossplane/build/issues/38 is resolved
+    # this workaround is only valid for uptest on Crossplane 1.x
+    # Crossplane v2 needs the above issue to be resolved
+	@$(KUBECTL) -n $(CROSSPLANE_NAMESPACE) patch deployment crossplane-rbac-manager -p '{"spec":{"template":{"spec":{"containers":[{"name":"crossplane","env":[{"name":"REGISTRY","value":"index.docker.io"}]}]}}}}'
 	@for api in $$(tr ',' ' ' <<< $*); do \
 		$(MAKE) local.xpkg.deploy.provider.$(PROJECT_NAME)-$${api}; \
 		$(INFO) running locally built $(PROJECT_NAME)-$${api}; \