Skip to content

Commit 90fdc76

Browse files
authored
Merge pull request #111 from jastang/support-package-extensions
Update template with latest CI and QoL updates.
2 parents 67e27f0 + 356edad commit 90fdc76

File tree

9 files changed

+57
-16
lines changed

9 files changed

+57
-16
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -262,14 +262,6 @@ jobs:
262262
version: ${{ env.DOCKER_BUILDX_VERSION }}
263263
install: true
264264

265-
- name: Login to Upbound
266-
uses: docker/login-action@v3
267-
if: env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != ''
268-
with:
269-
registry: xpkg.upbound.io
270-
username: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }}
271-
password: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }}
272-
273265
- name: Checkout
274266
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
275267
with:
@@ -316,7 +308,3 @@ jobs:
316308
with:
317309
name: output
318310
path: _output/**
319-
320-
- name: Publish Artifacts
321-
if: env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != ''
322-
run: make publish BRANCH_NAME=${GITHUB_REF##*/}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Publish Provider Package
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: "Version string to use while publishing the package (e.g. v1.0.0-alpha.1)"
8+
default: ''
9+
required: false
10+
go-version:
11+
description: 'Go version to use if building needs to be done'
12+
default: '1.23'
13+
required: false
14+
15+
jobs:
16+
publish-provider-package:
17+
uses: crossplane-contrib/provider-workflows/.github/workflows/publish-provider-non-family.yml@main
18+
with:
19+
repository: provider-template
20+
version: ${{ github.event.inputs.version }}
21+
go-version: ${{ github.event.inputs.go-version }}
22+
cleanup-disk: true
23+
secrets:
24+
GHCR_PAT: ${{ secrets.GITHUB_TOKEN }}
25+
XPKG_MIRROR_TOKEN: ${{ secrets.XPKG_MIRROR_TOKEN }}
26+
XPKG_MIRROR_ACCESS_ID: ${{ secrets.XPKG_MIRROR_ACCESS_ID }}

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@ GO_SUBDIRS += cmd internal apis
5555
# Setup Kubernetes tools
5656

5757
KIND_VERSION = v0.15.0
58-
UP_VERSION = v0.28.0
58+
UP_VERSION = v0.39.0
5959
UP_CHANNEL = stable
6060
UPTEST_VERSION = v0.5.0
6161
-include build/makelib/k8s_tools.mk
6262

6363
# ====================================================================================
6464
# Setup Images
6565

66-
REGISTRY_ORGS ?= xpkg.upbound.io/upbound
66+
REGISTRY_ORGS ?= ghcr.io/crossplane-contrib
6767
IMAGES = $(PROJECT_NAME)
6868
-include build/makelib/imagelight.mk
6969

7070
# ====================================================================================
7171
# Setup XPKG
7272

73-
XPKG_REG_ORGS ?= xpkg.upbound.io/upbound
73+
XPKG_REG_ORGS ?= ghcr.io/crossplane-contrib
7474
# NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are
7575
# inferred.
76-
XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/upbound
76+
XPKG_REG_ORGS_NO_PROMOTE ?= ghcr.io/crossplane-contrib
7777
XPKGS = $(PROJECT_NAME)
7878
-include build/makelib/xpkg.mk
7979

extensions/icons/USAGE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Usage
2+
3+
Replace `icon.svg` with an image of your choice to be used as an icon for the [Upbound Marketplace](https://marketplace.upbound.io/).
4+
5+
The image must:
6+
7+
- be named `icon.svg`
8+
- have square dimensions
9+
- be a valid [SVG](https://www.svgviewer.dev/)

extensions/icons/icon.svg

Loading

extensions/readme/USAGE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Usage
2+
3+
Replace `readme.md` with a Markdown file of your choice to be used as a detailed README for the [Upbound Marketplace](https://marketplace.upbound.io/).
4+
5+
By default, the top-level README.md in the GitHub repo may be used.
6+
7+
The file must:
8+
9+
- be named `readme.md`
10+
- contain valid Markdown content

extensions/readme/readme.md

Whitespace-only changes.

extensions/release-notes/USAGE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Usage
2+
3+
Replace `release_notes.md` with a Markdown file of your choice to be used as release notes for your Provider in the [Upbound Marketplace](https://marketplace.upbound.io/).
4+
5+
The file must:
6+
7+
- be named `release_notes.md`
8+
- contain valid Markdown content

extensions/release-notes/release_notes.md

Whitespace-only changes.

0 commit comments

Comments
 (0)