diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd3d7fc..6cbfe95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,6 @@ env: # Common users. We can't run a step 'if secrets.XXX != ""' but we can run a # step 'if env.XXX != ""', so we copy these to succinctly test whether # credentials have been provided before trying to run steps that need them. - UPBOUND_MARKETPLACE_PUSH_ROBOT_USR: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }} XPKG_ACCESS_ID: ${{ secrets.XPKG_ACCESS_ID }} jobs: @@ -257,13 +256,13 @@ jobs: version: ${{ env.DOCKER_BUILDX_VERSION }} install: true - #- name: Login to Upbound - # uses: docker/login-action@v2 - # if: env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != '' - # with: - # registry: xpkg.upbound.io - # username: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }} - # password: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }} + - name: Login to Upbound + uses: docker/login-action@v2 + if: env.XPKG_ACCESS_ID != '' + with: + registry: xpkg.upbound.io + username: ${{ secrets.XPKG_ACCESS_ID }} + password: ${{ secrets.XPKG_TOKEN }} - name: Checkout uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 @@ -312,9 +311,5 @@ jobs: name: output path: _output/** - - name: Login to Upbound via up login - if: env.XPKG_ACCESS_ID != '' - run: make up.login TOKEN=${{ secrets.XPKG_TOKEN }} - - name: Publish Artifacts run: make publish BRANCH_NAME=${GITHUB_REF##*/} diff --git a/Makefile b/Makefile index def40b7..7b13e37 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Setup Project PROJECT_NAME ?= provider-spotify -PROJECT_REPO ?= github.com/tampakrap/$(PROJECT_NAME) +PROJECT_REPO ?= github.com/crossplane-contrib/$(PROJECT_NAME) export TERRAFORM_VERSION ?= 1.7.2 @@ -58,17 +58,17 @@ UPTEST_VERSION = v0.5.0 # ==================================================================================== # Setup Images -REGISTRY_ORGS ?= xpkg.upbound.io/tampakrap +REGISTRY_ORGS ?= xpkg.upbound.io/crossplane-contrib IMAGES = $(PROJECT_NAME) -include build/makelib/imagelight.mk # ==================================================================================== # Setup XPKG -XPKG_REG_ORGS ?= xpkg.upbound.io/tampakrap +XPKG_REG_ORGS ?= xpkg.upbound.io/crossplane-contrib # NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are # inferred. -XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/tampakrap +XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/crossplane-contrib XPKGS = $(PROJECT_NAME) -include build/makelib/xpkg.mk diff --git a/README.md b/README.md index c67c40e..6988d60 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@
-![CI](https://github.com/tampakrap/provider-spotify/workflows/CI/badge.svg) -[![GitHub release](https://img.shields.io/github/release/tampakrap/provider-spotify/all.svg?style=flat-square)](https://github.com/tampakrap/provider-spotify/releases) -[![Go Report Card](https://goreportcard.com/badge/github.com/tampakrap/provider-spotify)](https://goreportcard.com/report/github.com/tampakrap/provider-spotify) +![CI](https://github.com/crossplane-contrib/provider-spotify/workflows/CI/badge.svg) +[![GitHub release](https://img.shields.io/github/release/crossplane-contrib/provider-spotify/all.svg?style=flat-square)](https://github.com/crossplane-contrib/provider-spotify/releases) +[![Go Report Card](https://goreportcard.com/badge/github.com/crossplane-contrib/provider-spotify)](https://goreportcard.com/report/github.com/crossplane-contrib/provider-spotify)
@@ -66,17 +66,17 @@ sed -e "s/YOUR_API_KEY/$SPOTIFY_API_KEY/" examples/providerconfig/secret.yaml.tm ### Installation Install the provider by using the following command after changing the image tag -to the [latest release](https://marketplace.upbound.io/providers/tampakrap/provider-spotify) +to the [latest release](https://marketplace.upbound.io/providers/crossplane-contrib/provider-spotify) using either of the following methods: - Using [up](https://docs.upbound.io/reference/cli/): ```bash - up ctp provider install tampakrap/provider-spotify:v0.1.0 + up ctp provider install crossplane-contrib/provider-spotify:v0.1.0 ``` - Using [crossplane](https://docs.crossplane.io/latest/cli/): ```bash - crossplane xpkg install provider tampakrap/provider-spotify:v0.1.0 + crossplane xpkg install provider crossplane-contrib/provider-spotify:v0.1.0 ``` - Using declarative installation: @@ -84,7 +84,7 @@ using either of the following methods: kubectl apply -f examples/install.yaml ``` -You can see the API reference [here](https://doc.crds.dev/github.com/tampakrap/provider-spotify). +You can see the API reference [here](https://doc.crds.dev/github.com/crossplane-contrib/provider-spotify). Finally, you can install the Secret and the ProviderConfig: @@ -95,8 +95,8 @@ kubectl apply -f examples/providerconfig/ You should get outputs similar to the following: ``` ➜ kubeclt get providers -NAME INSTALLED HEALTHY PACKAGE AGE -provider-spotify True True tampakrap/provider-spotify:v0.1.0 12m +NAME INSTALLED HEALTHY PACKAGE AGE +provider-spotify True True crossplane-contrib/provider-spotify:v0.1.0 12m ➜ kubectl get spotify NAME AGE providerconfig.spotify.crossplane.io/default 4m9s @@ -151,4 +151,4 @@ make build ## Report a Bug For filing bugs, suggesting improvements, or requesting new features, please -open an [issue](https://github.com/tampakrap/provider-spotify/issues). +open an [issue](https://github.com/crossplane-contrib/provider-spotify/issues). diff --git a/apis/zz_register.go b/apis/zz_register.go index a8047f9..039e5a1 100755 --- a/apis/zz_register.go +++ b/apis/zz_register.go @@ -14,9 +14,9 @@ package apis import ( "k8s.io/apimachinery/pkg/runtime" - v1alpha1 "github.com/tampakrap/provider-spotify/apis/playlist/v1alpha1" - v1alpha1apis "github.com/tampakrap/provider-spotify/apis/v1alpha1" - v1beta1 "github.com/tampakrap/provider-spotify/apis/v1beta1" + v1alpha1 "github.com/crossplane-contrib/provider-spotify/apis/playlist/v1alpha1" + v1alpha1apis "github.com/crossplane-contrib/provider-spotify/apis/v1alpha1" + v1beta1 "github.com/crossplane-contrib/provider-spotify/apis/v1beta1" ) func init() { diff --git a/cmd/generator/main.go b/cmd/generator/main.go index fdf50c2..c55b399 100644 --- a/cmd/generator/main.go +++ b/cmd/generator/main.go @@ -11,7 +11,7 @@ import ( "github.com/crossplane/upjet/pkg/pipeline" - "github.com/tampakrap/provider-spotify/config" + "github.com/crossplane-contrib/provider-spotify/config" ) func main() { diff --git a/cmd/provider/main.go b/cmd/provider/main.go index 2456a8a..267eaf8 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -26,12 +26,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/tampakrap/provider-spotify/apis" - "github.com/tampakrap/provider-spotify/apis/v1alpha1" - "github.com/tampakrap/provider-spotify/config" - "github.com/tampakrap/provider-spotify/internal/clients" - "github.com/tampakrap/provider-spotify/internal/controller" - "github.com/tampakrap/provider-spotify/internal/features" + "github.com/crossplane-contrib/provider-spotify/apis" + "github.com/crossplane-contrib/provider-spotify/apis/v1alpha1" + "github.com/crossplane-contrib/provider-spotify/config" + "github.com/crossplane-contrib/provider-spotify/internal/clients" + "github.com/crossplane-contrib/provider-spotify/internal/controller" + "github.com/crossplane-contrib/provider-spotify/internal/features" ) func main() { diff --git a/config/provider.go b/config/provider.go index efcecd0..3798659 100644 --- a/config/provider.go +++ b/config/provider.go @@ -10,12 +10,12 @@ import ( ujconfig "github.com/crossplane/upjet/pkg/config" - "github.com/tampakrap/provider-spotify/config/playlist" + "github.com/crossplane-contrib/provider-spotify/config/playlist" ) const ( resourcePrefix = "spotify" - modulePath = "github.com/tampakrap/provider-spotify" + modulePath = "github.com/crossplane-contrib/provider-spotify" ) //go:embed schema.json diff --git a/examples/install.yaml b/examples/install.yaml index 5d9582c..3440aa6 100644 --- a/examples/install.yaml +++ b/examples/install.yaml @@ -3,4 +3,4 @@ kind: Provider metadata: name: provider-spotify spec: - package: tampakrap/provider-spotify:v0.1.0 + package: crossplane-contrib/provider-spotify:v0.1.0 diff --git a/go.mod b/go.mod index 536aaa8..c4e8de6 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tampakrap/provider-spotify +module github.com/crossplane-contrib/provider-spotify go 1.19 diff --git a/internal/clients/spotify.go b/internal/clients/spotify.go index 22cdd31..37d1c3f 100644 --- a/internal/clients/spotify.go +++ b/internal/clients/spotify.go @@ -15,7 +15,7 @@ import ( "github.com/crossplane/upjet/pkg/terraform" - "github.com/tampakrap/provider-spotify/apis/v1beta1" + "github.com/crossplane-contrib/provider-spotify/apis/v1beta1" ) const ( diff --git a/internal/controller/playlist/playlist/zz_controller.go b/internal/controller/playlist/playlist/zz_controller.go index 539af47..bf84b43 100755 --- a/internal/controller/playlist/playlist/zz_controller.go +++ b/internal/controller/playlist/playlist/zz_controller.go @@ -23,8 +23,8 @@ import ( "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" - v1alpha1 "github.com/tampakrap/provider-spotify/apis/playlist/v1alpha1" - features "github.com/tampakrap/provider-spotify/internal/features" + v1alpha1 "github.com/crossplane-contrib/provider-spotify/apis/playlist/v1alpha1" + features "github.com/crossplane-contrib/provider-spotify/internal/features" ) // Setup adds a controller that reconciles Playlist managed resources. diff --git a/internal/controller/providerconfig/config.go b/internal/controller/providerconfig/config.go index d2f0c84..abb8ed3 100644 --- a/internal/controller/providerconfig/config.go +++ b/internal/controller/providerconfig/config.go @@ -11,7 +11,7 @@ import ( "github.com/crossplane/upjet/pkg/controller" ctrl "sigs.k8s.io/controller-runtime" - "github.com/tampakrap/provider-spotify/apis/v1beta1" + "github.com/crossplane-contrib/provider-spotify/apis/v1beta1" ) // Setup adds a controller that reconciles ProviderConfigs by accounting for diff --git a/internal/controller/zz_setup.go b/internal/controller/zz_setup.go index 90a3c63..085ca9b 100755 --- a/internal/controller/zz_setup.go +++ b/internal/controller/zz_setup.go @@ -9,8 +9,8 @@ import ( "github.com/crossplane/upjet/pkg/controller" - playlist "github.com/tampakrap/provider-spotify/internal/controller/playlist/playlist" - providerconfig "github.com/tampakrap/provider-spotify/internal/controller/providerconfig" + playlist "github.com/crossplane-contrib/provider-spotify/internal/controller/playlist/playlist" + providerconfig "github.com/crossplane-contrib/provider-spotify/internal/controller/providerconfig" ) // Setup creates all controllers with the supplied logger and adds them to diff --git a/package/crossplane.yaml b/package/crossplane.yaml index 2d6e41f..8eebc79 100644 --- a/package/crossplane.yaml +++ b/package/crossplane.yaml @@ -4,11 +4,11 @@ metadata: name: provider-spotify annotations: meta.crossplane.io/maintainer: "Theo Chatzimichos " - meta.crossplane.io/source: https://github.com/tampakrap/provider-spotify + meta.crossplane.io/source: https://github.com/crossplane-contrib/provider-spotify meta.crossplane.io/license: Apache-2.0 meta.crossplane.io/description: A Crossplane provider for managing Spotify playlists in Kubernetes. meta.crossplane.io/readme: | `provider-spotify` is a Crossplane provider for managing Spotify playlists in Kubernetes. - It is based on the Terraform Spotify provider. Read the [README](https://github.com/tampakrap/provider-spotify/blob/main/README.md) + It is based on the Terraform Spotify provider. Read the [README](https://github.com/crossplane-contrib/provider-spotify/blob/main/README.md) for instructions.