Skip to content

Commit

Permalink
updated submodules
Browse files Browse the repository at this point in the history
Signed-off-by: Brad Wadsworth <[email protected]>
  • Loading branch information
bradkwadsworth-mw committed Oct 9, 2024
1 parent b6926da commit 4ec146b
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:

jobs:
setup-vars:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
supported_releases_number: ${{ steps.setup.outputs.supported_releases_number }}
images: ${{ steps.setup.outputs.images }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:

jobs:
stale:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/uptest-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
detect-api-groups:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
api_groups: ${{ steps.api-groups.outputs.list }}
steps:
Expand All @@ -38,7 +38,7 @@ jobs:
echo "list=${OUTPUT}" >> $GITHUB_OUTPUT
uptest:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: detect-api-groups
strategy:
fail-fast: false
Expand All @@ -53,7 +53,7 @@ jobs:
platforms: all

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
with:
version: ${{ env.DOCKER_BUILDX_VERSION }}
install: true
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
kubectl delete managed --all
report:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: uptest
if: always()
env:
Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ export XPKG_REG_ORGS_NO_PROMOTE := $(XPKG_REG_ORGS_NO_PROMOTE)
export XPKG_DIR := $(XPKG_DIR)
export XPKG_IGNORE := $(XPKG_IGNORE)

CONFIG_CRD_GROUP = $(PROVIDER_NAME)
PROVIDER_AUTH_GROUP = $(PROVIDER_NAME)

export CONFIG_CRD_GROUP := $(CONFIG_CRD_GROUP)
export PROVIDER_AUTH_GROUP := $(PROVIDER_AUTH_GROUP)

-include build/makelib/xpkg.mk

# ====================================================================================
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/provider-gcp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20.2
FROM alpine:3.20.3
RUN apk --no-cache add ca-certificates bash

ARG TARGETOS
Expand Down
10 changes: 7 additions & 3 deletions cluster/images/provider-gcp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ ifeq (-,$(findstring -,$(VERSION)))
endif
BUILD_ONLY ?= false
STORE_PACKAGES ?= ""
XPKG_CLEANUP_EXAMPLES_VERSION ?= v0.12.1
batch-process: $(UP)
@rm -rf $(WORK_DIR)/xpkg-cleaned-examples
@GOOS=$(HOSTOS) GOARCH=$(TARGETARCH) go run github.com/upbound/uptest/cmd/cleanupexamples@$(XPKG_CLEANUP_EXAMPLES_VERSION) $(ROOT_DIR)/examples $(WORK_DIR)/xpkg-cleaned-examples || $(FAIL)
@$(INFO) Batch processing smaller provider packages for: "$(SUBPACKAGES)"
@mkdir -p "$(XPKG_OUTPUT_DIR)/$(PLATFORM)" && \
$(UP) xpkg batch --smaller-providers "$$(tr ' ' ',' <<< "$(SUBPACKAGES)")" \
Expand All @@ -69,14 +72,15 @@ batch-process: $(UP)
--output-dir $(XPKG_OUTPUT_DIR) \
--store-packages "$(STORE_PACKAGES)" \
--build-only=$(BUILD_ONLY) \
--examples-root $(ROOT_DIR)/examples \
--examples-root $(WORK_DIR)/xpkg-cleaned-examples \
--examples-group-override monolith=* --examples-group-override config=providerconfig \
--auth-ext $(XPKG_DIR)/auth.yaml \
--crd-root $(XPKG_DIR)/crds \
--ignore $(XPKG_IGNORE) \
--crd-group-override monolith=* --crd-group-override config=$(PROVIDER_NAME) \
--crd-group-override monolith=* --crd-group-override config=$(CONFIG_CRD_GROUP) \
--package-metadata-template $(XPKG_DIR)/crossplane.yaml.tmpl \
--template-var XpkgRegOrg=$(XPKG_REG_ORGS) --template-var DepConstraint="$(DEP_CONSTRAINT)" --template-var ProviderName=$(PROVIDER_NAME) \
--template-var XpkgRegOrg=$(XPKG_REG_ORGS) --template-var DepConstraint="$(DEP_CONSTRAINT)" --template-var ProviderName=$(PROVIDER_NAME) --template-var ProviderAuthGroup=$(PROVIDER_AUTH_GROUP) \
--concurrency $(CONCURRENCY) \
--push-retry 10 || $(FAIL)
@$(OK) Done processing smaller provider packages for: "$(SUBPACKAGES)"
@rm -rf $(WORK_DIR)/xpkg-cleaned-examples
2 changes: 1 addition & 1 deletion package/crossplane.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ metadata:
If you encounter an issue please reach out on [email protected] email
address. This is a subpackage for the {{ .Service }} API group.
friendly-name.meta.crossplane.io: Provider GCP ({{ .Service }})
auth.upbound.io/group: {{ .ProviderName }}.upbound.io
auth.upbound.io/group: {{ .ProviderAuthGroup }}.upbound.io
spec:
{{ if ne .Service "monolith" }}
crossplane:
Expand Down

0 comments on commit 4ec146b

Please sign in to comment.