Merge branch 'main' into renovate/kubernetes-patches

.github/workflows/native-provider-bump.yml

@@ -10,5 +10,4 @@ jobs:
       provider-source: hashicorp/aws
       go-version: 1.19
     secrets:
-      TOKEN: ${{ secrets.UPBOUND_BOT_GITHUB_TOKEN }}
-
+      TOKEN: ${{ secrets.OFFICIAL_PROVIDERS_GA_TOKEN }}

.github/workflows/publish-service-artifacts.yml

@@ -7,16 +7,22 @@ on:
         description: 'Subpackages to be built individually (e.g. monolith config ec2)'
         default: 'monolith'
         required: false
-      version:
-        description: 'Provider version (e.g. v0.1.0)'
+      size:
+        description: "Number of smaller provider packages to build and push with each build job"
+        default: '30'
         required: true
+      concurrency:
+        description: "Number of parallel package builds within each build job"
+        default: '1'
+        required: false
 
 jobs:
   publish-service-artifacts:
     uses: upbound/uptest/.github/workflows/provider-publish-service-artifacts.yml@main
     with:
       subpackages: ${{ github.event.inputs.subpackages }}
-      version: ${{ github.event.inputs.version }}
+      size: ${{ github.event.inputs.size }}
+      concurrency: ${{ github.event.inputs.concurrency }}
     secrets:
       UPBOUND_MARKETPLACE_PUSH_ROBOT_USR: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR_RC }}
       UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW_RC }}

.github/workflows/uptest-all.yml

@@ -15,7 +15,7 @@ jobs:
       api_groups: ${{ steps.api-groups.outputs.list }}
     steps:
       - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
         with:
           submodules: true
       - name: Detect Api Groups
@@ -44,7 +44,7 @@ jobs:
           - api-groups: examples/providerconfig/
     steps:
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@27d0a4f181a40b142cce983c5393082c365d1480 # v1
+        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2
         with:
           platforms: all
 
@@ -55,15 +55,15 @@ jobs:
           install: true
 
       - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
         with:
           submodules: true
 
       - name: Fetch History
         run: git fetch --prune --unshallow
 
       - name: Setup Go
-        uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2
+        uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -139,7 +139,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
         with:
           submodules: true
       - name: Manual Intervention Report

Makefile

@@ -1,12 +1,14 @@
 # ====================================================================================
 # Setup Project
 
-PROJECT_NAME := provider-aws
+PROVIDER_NAME := aws
+PROJECT_NAME := provider-$(PROVIDER_NAME)
 PROJECT_REPO := github.com/upbound/$(PROJECT_NAME)
 
+export PROVIDER_NAME
 export TERRAFORM_VERSION := 1.2.1
 export TERRAFORM_PROVIDER_SOURCE := hashicorp/aws
-export TERRAFORM_PROVIDER_VERSION := 4.56.0
+export TERRAFORM_PROVIDER_VERSION := 4.67.0
 export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-aws
 export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX := https://github.com/hashicorp/terraform-provider-aws/releases/download/v$(TERRAFORM_PROVIDER_VERSION)
 export TERRAFORM_PROVIDER_REPO ?= https://github.com/hashicorp/terraform-provider-aws
@@ -56,24 +58,11 @@ export SUBPACKAGES := $(SUBPACKAGES)
 
 -include build/makelib/golang.mk
 
-# ====================================================================================
-# Setup XPKG
-
-XPKG_REG_ORGS ?= xpkg.upbound.io/upbound
-# NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are
-# inferred.
-XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/upbound
-
-export XPKG_REG_ORGS := $(XPKG_REG_ORGS)
-export XPKG_REG_ORGS_NO_PROMOTE := $(XPKG_REG_ORGS_NO_PROMOTE)
-
--include build/makelib/xpkg.mk
-
 # ====================================================================================
 # Setup Kubernetes tools
 
 KIND_VERSION = v0.15.0
-UP_VERSION = v0.16.1
+UP_VERSION = v0.17.0
 UP_CHANNEL = stable
 UPTEST_VERSION = v0.5.0
 
@@ -87,8 +76,24 @@ export UP_CHANNEL := $(UP_CHANNEL)
 
 REGISTRY_ORGS ?= xpkg.upbound.io/upbound
 IMAGES = provider-aws
+BATCH_PLATFORMS ?= linux_amd64,linux_arm64
+export BATCH_PLATFORMS := $(BATCH_PLATFORMS)
+
 -include build/makelib/imagelight.mk
 
+# ====================================================================================
+# Setup XPKG
+
+XPKG_REG_ORGS ?= xpkg.upbound.io/upbound
+# NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are
+# inferred.
+XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/upbound
+
+export XPKG_REG_ORGS := $(XPKG_REG_ORGS)
+export XPKG_REG_ORGS_NO_PROMOTE := $(XPKG_REG_ORGS_NO_PROMOTE)
+
+-include build/makelib/xpkg.mk
+
 # ====================================================================================
 # Targets
 
@@ -185,14 +190,20 @@ uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
 uptest-local:
 	@$(WARN) "this target is deprecated, please use 'make uptest' instead"
 
-local-deploy: build controlplane.up local.xpkg.deploy.provider.$(PROJECT_NAME)-monolith
+build-monolith:
+	@$(MAKE) build SUBPACKAGES=monolith LOAD_MONOLITH=true
+
+local-deploy: build-monolith controlplane.up local.xpkg.deploy.provider.$(PROJECT_NAME)-monolith
 	@$(INFO) running locally built provider
 	@$(KUBECTL) wait provider.pkg $(PROJECT_NAME)-monolith --for condition=Healthy --timeout 5m
 	@$(KUBECTL) -n upbound-system wait --for=condition=Available deployment --all --timeout=5m
 	@$(OK) running locally built provider
 
 # This target requires the following environment variables to be set:
-# - UPTEST_CLOUD_CREDENTIALS, cloud credentials for the provider being tested, e.g. export UPTEST_CLOUD_CREDENTIALS=$(cat ~/.aws/credentials)
+# - UPTEST_CLOUD_CREDENTIALS, cloud credentials for the provider being tested, e.g.
+#   $ export UPTEST_CLOUD_CREDENTIALS="DEFAULT='$(cat ~/.aws/credentials-uptest)'"
+#   or in case of multiple sets of credentials:
+#   $ export UPTEST_CLOUD_CREDENTIALS=$(echo "DEFAULT='$(cat ~/.aws/credentials)'\nPEER='$(cat ~/.aws/credentials-uptest)'")
 # - UPTEST_EXAMPLE_LIST, a comma-separated list of examples to test
 # - UPTEST_DATASOURCE_PATH, see https://github.com/upbound/uptest#injecting-dynamic-values-and-datasource
 e2e: local-deploy uptest