Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: moving to the crossplane-contrib org #3

Merged
merged 1 commit into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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##*/}
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<div align="center">

![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)

</div>

Expand Down Expand Up @@ -66,25 +66,25 @@ 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:
```bash
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:

Expand All @@ -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
Expand Down Expand Up @@ -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).
6 changes: 3 additions & 3 deletions apis/zz_register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/generator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
12 changes: 6 additions & 6 deletions cmd/provider/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions config/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/tampakrap/provider-spotify
module github.com/crossplane-contrib/provider-spotify

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion internal/clients/spotify.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/playlist/playlist/zz_controller.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/controller/providerconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/zz_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package/crossplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ metadata:
name: provider-spotify
annotations:
meta.crossplane.io/maintainer: "Theo Chatzimichos <[email protected]>"
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.
Loading