diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5320791..94335b5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -71,4 +71,5 @@ jobs: password: ${{ secrets.XPKG_TOKEN }} - name: Publish Artifacts - run: make -j2 publish BRANCH_NAME=${GITHUB_REF##*/} \ No newline at end of file + if: env.XPKG_ACCESS_ID != '' + run: make -j2 publish BRANCH_NAME=${GITHUB_REF##*/} diff --git a/Makefile b/Makefile index f0df011..7798d70 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,15 @@ PLATFORMS ?= linux_amd64 # ==================================================================================== # Setup Kubernetes tools -UP_VERSION = v0.13.0 +UP_VERSION = v0.21.0 UP_CHANNEL = stable -UPTEST_VERSION = v0.2.1 +UPTEST_VERSION = v0.6.1 -include build/makelib/k8s_tools.mk # ==================================================================================== # Setup XPKG +XPKG_DIR = $(shell pwd) +XPKG_IGNORE = .github/workflows/*.yaml,.github/workflows/*.yml,examples/*.yaml,.work/uptest-datasource.yaml XPKG_REG_ORGS ?= xpkg.upbound.io/upbound # NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are # inferred. @@ -26,6 +28,7 @@ XPKGS = $(PROJECT_NAME) -include build/makelib/xpkg.mk CROSSPLANE_NAMESPACE = upbound-system +CROSSPLANE_ARGS = "--enable-usages" -include build/makelib/local.xpkg.mk -include build/makelib/controlplane.mk diff --git a/package/app/composition.yaml b/apis/app/composition.yaml similarity index 100% rename from package/app/composition.yaml rename to apis/app/composition.yaml diff --git a/package/app/definition.yaml b/apis/app/definition.yaml similarity index 100% rename from package/app/definition.yaml rename to apis/app/definition.yaml diff --git a/package/cluster/aks/composition.yaml b/apis/cluster/aks/composition.yaml similarity index 100% rename from package/cluster/aks/composition.yaml rename to apis/cluster/aks/composition.yaml diff --git a/package/cluster/aks/definition.yaml b/apis/cluster/aks/definition.yaml similarity index 100% rename from package/cluster/aks/definition.yaml rename to apis/cluster/aks/definition.yaml diff --git a/package/cluster/composition.yaml b/apis/cluster/composition.yaml similarity index 100% rename from package/cluster/composition.yaml rename to apis/cluster/composition.yaml diff --git a/package/cluster/definition.yaml b/apis/cluster/definition.yaml similarity index 100% rename from package/cluster/definition.yaml rename to apis/cluster/definition.yaml diff --git a/package/cluster/network/composition.yaml b/apis/cluster/network/composition.yaml similarity index 100% rename from package/cluster/network/composition.yaml rename to apis/cluster/network/composition.yaml diff --git a/package/cluster/network/definition.yaml b/apis/cluster/network/definition.yaml similarity index 100% rename from package/cluster/network/definition.yaml rename to apis/cluster/network/definition.yaml diff --git a/package/cluster/services/composition.yaml b/apis/cluster/services/composition.yaml similarity index 100% rename from package/cluster/services/composition.yaml rename to apis/cluster/services/composition.yaml diff --git a/package/cluster/services/definition.yaml b/apis/cluster/services/definition.yaml similarity index 100% rename from package/cluster/services/definition.yaml rename to apis/cluster/services/definition.yaml diff --git a/package/database/sqlinstance/composition-mariadb.yaml b/apis/database/sqlinstance/composition-mariadb.yaml similarity index 100% rename from package/database/sqlinstance/composition-mariadb.yaml rename to apis/database/sqlinstance/composition-mariadb.yaml diff --git a/package/database/sqlinstance/composition-postgresql.yaml b/apis/database/sqlinstance/composition-postgresql.yaml similarity index 100% rename from package/database/sqlinstance/composition-postgresql.yaml rename to apis/database/sqlinstance/composition-postgresql.yaml diff --git a/package/database/sqlinstance/definition.yaml b/apis/database/sqlinstance/definition.yaml similarity index 100% rename from package/database/sqlinstance/definition.yaml rename to apis/database/sqlinstance/definition.yaml diff --git a/build b/build index cc6539e..2672eeb 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit cc6539e738e14e5322911639e2173f54dd21c9d0 +Subproject commit 2672eeb767636ec837aa7c63cd7e26e6089fa810 diff --git a/package/crossplane.yaml b/crossplane.yaml similarity index 100% rename from package/crossplane.yaml rename to crossplane.yaml diff --git a/docs/.DS_Store b/docs/.DS_Store deleted file mode 100644 index de0a5cd..0000000 Binary files a/docs/.DS_Store and /dev/null differ diff --git a/docs/media/2022-01-12-15-56-26.png b/docs/media/2022-01-12-15-56-26.png deleted file mode 100644 index 0a637a1..0000000 Binary files a/docs/media/2022-01-12-15-56-26.png and /dev/null differ diff --git a/docs/media/2022-01-12-16-04-13.png b/docs/media/2022-01-12-16-04-13.png deleted file mode 100644 index a035a66..0000000 Binary files a/docs/media/2022-01-12-16-04-13.png and /dev/null differ diff --git a/docs/media/2022-01-12-16-12-00.png b/docs/media/2022-01-12-16-12-00.png deleted file mode 100644 index e98ba84..0000000 Binary files a/docs/media/2022-01-12-16-12-00.png and /dev/null differ diff --git a/docs/media/2022-01-12-16-33-26.png b/docs/media/2022-01-12-16-33-26.png deleted file mode 100644 index 121252e..0000000 Binary files a/docs/media/2022-01-12-16-33-26.png and /dev/null differ diff --git a/docs/media/2022-01-12-16-41-47.png b/docs/media/2022-01-12-16-41-47.png deleted file mode 100644 index 237a769..0000000 Binary files a/docs/media/2022-01-12-16-41-47.png and /dev/null differ diff --git a/docs/media/compose.png b/docs/media/compose.png deleted file mode 100644 index 72ae3aa..0000000 Binary files a/docs/media/compose.png and /dev/null differ diff --git a/docs/media/pushToRepo.png b/docs/media/pushToRepo.png deleted file mode 100644 index a035a66..0000000 Binary files a/docs/media/pushToRepo.png and /dev/null differ diff --git a/docs/media/repository-empty.png b/docs/media/repository-empty.png deleted file mode 100644 index 0a637a1..0000000 Binary files a/docs/media/repository-empty.png and /dev/null differ diff --git a/docs/media/upbound.png b/docs/media/upbound.png deleted file mode 100644 index 180a91e..0000000 Binary files a/docs/media/upbound.png and /dev/null differ