diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d18d616..0255e4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,10 +14,6 @@ env: GOLANGCI_VERSION: 'v1.54.0' DOCKER_BUILDX_VERSION: 'v0.9.1' - # 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 }} jobs: detect-noop: runs-on: ubuntu-22.04 @@ -191,14 +187,6 @@ jobs: version: ${{ env.DOCKER_BUILDX_VERSION }} install: true - - name: Login to Upbound - uses: docker/login-action@v1 - 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: Checkout uses: actions/checkout@v3 with: @@ -245,7 +233,3 @@ jobs: with: name: output path: _output/** - - - name: Publish Artifacts - if: env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != '' - run: make publish BRANCH_NAME=${GITHUB_REF##*/} diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml deleted file mode 100644 index a63c4ae..0000000 --- a/.github/workflows/promote.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Promote - -on: - workflow_dispatch: - inputs: - version: - description: 'Release version (e.g. v0.1.0)' - required: true - channel: - description: 'Release channel' - required: true - default: 'stable' - -env: - # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run - # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether - # credentials have been provided before trying to run steps that need them. - DOCKER_USR: ${{ secrets.DOCKER_USR }} - AWS_USR: ${{ secrets.AWS_USR }} - -jobs: - promote-artifacts: - runs-on: ubuntu-22.04 - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: true - - - name: Fetch History - run: git fetch --prune --unshallow - - - name: Login to Docker - uses: docker/login-action@v1 - if: env.DOCKER_USR != '' - with: - username: ${{ secrets.DOCKER_USR }} - password: ${{ secrets.DOCKER_PSW }} - - - name: Promote Artifacts in S3 and Docker Hub - if: env.AWS_USR != '' && env.DOCKER_USR != '' - run: make -j2 promote BRANCH_NAME=${GITHUB_REF##*/} - env: - VERSION: ${{ github.event.inputs.version }} - CHANNEL: ${{ github.event.inputs.channel }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..7f3f48d --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,87 @@ +name: Publish Provider + +on: + push: + tags: + - '**' + workflow_dispatch: {} + +env: + # Common versions + GO_VERSION: '1.23' + GOLANGCI_VERSION: 'v1.54.0' + DOCKER_BUILDX_VERSION: 'v0.9.1' + + # Registry/Org names + CROSSPLANE_REGORG: 'ghcr.io/infitx-org' + +jobs: + publish-provider: + runs-on: ubuntu-latest + steps: + - name: Setup QEMU + uses: docker/setup-qemu-action@v2 + with: + platforms: all + + - name: Setup Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + version: ${{ env.DOCKER_BUILDX_VERSION }} + install: true + + - name: Checkout + uses: actions/checkout@v3 + with: + submodules: true + + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + registry: ${{ env.CROSSPLANE_REGORG }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Fetch History + run: git fetch --prune --unshallow + + - name: Setup Go + uses: actions/setup-go@v3 + with: + go-version: ${{ env.GO_VERSION }} + + - name: Find the Go Build Cache + id: go + run: echo "cachedir=$(make go.cachedir)" >> $GITHUB_ENV + + - name: Cache the Go Build Cache + uses: actions/cache@v3 + with: + path: ${{ env.cachedir }} + key: ${{ runner.os }}-build-publish-provider-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-build-publish-provider- + + - name: Cache Go Dependencies + uses: actions/cache@v3 + with: + path: .work/pkg + key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-pkg- + + - name: Download Go Modules + run: make modules.download modules.check + + - name: Build Provider + run: make -j2 build.all + env: + # We're using docker buildx, which doesn't actually load the images it + # builds by default. Specifying --load does so. + BUILD_ARGS: "--load" + + - name: Publish Provider + run: | + if [[ $GITHUB_REF == refs/tags/* ]]; then + make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=main + else + make publishBRANCH_NAME=${GITHUB_REF##*/} XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=${GITHUB_REF##*/} + fi diff --git a/Makefile b/Makefile index 013a2c1..1b06473 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # ==================================================================================== # Setup Project -PROJECT_NAME := provider-netbird +PROJECT_NAME := netbird-crossplane-provider PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME) PLATFORMS ?= linux_amd64 linux_arm64 @@ -30,7 +30,7 @@ GO111MODULE = on # ==================================================================================== # Setup Images -IMAGES = provider-netbird +IMAGES = netbird-crossplane-provider -include build/makelib/imagelight.mk # ==================================================================================== @@ -40,12 +40,12 @@ XPKG_REG_ORGS ?= xpkg.upbound.io/crossplane # NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are # inferred. XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/crossplane -XPKGS = provider-netbird +XPKGS = netbird-crossplane-provider -include build/makelib/xpkg.mk # NOTE(hasheddan): we force image building to happen prior to xpkg build so that # we ensure image is present in daemon. -xpkg.build.provider-netbird: do.build.images +xpkg.build.netbird-crossplane-provider: do.build.images fallthrough: submodules @echo Initial setup complete. Running make again . . . diff --git a/PROVIDER_CHECKLIST.md b/PROVIDER_CHECKLIST.md index 98f8328..fb469f0 100644 --- a/PROVIDER_CHECKLIST.md +++ b/PROVIDER_CHECKLIST.md @@ -30,7 +30,7 @@ Generally projects are named `provider-`, with `name` being the API being managed. Example project names are `provider-aws`, `provider-kubernetes`, and `provider-github`. -The [provider-netbird](https://github.com/crossplane/provider-netbird) repository can be +The [netbird-crossplane-provider](https://github.com/crossplane/netbird-crossplane-provider) repository can be used as a starting point for new providers. For [terrajet](https://github.com/crossplane/terrajet)-based providers, the [provider-jet-netbird](https://github.com/crossplane-contrib/provider-jet-netbird) is available. @@ -43,17 +43,17 @@ Most Crossplane providers include the following files: [provider-gcp/README.md](https://github.com/crossplane/provider-gcp/blob/master/README.md) as an example) - [ ] Code is licensed under the [Apache 2.0 - License](https://github.com/crossplane/provider-netbird/blob/main/LICENSE) + License](https://github.com/crossplane/netbird-crossplane-provider/blob/main/LICENSE) - [ ] Include a “Developer Certificate of Origin”. Example: [DCO](https://github.com/upbound/build/blob/master/DCO) - [ ] Include the CNCF [Code of Conduct](https://github.com/crossplane/crossplane/blob/master/CODE_OF_CONDUCT.md) - [ ] Update - [OWNERS.md](https://github.com/crossplane/provider-netbird/blob/main/OWNERS.md) + [OWNERS.md](https://github.com/crossplane/netbird-crossplane-provider/blob/main/OWNERS.md) with contacts for project Owners - [ ] Ensure `hack/boilerplate.go.txt` (used in Code generation) includes Crossplane Authors, Apache license and any other Copyright statements: - [https://github.com/crossplane/provider-netbird/blob/main/hack/boilerplate.go.txt](https://github.com/crossplane/provider-netbird/blob/main/hack/boilerplate.go.txt) + [https://github.com/crossplane/netbird-crossplane-provider/blob/main/hack/boilerplate.go.txt](https://github.com/crossplane/netbird-crossplane-provider/blob/main/hack/boilerplate.go.txt) - [ ] Include Documentation on how to: - [ ] Install Provider - [ ] Contribute to Development @@ -68,7 +68,7 @@ There are a number of build tools and processes that are common across the Crossplane ecosystem. Using these ensures a consistent development environment across projects. -The [provider-netbird](https://github.com/crossplane/provider-netbird) +The [netbird-crossplane-provider](https://github.com/crossplane/netbird-crossplane-provider) repository contains most of these settings. - [ ] Use the [Upbound build](https://github.com/upbound/build) submodule. (see @@ -81,7 +81,7 @@ repository contains most of these settings. - [ ] Create a [Crossplane Package](https://crossplane.io/docs/master/concepts/packages.html) configuration (see - [package/crossplane.yaml)](https://github.com/crossplane/provider-netbird/blob/main/package/crossplane.yaml) + [package/crossplane.yaml)](https://github.com/crossplane/netbird-crossplane-provider/blob/main/package/crossplane.yaml) ## Deployment of Artifacts @@ -96,7 +96,7 @@ the publish and promotion workflows. In general, providers should: - [ ] Utilize GitHub workflows from - + - [ ] Create OCI image repos to push Package and Controller images. - [ ] Automatically push Provider images and packages via CI - [ ] Add GitHub Secrets to push to Docker repository. (To be performed by @@ -113,6 +113,6 @@ to grant your project access to the GitHub org scoped secrets. - [ ] Follow recommendations at [https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md#repository-governance](https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md#repository-governance) - [ ] Enable Issues on your project and configure Issue netbirds (examples at: - [.github/ISSUE_TEMPLATE](https://github.com/crossplane/provider-netbird/tree/master/.github/ISSUE_TEMPLATE)) + [.github/ISSUE_TEMPLATE](https://github.com/crossplane/netbird-crossplane-provider/tree/master/.github/ISSUE_TEMPLATE)) - [ ] Create Pull Request Netbirds: (example: - [PULL_REQUEST_TEMPLATE.md](https://github.com/crossplane/provider-netbird/blob/master/.github/PULL_REQUEST_TEMPLATE.md)) + [PULL_REQUEST_TEMPLATE.md](https://github.com/crossplane/netbird-crossplane-provider/blob/master/.github/PULL_REQUEST_TEMPLATE.md)) diff --git a/README.md b/README.md index 7176215..b38df1c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# provider-netbird +# netbird-crossplane-provider -`provider-netbird` is a minimal [Crossplane](https://crossplane.io/) Provider +`netbird-crossplane-provider` is a minimal [Crossplane](https://crossplane.io/) Provider that is meant to be used as a netbird for implementing new Providers. It comes with the following features that are meant to be refactored: diff --git a/apis/netbird.go b/apis/netbird.go index 16d4e83..c2f3398 100644 --- a/apis/netbird.go +++ b/apis/netbird.go @@ -20,8 +20,8 @@ package apis import ( "k8s.io/apimachinery/pkg/runtime" - netbirdv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - nbgroupv1alpha1 "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" + netbirdv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + nbgroupv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" ) func init() { diff --git a/cluster/images/provider-netbird/Dockerfile b/cluster/images/netbird-crossplane-provider/Dockerfile similarity index 100% rename from cluster/images/provider-netbird/Dockerfile rename to cluster/images/netbird-crossplane-provider/Dockerfile diff --git a/cluster/images/provider-netbird/Makefile b/cluster/images/netbird-crossplane-provider/Makefile similarity index 100% rename from cluster/images/provider-netbird/Makefile rename to cluster/images/netbird-crossplane-provider/Makefile diff --git a/cluster/local/integration_tests.sh b/cluster/local/integration_tests.sh index a637730..a98c72e 100755 --- a/cluster/local/integration_tests.sh +++ b/cluster/local/integration_tests.sh @@ -34,7 +34,7 @@ echo_error(){ # The name of your provider. Many provider Makefiles override this value. -PACKAGE_NAME="provider-netbird" +PACKAGE_NAME="netbird-crossplane-provider" # ------------------------------ diff --git a/cmd/provider/main.go b/cmd/provider/main.go index 3955a52..da359c8 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -37,10 +37,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/resource" - "github.com/crossplane/provider-netbird/apis" - "github.com/crossplane/provider-netbird/apis/v1alpha1" - netbird "github.com/crossplane/provider-netbird/internal/controller" - "github.com/crossplane/provider-netbird/internal/features" + "github.com/crossplane/netbird-crossplane-provider/apis" + "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + netbird "github.com/crossplane/netbird-crossplane-provider/internal/controller" + "github.com/crossplane/netbird-crossplane-provider/internal/features" ) func main() { @@ -60,7 +60,7 @@ func main() { kingpin.MustParse(app.Parse(os.Args[1:])) zl := zap.New(zap.UseDevMode(*debug)) - log := logging.NewLogrLogger(zl.WithName("provider-netbird")) + log := logging.NewLogrLogger(zl.WithName("netbird-crossplane-provider")) if *debug { // The controller-runtime runs with a no-op logger by default. It is // *very* verbose even at info level, so we only provide it a real @@ -86,7 +86,7 @@ func main() { // server. Switching to Leases only and longer leases appears to // alleviate this. LeaderElection: *leaderElection, - LeaderElectionID: "crossplane-leader-election-provider-netbird", + LeaderElectionID: "crossplane-leader-election-netbird-crossplane-provider", LeaderElectionResourceLock: resourcelock.LeasesResourceLock, LeaseDuration: func() *time.Duration { d := 60 * time.Second; return &d }(), RenewDeadline: func() *time.Duration { d := 50 * time.Second; return &d }(), diff --git a/go.mod b/go.mod index 43bc60a..7f8e916 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/crossplane/provider-netbird +module github.com/crossplane/netbird-crossplane-provider go 1.23.0 diff --git a/internal/controller/config/config.go b/internal/controller/config/config.go index 8b98630..3eb363a 100644 --- a/internal/controller/config/config.go +++ b/internal/controller/config/config.go @@ -24,7 +24,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" ctrl "sigs.k8s.io/controller-runtime" - "github.com/crossplane/provider-netbird/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" ) // Setup adds a controller that reconciles ProviderConfigs by accounting for diff --git a/internal/controller/nbaccesstoken/nbaccesstoken.go b/internal/controller/nbaccesstoken/nbaccesstoken.go index 25f79c0..b4ca728 100644 --- a/internal/controller/nbaccesstoken/nbaccesstoken.go +++ b/internal/controller/nbaccesstoken/nbaccesstoken.go @@ -34,10 +34,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" - "github.com/crossplane/provider-netbird/internal/features" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" nbapi "github.com/netbirdio/netbird/management/server/http/api" ) diff --git a/internal/controller/nbaccount/nbaccount.go b/internal/controller/nbaccount/nbaccount.go index 8448389..43c6e38 100644 --- a/internal/controller/nbaccount/nbaccount.go +++ b/internal/controller/nbaccount/nbaccount.go @@ -36,10 +36,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" - "github.com/crossplane/provider-netbird/internal/features" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" "github.com/netbirdio/netbird/management/server/http/api" ) diff --git a/internal/controller/nbdnssetting/nbdnssetting.go b/internal/controller/nbdnssetting/nbdnssetting.go index abc4ab3..c22bd3c 100644 --- a/internal/controller/nbdnssetting/nbdnssetting.go +++ b/internal/controller/nbdnssetting/nbdnssetting.go @@ -35,10 +35,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" - "github.com/crossplane/provider-netbird/internal/features" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" "github.com/netbirdio/netbird/management/server/http/api" ) diff --git a/internal/controller/nbgroup/nbgroup.go b/internal/controller/nbgroup/nbgroup.go index 1bac175..a698685 100644 --- a/internal/controller/nbgroup/nbgroup.go +++ b/internal/controller/nbgroup/nbgroup.go @@ -35,10 +35,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" - "github.com/crossplane/provider-netbird/internal/features" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" nbapi "github.com/netbirdio/netbird/management/server/http/api" ) diff --git a/internal/controller/nbnameserver/nbnameserver.go b/internal/controller/nbnameserver/nbnameserver.go index 48c1881..d431651 100644 --- a/internal/controller/nbnameserver/nbnameserver.go +++ b/internal/controller/nbnameserver/nbnameserver.go @@ -37,11 +37,11 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - "github.com/crossplane/provider-netbird/internal/features" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" nbapi "github.com/netbirdio/netbird/management/server/http/api" ) diff --git a/internal/controller/nbnetwork/nbnetwork.go b/internal/controller/nbnetwork/nbnetwork.go index be43f28..da3651b 100644 --- a/internal/controller/nbnetwork/nbnetwork.go +++ b/internal/controller/nbnetwork/nbnetwork.go @@ -29,10 +29,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" - "github.com/crossplane/provider-netbird/internal/features" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" nbapi "github.com/netbirdio/netbird/management/server/http/api" "github.com/pkg/errors" diff --git a/internal/controller/nbnetworkresource/nbnetworkresource.go b/internal/controller/nbnetworkresource/nbnetworkresource.go index 53bcd67..002c644 100644 --- a/internal/controller/nbnetworkresource/nbnetworkresource.go +++ b/internal/controller/nbnetworkresource/nbnetworkresource.go @@ -29,10 +29,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" - "github.com/crossplane/provider-netbird/internal/features" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" nbapi "github.com/netbirdio/netbird/management/server/http/api" "github.com/pkg/errors" diff --git a/internal/controller/nbnetworkrouter/nbnetworkrouter.go b/internal/controller/nbnetworkrouter/nbnetworkrouter.go index 5002fae..a607840 100644 --- a/internal/controller/nbnetworkrouter/nbnetworkrouter.go +++ b/internal/controller/nbnetworkrouter/nbnetworkrouter.go @@ -29,10 +29,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" - "github.com/crossplane/provider-netbird/internal/features" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" nbapi "github.com/netbirdio/netbird/management/server/http/api" "github.com/pkg/errors" diff --git a/internal/controller/nbsetupkey/nbsetupkey.go b/internal/controller/nbsetupkey/nbsetupkey.go index 8931d26..5a91b48 100644 --- a/internal/controller/nbsetupkey/nbsetupkey.go +++ b/internal/controller/nbsetupkey/nbsetupkey.go @@ -37,10 +37,10 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" - "github.com/crossplane/provider-netbird/internal/features" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" "github.com/netbirdio/netbird/management/server/http/api" ) diff --git a/internal/controller/nbuser/nbuser.go b/internal/controller/nbuser/nbuser.go index fd60918..07ce2d1 100644 --- a/internal/controller/nbuser/nbuser.go +++ b/internal/controller/nbuser/nbuser.go @@ -36,11 +36,11 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - apisv1alpha1 "github.com/crossplane/provider-netbird/apis/v1alpha1" - nbcontrol "github.com/crossplane/provider-netbird/internal/controller/nb" + apisv1alpha1 "github.com/crossplane/netbird-crossplane-provider/apis/v1alpha1" + nbcontrol "github.com/crossplane/netbird-crossplane-provider/internal/controller/nb" - "github.com/crossplane/provider-netbird/apis/vpn/v1alpha1" - "github.com/crossplane/provider-netbird/internal/features" + "github.com/crossplane/netbird-crossplane-provider/apis/vpn/v1alpha1" + "github.com/crossplane/netbird-crossplane-provider/internal/features" netbird "github.com/netbirdio/netbird/management/client/rest" nbapi "github.com/netbirdio/netbird/management/server/http/api" ) diff --git a/internal/controller/netbird.go b/internal/controller/netbird.go index 6903094..0f0cbc3 100644 --- a/internal/controller/netbird.go +++ b/internal/controller/netbird.go @@ -20,14 +20,14 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/controller" ctrl "sigs.k8s.io/controller-runtime" - "github.com/crossplane/provider-netbird/internal/controller/config" - "github.com/crossplane/provider-netbird/internal/controller/nbaccesstoken" - "github.com/crossplane/provider-netbird/internal/controller/nbaccount" - "github.com/crossplane/provider-netbird/internal/controller/nbdnssetting" - "github.com/crossplane/provider-netbird/internal/controller/nbgroup" - "github.com/crossplane/provider-netbird/internal/controller/nbnameserver" - "github.com/crossplane/provider-netbird/internal/controller/nbsetupkey" - "github.com/crossplane/provider-netbird/internal/controller/nbuser" + "github.com/crossplane/netbird-crossplane-provider/internal/controller/config" + "github.com/crossplane/netbird-crossplane-provider/internal/controller/nbaccesstoken" + "github.com/crossplane/netbird-crossplane-provider/internal/controller/nbaccount" + "github.com/crossplane/netbird-crossplane-provider/internal/controller/nbdnssetting" + "github.com/crossplane/netbird-crossplane-provider/internal/controller/nbgroup" + "github.com/crossplane/netbird-crossplane-provider/internal/controller/nbnameserver" + "github.com/crossplane/netbird-crossplane-provider/internal/controller/nbsetupkey" + "github.com/crossplane/netbird-crossplane-provider/internal/controller/nbuser" ) // Setup creates all Netbird controllers with the supplied logger and adds them to diff --git a/package/crossplane.yaml b/package/crossplane.yaml index 353a23d..231d459 100644 --- a/package/crossplane.yaml +++ b/package/crossplane.yaml @@ -1,10 +1,10 @@ apiVersion: meta.pkg.crossplane.io/v1alpha1 kind: Provider metadata: - name: provider-netbird + name: netbird-crossplane-provider annotations: meta.crossplane.io/maintainer: Crossplane Maintainers - meta.crossplane.io/source: github.com/crossplane/provider-netbird + meta.crossplane.io/source: github.com/crossplane/netbird-crossplane-provider meta.crossplane.io/license: Apache-2.0 meta.crossplane.io/description: | A netbird that can be used to create Crossplane providers.