From 0551e403e39fc5c76cb25a4b34a0c63afd2fb72d Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 14:40:01 +0100 Subject: [PATCH 01/16] feat: clean ci.yml and remove promote.yml --- .github/workflows/ci.yml | 16 ------------ .github/workflows/promote.yml | 48 ----------------------------------- 2 files changed, 64 deletions(-) delete mode 100644 .github/workflows/promote.yml 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 }} From 4903ea00e10bf27e45ec5cd7d0b5cfeb746c3b44 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 14:42:25 +0100 Subject: [PATCH 02/16] feat: add new github action publish.yml --- .github/workflows/publish.yml | 95 +++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..6da03e0 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,95 @@ +name: Publish Provider + +on: + push: + branches: + - '**' # TOOD: To be change to run just on tags + pull_request: {} + workflow_dispatch: {} + +env: + # Common versions + GO_VERSION: '1.23' + DOCKER_BUILDX_VERSION: 'v0.20.1' + CLEANUP_DISK: "true" + + # Registry/Org names + CROSSPLANE_REGORG: 'ghcr.io/infitx-org' + +jobs: + publish-provider: + runs-on: ubuntu-latest + steps: + - name: Cleanup Disk + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 + if: ${{ env.CLEANUP_DISK }} == "true" + with: + android: true + dotnet: true + haskell: true + tool-cache: true + large-packages: false + swap-storage: false + + - name: Setup QEMU + uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2 + with: + platforms: all + + - name: Setup Docker Buildx + uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2 + with: + version: ${{ env.DOCKER_BUILDX_VERSION }} + install: true + + - name: Login to GHCR using PAT + uses: docker/login-action@v3.3.0 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Checkout + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + with: + submodules: true + + - 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 Artifacts + 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: | + make -j XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" publish From 3ed206eff7db6ba3742d1be45530b7a8cbdfd60c Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 14:45:51 +0100 Subject: [PATCH 03/16] chore: test github actions --- .github/workflows/publish.yml | 39 +++++++---------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6da03e0..5f642ae 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,8 +10,8 @@ on: env: # Common versions GO_VERSION: '1.23' - DOCKER_BUILDX_VERSION: 'v0.20.1' - CLEANUP_DISK: "true" + GOLANGCI_VERSION: 'v1.54.0' + DOCKER_BUILDX_VERSION: 'v0.9.1' # Registry/Org names CROSSPLANE_REGORG: 'ghcr.io/infitx-org' @@ -20,37 +20,19 @@ jobs: publish-provider: runs-on: ubuntu-latest steps: - - name: Cleanup Disk - uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 - if: ${{ env.CLEANUP_DISK }} == "true" - with: - android: true - dotnet: true - haskell: true - tool-cache: true - large-packages: false - swap-storage: false - - name: Setup QEMU - uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2 + uses: docker/setup-qemu-action@v2 with: platforms: all - name: Setup Docker Buildx - uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2 + uses: docker/setup-buildx-action@v2 with: version: ${{ env.DOCKER_BUILDX_VERSION }} install: true - - name: Login to GHCR using PAT - uses: docker/login-action@v3.3.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@v3 with: submodules: true @@ -70,8 +52,8 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.cachedir }} - key: ${{ runner.os }}-build-publish-provider-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-build-publish-provider- + key: ${{ runner.os }}-build-publish-artifacts-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-build-publish-artifacts- - name: Cache Go Dependencies uses: actions/cache@v3 @@ -83,13 +65,6 @@ jobs: - name: Download Go Modules run: make modules.download modules.check - - name: Build Artifacts - 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: | make -j XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" publish From c86c81af6a60e3a78b180856d9ee719d44128dc3 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 14:46:29 +0100 Subject: [PATCH 04/16] chore: test github actions --- .github/workflows/publish.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5f642ae..4ed6b28 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -52,8 +52,8 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.cachedir }} - key: ${{ runner.os }}-build-publish-artifacts-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-build-publish-artifacts- + key: ${{ runner.os }}-build-publish-provider-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-build-publish-provider- - name: Cache Go Dependencies uses: actions/cache@v3 @@ -65,6 +65,13 @@ jobs: - 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: | make -j XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" publish From fcb3a9c507e9b7f19190ad7db943d9c6526ca025 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 14:49:43 +0100 Subject: [PATCH 05/16] chore: test github actions --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4ed6b28..60ccb44 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -74,4 +74,4 @@ jobs: - name: Publish Provider run: | - make -j XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" publish + make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" From aa5d6b83ea2d669c8d499c36559a9aa7ac3dfaf4 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 14:55:12 +0100 Subject: [PATCH 06/16] chore: test github actions --- .github/workflows/publish.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 60ccb44..0f7d4fb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,6 +36,13 @@ jobs: 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 From f1fae763212950819c4b779cd649a2d6e5ee363e Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 15:57:36 +0100 Subject: [PATCH 07/16] feat: change project repo in makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 013a2c1..78a0fe9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # ==================================================================================== # Setup Project PROJECT_NAME := provider-netbird -PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME) +PROJECT_REPO := github.com/crossplane/netbird-crossplane-provider PLATFORMS ?= linux_amd64 linux_arm64 -include build/makelib/common.mk From 1eec2e2064223237009bf0f46de1cc98af3981f3 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 15:58:06 +0100 Subject: [PATCH 08/16] feat: change project repo in makefile back --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 78a0fe9..013a2c1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # ==================================================================================== # Setup Project PROJECT_NAME := provider-netbird -PROJECT_REPO := github.com/crossplane/netbird-crossplane-provider +PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME) PLATFORMS ?= linux_amd64 linux_arm64 -include build/makelib/common.mk From 0f6e27e09b627277b6d813fe3242917572b75185 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 16:06:46 +0100 Subject: [PATCH 09/16] feat: rename provider from "provider-netbird" to "netbird-crossplane-provider" --- Makefile | 8 ++++---- PROVIDER_CHECKLIST.md | 18 +++++++++--------- README.md | 4 ++-- apis/netbird.go | 4 ++-- cluster/local/integration_tests.sh | 2 +- cmd/provider/main.go | 12 ++++++------ go.mod | 2 +- internal/controller/config/config.go | 2 +- .../controller/nbaccesstoken/nbaccesstoken.go | 8 ++++---- internal/controller/nbaccount/nbaccount.go | 8 ++++---- .../controller/nbdnssetting/nbdnssetting.go | 8 ++++---- internal/controller/nbgroup/nbgroup.go | 8 ++++---- .../controller/nbnameserver/nbnameserver.go | 8 ++++---- internal/controller/nbnetwork/nbnetwork.go | 8 ++++---- .../nbnetworkresource/nbnetworkresource.go | 8 ++++---- .../nbnetworkrouter/nbnetworkrouter.go | 8 ++++---- internal/controller/nbsetupkey/nbsetupkey.go | 8 ++++---- internal/controller/nbuser/nbuser.go | 8 ++++---- internal/controller/netbird.go | 16 ++++++++-------- package/crossplane.yaml | 4 ++-- 20 files changed, 76 insertions(+), 76 deletions(-) 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/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. From b8217bbaa9e6608857bcd460dbe3d74fe2ea8e54 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 16:08:00 +0100 Subject: [PATCH 10/16] feat: rename cluster image --- .../{provider-netbird => netbird-crossplane-provider}/Dockerfile | 0 .../{provider-netbird => netbird-crossplane-provider}/Makefile | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename cluster/images/{provider-netbird => netbird-crossplane-provider}/Dockerfile (100%) rename cluster/images/{provider-netbird => netbird-crossplane-provider}/Makefile (100%) 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 From 39148ce9a0d1eb1fa2aed7abc6f86678b1e05f40 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 16:14:22 +0100 Subject: [PATCH 11/16] feat: Add branch name --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0f7d4fb..74cc25f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -81,4 +81,4 @@ jobs: - name: Publish Provider run: | - make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" + make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=${GITHUB_REF##*/} From 1116f24ad4d035b16094b41022fa763c6a707674 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 16:18:03 +0100 Subject: [PATCH 12/16] chote: test with branch name main --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 74cc25f..3f77063 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -78,7 +78,7 @@ jobs: # We're using docker buildx, which doesn't actually load the images it # builds by default. Specifying --load does so. BUILD_ARGS: "--load" - +# make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=${GITHUB_REF##*/} - name: Publish Provider run: | - make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=${GITHUB_REF##*/} + make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=main From 470d265611fd5a01aa3b86853336f3eaf750a38e Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 16:21:07 +0100 Subject: [PATCH 13/16] chore: cahnge to run only on tags --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3f77063..ebe6d82 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,8 +2,8 @@ name: Publish Provider on: push: - branches: - - '**' # TOOD: To be change to run just on tags + tags: + - '**' pull_request: {} workflow_dispatch: {} @@ -78,7 +78,7 @@ jobs: # We're using docker buildx, which doesn't actually load the images it # builds by default. Specifying --load does so. BUILD_ARGS: "--load" -# make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=${GITHUB_REF##*/} + - name: Publish Provider run: | - make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=main + make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=${GITHUB_REF##*/} From 310e86bd8ce11769757e4335ed07e1d6b4b8c222 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 16:28:24 +0100 Subject: [PATCH 14/16] feat: remove pr from trigger on publish cicd --- .github/workflows/publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ebe6d82..0ef892e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,6 @@ on: push: tags: - '**' - pull_request: {} workflow_dispatch: {} env: From d456f687cbddd958339acce52a0d17418b32e67f Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 16:33:19 +0100 Subject: [PATCH 15/16] feat: improve publish handling --- .github/workflows/publish.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0ef892e..dfa22b5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -80,4 +80,8 @@ jobs: - name: Publish Provider run: | - make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" BRANCH_NAME=${GITHUB_REF##*/} + if [[ $GITHUB_REF == refs/tags/* ]]; then + make publish XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" XPKG_REG_ORGS_NO_PROMOTE="${{ env.CROSSPLANE_REGORG }}" + 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 From 2f75d29f080f792db47e09e94a80f9c9c4d80177 Mon Sep 17 00:00:00 2001 From: Radek Forgac Date: Wed, 26 Mar 2025 16:39:35 +0100 Subject: [PATCH 16/16] fix: branch_name issues --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index dfa22b5..7f3f48d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -81,7 +81,7 @@ jobs: - 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 }}" + 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