From 2f43687349bcf9346f233ca9a4af0e541a545f1b Mon Sep 17 00:00:00 2001
From: M Essam Hamed <github@messam.xyz>
Date: Tue, 4 Mar 2025 23:14:06 +0200
Subject: [PATCH] Remove goreleaser and fix helm packaging

---
 .github/workflows/docker.yml                  |  76 ++++----
 .github/workflows/helm.yml                    |  52 ++----
 .github/workflows/test-chart.yml              |   4 +-
 .goreleaser.yaml                              |  86 ---------
 Makefile                                      |  12 +-
 README.md                                     |   6 +-
 .../.helmignore                               |   0
 .../Chart.yaml                                |   2 +-
 .../crds/netbird.io_nbsetupkeys.yaml          |   0
 helm/kubernetes-operator/secretvalues.yaml    |  16 ++
 .../templates/NOTES.txt                       |   0
 .../templates/_helpers.tpl                    |  38 ++--
 .../templates/deployment.yaml                 |  12 +-
 .../templates/rbac.yaml                       |  24 +--
 .../templates/service.yaml                    |  12 +-
 .../templates/serviceaccount.yaml             |   4 +-
 .../templates/webhook.yaml                    |  40 ++--
 .../values.yaml                               |   0
 internal/controller/suite_test.go             |   2 +-
 internal/webhook/v1/webhook_suite_test.go     |   2 +-
 manifests/install.yaml                        | 172 +++++++++---------
 test/e2e/e2e_test.go                          |  26 +--
 22 files changed, 239 insertions(+), 347 deletions(-)
 delete mode 100644 .goreleaser.yaml
 rename helm/{netbird-operator => kubernetes-operator}/.helmignore (100%)
 rename helm/{netbird-operator => kubernetes-operator}/Chart.yaml (80%)
 rename helm/{netbird-operator => kubernetes-operator}/crds/netbird.io_nbsetupkeys.yaml (100%)
 create mode 100644 helm/kubernetes-operator/secretvalues.yaml
 rename helm/{netbird-operator => kubernetes-operator}/templates/NOTES.txt (100%)
 rename helm/{netbird-operator => kubernetes-operator}/templates/_helpers.tpl (67%)
 rename helm/{netbird-operator => kubernetes-operator}/templates/deployment.yaml (89%)
 rename helm/{netbird-operator => kubernetes-operator}/templates/rbac.yaml (67%)
 rename helm/{netbird-operator => kubernetes-operator}/templates/service.yaml (59%)
 rename helm/{netbird-operator => kubernetes-operator}/templates/serviceaccount.yaml (71%)
 rename helm/{netbird-operator => kubernetes-operator}/templates/webhook.yaml (66%)
 rename helm/{netbird-operator => kubernetes-operator}/values.yaml (100%)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 38a3846..f0a67e1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,13 +8,8 @@ on:
       - main
   pull_request:
 
-env:
-  GORELEASER_VER: "v2.3.2"
-
 jobs:
   release:
-    env:
-      flags: ""
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -24,51 +19,42 @@ jobs:
       id-token: write
 
     steps:
-      - name: Parse semver string
-        id: semver_parser
-        uses: booxmedialtd/ws-action-parse-semver@v1
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          input_string: ${{ (startsWith(github.ref, 'refs/tags/v') && github.ref) || 'refs/tags/v0.0.0' }}
-          version_extractor_regex: '\/v(.*)$'
-
-      - if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        run: echo "flags=--snapshot" >> $GITHUB_ENV
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # It is required for GoReleaser to work properly
-
-      - name: Install modules
-        run: go mod tidy
-
-      - name: check git status
-        run: git --no-pager diff --exit-code
-      # Set up BuildKit Docker container builder to be able to build
-      # multi-platform images and export cache
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Login to Docker hub
+          # list of Docker images to use as base name for tags
+          images: |
+            netbirdio/kubernetes-operator
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=ref,event=pr
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+
+      - name: Login to Docker Hub
         if: github.repository == github.event.pull_request.head.repo.full_name || !github.head_ref
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Install OS build dependencies
-        run: sudo apt update && sudo apt install -y -q gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Install goversioninfo
-        run: go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@233067e
-      
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+      - name: Build and push
+        uses: docker/build-push-action@v6
         with:
-          version: ${{ env.GORELEASER_VER }}
-          args: release --clean ${{ env.flags }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: |
+            "org.opencontainers.image.created={{.Date}}"
+            "org.opencontainers.image.title={{.ProjectName}}"
+            "org.opencontainers.image.version={{.Version}}"
+            "org.opencontainers.image.revision={{.FullCommit}}"
+            "org.opencontainers.image.version={{.Version}}"
+            "maintainer=dev@netbird.io"
diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
index 2abd123..dbc9e17 100644
--- a/.github/workflows/helm.yml
+++ b/.github/workflows/helm.yml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       # update this file to trigger helm chart release
-      - 'helm/netbird-operator/Chart.yaml'
+      - 'helm/kubernetes-operator/Chart.yaml'
     branches:
       - main
 
@@ -18,49 +18,25 @@ jobs:
       contents: write
       pages: write
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 0
 
-      - name: Set ENVs
-        id: env-setup
+      - name: Configure Git
         run: |
-          echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
-      - name: Package Charts
-        run: |
-          # Package charts
-          mkdir -p charts/.ci-build
-          echo "Setting chart version to ${{ steps.env-setup.outputs.CHART_VERSION }}"
-
-          for DIR in $CHART_BASE_DIR/*; do
-            # Check if Chart.yaml exists in this directory
-            if [ -f "${DIR}/Chart.yaml" ]; then
-              echo "Packaging ${DIR}"
-              helm dependency update $DIR
-              helm lint $DIR
-              helm package $DIR --destination charts/.ci-build
-            fi
-          done
-          git fetch --all
-
-      - name: Upload chart artifacts
-        uses: actions/upload-artifact@v4
+      - name: Install Helm
+        uses: azure/setup-helm@v3.4
         with:
-          name: helm-charts-${{ github.ref_name }}
-          path: charts/.ci-build/*
-          retention-days: 30
+          version: v3.4.2
 
-      - name: Publish to GH-Pages
-        id: ghpublish
-        run: |
-          git checkout $GH_PAGES_BRANCH --force
-          helm repo index charts/.ci-build/ --merge index.yaml --url ${{ github.server_url }}/${{github.repository}}/releases/download/${{ github.ref_name }}
-          cp charts/.ci-build/index.yaml index.yaml
-          echo "New index:" && cat index.yaml
-          git add index.yaml charts
-          git commit -a -m "bot: update pages index for helm charts"
-          git push origin $GH_PAGES_BRANCH
\ No newline at end of file
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.4.1
+        with:
+          charts_dir: helm
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_RELEASE_NAME_TEMPLATE: "helm-v{{ .Version }}"
diff --git a/.github/workflows/test-chart.yml b/.github/workflows/test-chart.yml
index a3bf8fd..c59f180 100644
--- a/.github/workflows/test-chart.yml
+++ b/.github/workflows/test-chart.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Lint Helm Chart
         run: |
-          helm lint ./helm/netbird-operator
+          helm lint ./helm/kubernetes-operator
 
       - name: Install cert-manager via Helm
         run: |
@@ -60,7 +60,7 @@ jobs:
  
       - name: Install Helm chart for project
         run: |
-          helm install test-chart --create-namespace --namespace netbird --set 'operator.image.tag=debug' ./helm/netbird-operator
+          helm install test-chart --create-namespace --namespace netbird --set 'operator.image.tag=debug' ./helm/kubernetes-operator
 
       - name: Check Helm release status
         run: |
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
deleted file mode 100644
index 1a2c6b7..0000000
--- a/.goreleaser.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-version: 2
-
-project_name: kubernetes-operator
-
-release:
-  disable: true
-
-builds:
-  - id: manager
-    dir: cmd
-    binary: manager
-    env: [CGO_ENABLED=0]
-    goos:
-      - linux
-    goarch:
-      - arm
-      - amd64
-      - arm64
-    ldflags:
-      - -s -w
-    mod_timestamp: "{{ .CommitTimestamp }}"
-
-dockers:
-  - image_templates:
-      - netbirdio/kubernetes-operator:{{ .Version }}-amd64
-    ids:
-      - manager
-    goarch: amd64
-    dockerfile: Dockerfile.release
-    use: buildx
-    skip_push: false
-    build_flag_templates:
-      - "--platform=linux/amd64"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=maintainer=dev@netbird.io"
-  - image_templates:
-      - netbirdio/kubernetes-operator:{{ .Version }}-arm64v8
-    ids:
-      - manager
-    goarch: arm64
-    dockerfile: Dockerfile.release
-    use: buildx
-    skip_push: false
-    build_flag_templates:
-      - "--platform=linux/arm64"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=maintainer=dev@netbird.io"
-  - image_templates:
-      - netbirdio/kubernetes-operator:{{ .Version }}-arm
-    ids:
-      - manager
-    goarch: arm
-    goarm: 6
-    dockerfile: Dockerfile.release
-    use: buildx
-    skip_push: false
-    build_flag_templates:
-      - "--platform=linux/arm"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-      - "--label=maintainer=dev@netbird.io"
-
-docker_manifests:
-  - name_template: netbirdio/kubernetes-operator:{{ .Version }}
-    skip_push: false
-    image_templates:
-      - netbirdio/kubernetes-operator:{{ .Version }}-arm64v8
-      - netbirdio/kubernetes-operator:{{ .Version }}-arm
-      - netbirdio/kubernetes-operator:{{ .Version }}-amd64
-
-  - name_template: netbirdio/kubernetes-operator:latest
-    image_templates:
-      - netbirdio/kubernetes-operator:{{ .Version }}-arm64v8
-      - netbirdio/kubernetes-operator:{{ .Version }}-arm
-      - netbirdio/kubernetes-operator:{{ .Version }}-amd64
diff --git a/Makefile b/Makefile
index 3befce6..d0d6368 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ help: ## Display this help.
 
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) crd paths="./..." output:crd:artifacts:config=helm/netbird-operator/crds
+	$(CONTROLLER_GEN) crd paths="./..." output:crd:artifacts:config=helm/kubernetes-operator/crds
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -126,7 +126,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
 .PHONY: build-installer
 build-installer: manifests ## Generate a consolidated YAML with CRDs and deployment.
 	mkdir -p manifests
-	$(HELM) template --include-crds netbird-operator helm/netbird-operator > manifests/install.yaml
+	$(HELM) template --include-crds kubernetes-operator helm/kubernetes-operator > manifests/install.yaml
 
 ##@ Deployment
 
@@ -136,19 +136,19 @@ endif
 
 .PHONY: install
 install: manifests ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUBECTL) apply -f helm/netbird-operator/crds
+	$(KUBECTL) apply -f helm/kubernetes-operator/crds
 
 .PHONY: uninstall
 uninstall: manifests ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	$(KUBECTL) delete -f helm/netbird-operator/crds
+	$(KUBECTL) delete -f helm/kubernetes-operator/crds
 
 .PHONY: deploy
 deploy: manifests ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	$(HELM) install -n netbird --create-namespace netbird-operator --set operator.image.tag=$(word 2,$(subst :, ,${IMG})) helm/netbird-operator
+	$(HELM) install -n netbird --create-namespace kubernetes-operator --set operator.image.tag=$(word 2,$(subst :, ,${IMG})) helm/kubernetes-operator
 
 .PHONY: undeploy
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	$(HELM) uninstall -n netbird netbird-operator
+	$(HELM) uninstall -n netbird kubernetes-operator
 
 ##@ Dependencies
 
diff --git a/README.md b/README.md
index 9fcd553..3c46956 100644
--- a/README.md
+++ b/README.md
@@ -26,12 +26,12 @@ kubectl apply -n netbird -f https://github.com/netbirdio/kubernetes-operator/rel
 
 ```sh
 helm repo add netbirdio https://netbirdio.github.io/kubernetes-operator
-helm install -n netbird netbird-operator netbirdio/netbird-operator
+helm install -n netbird kubernetes-operator netbirdio/kubernetes-operator
 ```
 
 For more options, check the default values by running
 ```sh
-helm show values netbirdio/netbird-operator
+helm show values netbirdio/kubernetes-operator
 ```
 
 ### To Uninstall
@@ -45,7 +45,7 @@ kubectl delete namespace netbird
 **Using helm**
 
 ```sh
-helm uninstall -n netbird netbird-operator
+helm uninstall -n netbird kubernetes-operator
 ```
 
 ### Provision pods with NetBird access
diff --git a/helm/netbird-operator/.helmignore b/helm/kubernetes-operator/.helmignore
similarity index 100%
rename from helm/netbird-operator/.helmignore
rename to helm/kubernetes-operator/.helmignore
diff --git a/helm/netbird-operator/Chart.yaml b/helm/kubernetes-operator/Chart.yaml
similarity index 80%
rename from helm/netbird-operator/Chart.yaml
rename to helm/kubernetes-operator/Chart.yaml
index 7ee86c9..6598ea2 100644
--- a/helm/netbird-operator/Chart.yaml
+++ b/helm/kubernetes-operator/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: netbird-operator
+name: kubernetes-operator
 description: A Helm chart for Kubernetes
 type: application
 version: 0.1.0
diff --git a/helm/netbird-operator/crds/netbird.io_nbsetupkeys.yaml b/helm/kubernetes-operator/crds/netbird.io_nbsetupkeys.yaml
similarity index 100%
rename from helm/netbird-operator/crds/netbird.io_nbsetupkeys.yaml
rename to helm/kubernetes-operator/crds/netbird.io_nbsetupkeys.yaml
diff --git a/helm/kubernetes-operator/secretvalues.yaml b/helm/kubernetes-operator/secretvalues.yaml
new file mode 100644
index 0000000..ae050bb
--- /dev/null
+++ b/helm/kubernetes-operator/secretvalues.yaml
@@ -0,0 +1,16 @@
+netbirdAPI:
+  key: "nbp_1TpgsCUaF2BU3NVZfaDrGpoY1jx2iT2g7rWj"
+
+operator:
+  image:
+    tag: "v0.1.0"
+
+ingress:
+  enabled: true
+  router:
+    enabled: true
+  policies:
+    default:
+      name: Kubernetes Default Policy
+      sourceGroups:
+      - All
diff --git a/helm/netbird-operator/templates/NOTES.txt b/helm/kubernetes-operator/templates/NOTES.txt
similarity index 100%
rename from helm/netbird-operator/templates/NOTES.txt
rename to helm/kubernetes-operator/templates/NOTES.txt
diff --git a/helm/netbird-operator/templates/_helpers.tpl b/helm/kubernetes-operator/templates/_helpers.tpl
similarity index 67%
rename from helm/netbird-operator/templates/_helpers.tpl
rename to helm/kubernetes-operator/templates/_helpers.tpl
index a5c0b15..e80a9cf 100644
--- a/helm/netbird-operator/templates/_helpers.tpl
+++ b/helm/kubernetes-operator/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "netbird-operator.name" -}}
+{{- define "kubernetes-operator.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "netbird-operator.fullname" -}}
+{{- define "kubernetes-operator.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "netbird-operator.chart" -}}
+{{- define "kubernetes-operator.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "netbird-operator.labels" -}}
-helm.sh/chart: {{ include "netbird-operator.chart" . }}
-{{ include "netbird-operator.selectorLabels" . }}
+{{- define "kubernetes-operator.labels" -}}
+helm.sh/chart: {{ include "kubernetes-operator.chart" . }}
+{{ include "kubernetes-operator.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "netbird-operator.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "netbird-operator.name" . }}
+{{- define "kubernetes-operator.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kubernetes-operator.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "netbird-operator.serviceAccountName" -}}
+{{- define "kubernetes-operator.serviceAccountName" -}}
 {{- if .Values.operator.serviceAccount.create }}
-{{- default (include "netbird-operator.fullname" .) .Values.operator.serviceAccount.name }}
+{{- default (include "kubernetes-operator.fullname" .) .Values.operator.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.operator.serviceAccount.name }}
 {{- end }}
@@ -65,23 +65,23 @@ Create the name of the service account to use
 {{/*
 Create the name of the webhook service
 */}}
-{{- define "netbird-operator.webhookService" -}}
-{{- printf "%s-webhook-service" (include "netbird-operator.fullname" .) -}}
+{{- define "kubernetes-operator.webhookService" -}}
+{{- printf "%s-webhook-service" (include "kubernetes-operator.fullname" .) -}}
 {{- end -}}
 
 {{/*
 Create the name of the webhook cert secret
 */}}
-{{- define "netbird-operator.webhookCertSecret" -}}
-{{- printf "%s-tls" (include "netbird-operator.fullname" .) -}}
+{{- define "kubernetes-operator.webhookCertSecret" -}}
+{{- printf "%s-tls" (include "kubernetes-operator.fullname" .) -}}
 {{- end -}}
 
 {{/*
 Generate certificates for webhook
 */}}
-{{- define "netbird-operator.webhookCerts" -}}
-{{- $serviceName := (include "netbird-operator.webhookService" .) -}}
-{{- $secretName := (include "netbird-operator.webhookCertSecret" .) -}}
+{{- define "kubernetes-operator.webhookCerts" -}}
+{{- $serviceName := (include "kubernetes-operator.webhookService" .) -}}
+{{- $secretName := (include "kubernetes-operator.webhookCertSecret" .) -}}
 {{- $secret := lookup "v1" "Secret" .Release.Namespace $secretName -}}
 {{- if (and .Values.webhook.tls.caCert .Values.webhook.tls.cert .Values.webhook.tls.key) -}}
 caCert: {{ .Values.webhook.tls.caCert | b64enc }}
@@ -93,8 +93,8 @@ clientCert: {{ index $secret.data "tls.crt" }}
 clientKey: {{ index $secret.data "tls.key" }}
 {{- else -}}
 {{- $altNames := list (printf "%s.%s" $serviceName .Release.Namespace) (printf "%s.%s.svc" $serviceName .Release.Namespace) (printf "%s.%s.svc.%s" $serviceName .Release.Namespace .Values.webhook.cluster.dnsDomain) -}}
-{{- $ca := genCA "netbird-operator-ca" 3650 -}}
-{{- $cert := genSignedCert (include "netbird-operator.fullname" .) nil $altNames 3650 $ca -}}
+{{- $ca := genCA "kubernetes-operator-ca" 3650 -}}
+{{- $cert := genSignedCert (include "kubernetes-operator.fullname" .) nil $altNames 3650 $ca -}}
 caCert: {{ $ca.Cert | b64enc }}
 clientCert: {{ $cert.Cert | b64enc }}
 clientKey: {{ $cert.Key | b64enc }}
diff --git a/helm/netbird-operator/templates/deployment.yaml b/helm/kubernetes-operator/templates/deployment.yaml
similarity index 89%
rename from helm/netbird-operator/templates/deployment.yaml
rename to helm/kubernetes-operator/templates/deployment.yaml
index ad39a46..962f474 100644
--- a/helm/netbird-operator/templates/deployment.yaml
+++ b/helm/kubernetes-operator/templates/deployment.yaml
@@ -1,15 +1,15 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "netbird-operator.fullname" . }}
+  name: {{ include "kubernetes-operator.fullname" . }}
   labels:
     app.kubernetes.io/component: operator
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.operator.replicaCount }}
   selector:
     matchLabels:
-      {{- include "netbird-operator.selectorLabels" . | nindent 6 }}
+      {{- include "kubernetes-operator.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.operator.podAnnotations }}
@@ -18,7 +18,7 @@ spec:
       {{- end }}
       labels:
         app.kubernetes.io/component: operator
-        {{- include "netbird-operator.labels" . | nindent 8 }}
+        {{- include "kubernetes-operator.labels" . | nindent 8 }}
         {{- with .Values.operator.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -27,7 +27,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "netbird-operator.serviceAccountName" . }}
+      serviceAccountName: {{ include "kubernetes-operator.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.operator.podSecurityContext | nindent 8 }}
       containers:
@@ -85,7 +85,7 @@ spec:
       - name: webhook-certs
         secret:
           defaultMode: 420
-          secretName: {{ template "netbird-operator.webhookCertSecret" . }}
+          secretName: {{ template "kubernetes-operator.webhookCertSecret" . }}
       {{- with .Values.operator.volumes }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/helm/netbird-operator/templates/rbac.yaml b/helm/kubernetes-operator/templates/rbac.yaml
similarity index 67%
rename from helm/netbird-operator/templates/rbac.yaml
rename to helm/kubernetes-operator/templates/rbac.yaml
index 75abd35..62af8bc 100644
--- a/helm/netbird-operator/templates/rbac.yaml
+++ b/helm/kubernetes-operator/templates/rbac.yaml
@@ -1,9 +1,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "netbird-operator.fullname" . }}
+  name: {{ include "kubernetes-operator.fullname" . }}
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - netbird.io
@@ -49,24 +49,24 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "netbird-operator.fullname" . }}
+  name: {{ include "kubernetes-operator.fullname" . }}
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "netbird-operator.fullname" . }}
+  name: {{ include "kubernetes-operator.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "netbird-operator.serviceAccountName" . }}
+  name: {{ include "kubernetes-operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "netbird-operator.fullname" . }}
+  name: {{ include "kubernetes-operator.fullname" . }}
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - ""
@@ -103,14 +103,14 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "netbird-operator.fullname" . }}
+  name: {{ include "kubernetes-operator.fullname" . }}
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ include "netbird-operator.fullname" . }}
+  name: {{ include "kubernetes-operator.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "netbird-operator.serviceAccountName" . }}
+  name: {{ include "kubernetes-operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
diff --git a/helm/netbird-operator/templates/service.yaml b/helm/kubernetes-operator/templates/service.yaml
similarity index 59%
rename from helm/netbird-operator/templates/service.yaml
rename to helm/kubernetes-operator/templates/service.yaml
index f5f0b9c..da3125f 100644
--- a/helm/netbird-operator/templates/service.yaml
+++ b/helm/kubernetes-operator/templates/service.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "netbird-operator.fullname" . }}-metrics
+  name: {{ include "kubernetes-operator.fullname" . }}-metrics
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.operator.metrics.type }}
   ports:
@@ -13,15 +13,15 @@ spec:
     protocol: TCP
     targetPort: {{ .Values.operator.metrics.port }}
   selector:
-    {{- include "netbird-operator.selectorLabels" . | nindent 4 }}
+    {{- include "kubernetes-operator.selectorLabels" . | nindent 4 }}
 {{- end }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "netbird-operator.webhookService" . }}
+  name: {{ include "kubernetes-operator.webhookService" . }}
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.webhook.service.type }}
   ports:
@@ -30,4 +30,4 @@ spec:
     protocol: TCP
     targetPort: {{ .Values.webhook.service.targetPort }}
   selector:
-    {{- include "netbird-operator.selectorLabels" . | nindent 4 }}
+    {{- include "kubernetes-operator.selectorLabels" . | nindent 4 }}
diff --git a/helm/netbird-operator/templates/serviceaccount.yaml b/helm/kubernetes-operator/templates/serviceaccount.yaml
similarity index 71%
rename from helm/netbird-operator/templates/serviceaccount.yaml
rename to helm/kubernetes-operator/templates/serviceaccount.yaml
index 3f3836d..c8bfbf3 100644
--- a/helm/netbird-operator/templates/serviceaccount.yaml
+++ b/helm/kubernetes-operator/templates/serviceaccount.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "netbird-operator.serviceAccountName" . }}
+  name: {{ include "kubernetes-operator.serviceAccountName" . }}
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
   {{- with .Values.operator.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/helm/netbird-operator/templates/webhook.yaml b/helm/kubernetes-operator/templates/webhook.yaml
similarity index 66%
rename from helm/netbird-operator/templates/webhook.yaml
rename to helm/kubernetes-operator/templates/webhook.yaml
index e716b22..52e9afc 100644
--- a/helm/netbird-operator/templates/webhook.yaml
+++ b/helm/kubernetes-operator/templates/webhook.yaml
@@ -1,22 +1,22 @@
-{{ $tls := fromYaml ( include "netbird-operator.webhookCerts" . ) }}
+{{ $tls := fromYaml ( include "kubernetes-operator.webhookCerts" . ) }}
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
 {{- if $.Values.webhook.enableCertManager }}
   annotations:
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ template "netbird-operator.fullname" . }}-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ template "kubernetes-operator.fullname" . }}-serving-cert
 {{- end }}
-  name: {{ include "netbird-operator.fullname" . }}-mpod-webhook
+  name: {{ include "kubernetes-operator.fullname" . }}-mpod-webhook
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 webhooks:
 - clientConfig:
     {{- if not $.Values.webhook.enableCertManager -}}
     caBundle: {{ $tls.caCert }}
     {{ end }}
     service:
-      name: {{ template "netbird-operator.webhookService" . }}
+      name: {{ template "kubernetes-operator.webhookService" . }}
       namespace: {{ $.Release.Namespace }}
       path: /mutate--v1-pod
   failurePolicy: Fail
@@ -33,7 +33,7 @@ webhooks:
     - key: app.kubernetes.io/name
       operator: NotIn
       values:
-      - {{ include "netbird-operator.name" . }}
+      - {{ include "kubernetes-operator.name" . }}
     {{- if .Values.webhook.objectSelector.matchExpressions }}
     {{- toYaml .Values.webhook.objectSelector.matchExpressions | nindent 4 }}
     {{- end }}
@@ -57,18 +57,18 @@ kind: ValidatingWebhookConfiguration
 metadata:
 {{- if $.Values.webhook.enableCertManager }}
   annotations:
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ template "netbird-operator.fullname" . }}-serving-cert
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ template "kubernetes-operator.fullname" . }}-serving-cert
 {{- end }}
-  name: {{ include "netbird-operator.fullname" . }}-vnbsetupkey-webhook
+  name: {{ include "kubernetes-operator.fullname" . }}-vnbsetupkey-webhook
   labels:
-    {{- include "netbird-operator.labels" . | nindent 4 }}
+    {{- include "kubernetes-operator.labels" . | nindent 4 }}
 webhooks:
 - clientConfig:
     {{- if not $.Values.webhook.enableCertManager -}}
     caBundle: {{ $tls.caCert }}
     {{ end }}
     service:
-      name: {{ template "netbird-operator.webhookService" . }}
+      name: {{ template "kubernetes-operator.webhookService" . }}
       namespace: {{ $.Release.Namespace }}
       path: /validate-netbird-io-v1-nbsetupkey
   failurePolicy: Fail
@@ -96,10 +96,10 @@ webhooks:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "netbird-operator.webhookCertSecret" . }}
+  name: {{ template "kubernetes-operator.webhookCertSecret" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "netbird-operator.labels" . | indent 4 }}
+{{ include "kubernetes-operator.labels" . | indent 4 }}
 type: kubernetes.io/tls
 data:
   ca.crt: {{ $tls.caCert }}
@@ -109,26 +109,26 @@ data:
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ template "netbird-operator.fullname" . }}-serving-cert
+  name: {{ template "kubernetes-operator.fullname" . }}-serving-cert
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "netbird-operator.labels" . | indent 4 }}
+{{ include "kubernetes-operator.labels" . | indent 4 }}
 spec:
   dnsNames:
-  - {{ template "netbird-operator.webhookService" . }}.{{ .Release.Namespace }}.svc
-  - {{ template "netbird-operator.webhookService" . }}.{{ .Release.Namespace }}.svc.{{ .Values.webhook.cluster.dnsDomain }}
+  - {{ template "kubernetes-operator.webhookService" . }}.{{ .Release.Namespace }}.svc
+  - {{ template "kubernetes-operator.webhookService" . }}.{{ .Release.Namespace }}.svc.{{ .Values.webhook.cluster.dnsDomain }}
   issuerRef:
     kind: Issuer
-    name: {{ template "netbird-operator.fullname" . }}-selfsigned-issuer
-  secretName: {{ template "netbird-operator.webhookCertSecret" . }}
+    name: {{ template "kubernetes-operator.fullname" . }}-selfsigned-issuer
+  secretName: {{ template "kubernetes-operator.webhookCertSecret" . }}
 ---
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: {{ template "netbird-operator.fullname" . }}-selfsigned-issuer
+  name: {{ template "kubernetes-operator.fullname" . }}-selfsigned-issuer
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "netbird-operator.labels" . | indent 4 }}
+{{ include "kubernetes-operator.labels" . | indent 4 }}
 spec:
   selfSigned: {}
 {{- end }}
\ No newline at end of file
diff --git a/helm/netbird-operator/values.yaml b/helm/kubernetes-operator/values.yaml
similarity index 100%
rename from helm/netbird-operator/values.yaml
rename to helm/kubernetes-operator/values.yaml
diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go
index ec0def0..431ceba 100644
--- a/internal/controller/suite_test.go
+++ b/internal/controller/suite_test.go
@@ -66,7 +66,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "helm", "netbird-operator", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "helm", "kubernetes-operator", "crds")},
 		ErrorIfCRDPathMissing: true,
 	}
 
diff --git a/internal/webhook/v1/webhook_suite_test.go b/internal/webhook/v1/webhook_suite_test.go
index 1a1e554..be779d4 100644
--- a/internal/webhook/v1/webhook_suite_test.go
+++ b/internal/webhook/v1/webhook_suite_test.go
@@ -82,7 +82,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "helm", "netbird-operator", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "helm", "kubernetes-operator", "crds")},
 		ErrorIfCRDPathMissing: false,
 
 		// WebhookInstallOptions: envtest.WebhookInstallOptions{
diff --git a/manifests/install.yaml b/manifests/install.yaml
index 4f4b904..eae0dec 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: netbird-operator/crds/netbird.io_nbsetupkeys.yaml
+# Source: kubernetes-operator/crds/netbird.io_nbsetupkeys.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -118,28 +118,28 @@ spec:
       status: {}
 
 ---
-# Source: netbird-operator/templates/serviceaccount.yaml
+# Source: kubernetes-operator/templates/serviceaccount.yaml
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: netbird-operator
+  name: kubernetes-operator
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 automountServiceAccountToken: true
 ---
-# Source: netbird-operator/templates/rbac.yaml
+# Source: kubernetes-operator/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: netbird-operator
+  name: kubernetes-operator
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 rules:
@@ -182,35 +182,35 @@ rules:
   - list
   - watch
 ---
-# Source: netbird-operator/templates/rbac.yaml
+# Source: kubernetes-operator/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: netbird-operator
+  name: kubernetes-operator
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: netbird-operator
+  name: kubernetes-operator
 subjects:
 - kind: ServiceAccount
-  name: netbird-operator
+  name: kubernetes-operator
   namespace: default
 ---
-# Source: netbird-operator/templates/rbac.yaml
+# Source: kubernetes-operator/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: netbird-operator
+  name: kubernetes-operator
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 rules:
@@ -246,35 +246,35 @@ rules:
   - create
   - patch
 ---
-# Source: netbird-operator/templates/rbac.yaml
+# Source: kubernetes-operator/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: netbird-operator
+  name: kubernetes-operator
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: netbird-operator
+  name: kubernetes-operator
 subjects:
 - kind: ServiceAccount
-  name: netbird-operator
+  name: kubernetes-operator
   namespace: default
 ---
-# Source: netbird-operator/templates/service.yaml
+# Source: kubernetes-operator/templates/service.yaml
 apiVersion: v1
 kind: Service
 metadata:
-  name: netbird-operator-metrics
+  name: kubernetes-operator-metrics
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -285,18 +285,18 @@ spec:
     protocol: TCP
     targetPort: 8080
   selector:
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
 ---
-# Source: netbird-operator/templates/service.yaml
+# Source: kubernetes-operator/templates/service.yaml
 apiVersion: v1
 kind: Service
 metadata:
-  name: netbird-operator-webhook-service
+  name: kubernetes-operator-webhook-service
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -307,44 +307,44 @@ spec:
     protocol: TCP
     targetPort: 9443
   selector:
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
 ---
-# Source: netbird-operator/templates/deployment.yaml
+# Source: kubernetes-operator/templates/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: netbird-operator
+  name: kubernetes-operator
   labels:
     app.kubernetes.io/component: operator
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: netbird-operator
-      app.kubernetes.io/instance: netbird-operator
+      app.kubernetes.io/name: kubernetes-operator
+      app.kubernetes.io/instance: kubernetes-operator
   template:
     metadata:
       labels:
         app.kubernetes.io/component: operator
-        helm.sh/chart: netbird-operator-0.1.0
-        app.kubernetes.io/name: netbird-operator
-        app.kubernetes.io/instance: netbird-operator
+        helm.sh/chart: kubernetes-operator-0.1.0
+        app.kubernetes.io/name: kubernetes-operator
+        app.kubernetes.io/instance: kubernetes-operator
         app.kubernetes.io/version: "v0.1.0"
         app.kubernetes.io/managed-by: Helm
     spec:
-      serviceAccountName: netbird-operator
+      serviceAccountName: kubernetes-operator
       securityContext:
         runAsNonRoot: true
         seccompProfile:
           type: RuntimeDefault
       containers:
-        - name: netbird-operator
+        - name: kubernetes-operator
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:
@@ -393,61 +393,61 @@ spec:
       - name: webhook-certs
         secret:
           defaultMode: 420
-          secretName: netbird-operator-tls
+          secretName: kubernetes-operator-tls
 ---
-# Source: netbird-operator/templates/webhook.yaml
+# Source: kubernetes-operator/templates/webhook.yaml
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: netbird-operator-serving-cert
+  name: kubernetes-operator-serving-cert
   namespace: default
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   dnsNames:
-  - netbird-operator-webhook-service.default.svc
-  - netbird-operator-webhook-service.default.svc.cluster.local
+  - kubernetes-operator-webhook-service.default.svc
+  - kubernetes-operator-webhook-service.default.svc.cluster.local
   issuerRef:
     kind: Issuer
-    name: netbird-operator-selfsigned-issuer
-  secretName: netbird-operator-tls
+    name: kubernetes-operator-selfsigned-issuer
+  secretName: kubernetes-operator-tls
 ---
-# Source: netbird-operator/templates/webhook.yaml
+# Source: kubernetes-operator/templates/webhook.yaml
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: netbird-operator-selfsigned-issuer
+  name: kubernetes-operator-selfsigned-issuer
   namespace: default
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   selfSigned: {}
 ---
-# Source: netbird-operator/templates/webhook.yaml
+# Source: kubernetes-operator/templates/webhook.yaml
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: default/netbird-operator-serving-cert
-  name: netbird-operator-mpod-webhook
+    cert-manager.io/inject-ca-from: default/kubernetes-operator-serving-cert
+  name: kubernetes-operator-mpod-webhook
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 webhooks:
 - clientConfig:
     service:
-      name: netbird-operator-webhook-service
+      name: kubernetes-operator-webhook-service
       namespace: default
       path: /mutate--v1-pod
   failurePolicy: Fail
@@ -459,7 +459,7 @@ webhooks:
     - key: app.kubernetes.io/name
       operator: NotIn
       values:
-      - netbird-operator
+      - kubernetes-operator
   rules:
   - apiGroups:
     - ""
@@ -471,23 +471,23 @@ webhooks:
     - pods
   sideEffects: None
 ---
-# Source: netbird-operator/templates/webhook.yaml
+# Source: kubernetes-operator/templates/webhook.yaml
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: default/netbird-operator-serving-cert
-  name: netbird-operator-vnbsetupkey-webhook
+    cert-manager.io/inject-ca-from: default/kubernetes-operator-serving-cert
+  name: kubernetes-operator-vnbsetupkey-webhook
   labels:
-    helm.sh/chart: netbird-operator-0.1.0
-    app.kubernetes.io/name: netbird-operator
-    app.kubernetes.io/instance: netbird-operator
+    helm.sh/chart: kubernetes-operator-0.1.0
+    app.kubernetes.io/name: kubernetes-operator
+    app.kubernetes.io/instance: kubernetes-operator
     app.kubernetes.io/version: "v0.1.0"
     app.kubernetes.io/managed-by: Helm
 webhooks:
 - clientConfig:
     service:
-      name: netbird-operator-webhook-service
+      name: kubernetes-operator-webhook-service
       namespace: default
       path: /validate-netbird-io-v1-nbsetupkey
   failurePolicy: Fail
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 540acd9..9c40486 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -32,7 +32,7 @@ import (
 const namespace = "netbird"
 
 // metricsServiceName is the name of the metrics service of the project
-const metricsServiceName = "netbird-operator-metrics"
+const metricsServiceName = "kubernetes-operator-metrics"
 
 var _ = Describe("Manager", Ordered, func() {
 	var controllerPodName string
@@ -57,13 +57,13 @@ var _ = Describe("Manager", Ordered, func() {
 		_, err = utils.Run(cmd)
 		Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
 
-		By("deploying the netbird-operator")
+		By("deploying the kubernetes-operator")
 		cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
 		out, err := utils.Run(cmd)
 		if err != nil {
 			fmt.Println(out)
 		}
-		Expect(err).NotTo(HaveOccurred(), "Failed to deploy the netbird-operator")
+		Expect(err).NotTo(HaveOccurred(), "Failed to deploy the kubernetes-operator")
 	})
 
 	// After all tests have been executed, clean up by undeploying the controller, uninstalling CRDs,
@@ -73,7 +73,7 @@ var _ = Describe("Manager", Ordered, func() {
 		cmd := exec.Command("kubectl", "delete", "pod", "curl-metrics", "-n", namespace)
 		_, _ = utils.Run(cmd)
 
-		By("undeploying the netbird-operator")
+		By("undeploying the kubernetes-operator")
 		cmd = exec.Command("make", "undeploy")
 		_, _ = utils.Run(cmd)
 
@@ -134,11 +134,11 @@ var _ = Describe("Manager", Ordered, func() {
 
 	Context("Manager", func() {
 		It("should run successfully", func() {
-			By("validating that the netbird-operator pod is running as expected")
+			By("validating that the kubernetes-operator pod is running as expected")
 			verifyControllerUp := func(g Gomega) {
-				// Get the name of the netbird-operator pod
+				// Get the name of the kubernetes-operator pod
 				cmd := exec.Command("kubectl", "get",
-					"pods", "-l", "app.kubernetes.io/component=operator,app.kubernetes.io/name=netbird-operator",
+					"pods", "-l", "app.kubernetes.io/component=operator,app.kubernetes.io/name=kubernetes-operator",
 					"-o", "go-template={{ range .items }}"+
 						"{{ if not .metadata.deletionTimestamp }}"+
 						"{{ .metadata.name }}"+
@@ -147,11 +147,11 @@ var _ = Describe("Manager", Ordered, func() {
 				)
 
 				podOutput, err := utils.Run(cmd)
-				g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve netbird-operator pod information")
+				g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve kubernetes-operator pod information")
 				podNames := utils.GetNonEmptyLines(podOutput)
 				g.Expect(podNames).To(HaveLen(1), "expected 1 controller pod running")
 				controllerPodName = podNames[0]
-				g.Expect(controllerPodName).To(ContainSubstring("netbird-operator"))
+				g.Expect(controllerPodName).To(ContainSubstring("kubernetes-operator"))
 
 				// Validate the pod's status
 				cmd = exec.Command("kubectl", "get",
@@ -160,7 +160,7 @@ var _ = Describe("Manager", Ordered, func() {
 				)
 				output, err := utils.Run(cmd)
 				g.Expect(err).NotTo(HaveOccurred())
-				g.Expect(output).To(Equal("Running"), "Incorrect netbird-operator pod status")
+				g.Expect(output).To(Equal("Running"), "Incorrect kubernetes-operator pod status")
 			}
 			Eventually(verifyControllerUp).Should(Succeed())
 		})
@@ -240,7 +240,7 @@ var _ = Describe("Manager", Ordered, func() {
 		It("should provisioned cert-manager", func() {
 			By("validating that cert-manager has the certificate Secret")
 			verifyCertManager := func(g Gomega) {
-				cmd := exec.Command("kubectl", "get", "secrets", "netbird-operator-tls", "-n", namespace)
+				cmd := exec.Command("kubectl", "get", "secrets", "kubernetes-operator-tls", "-n", namespace)
 				_, err := utils.Run(cmd)
 				g.Expect(err).NotTo(HaveOccurred())
 			}
@@ -252,7 +252,7 @@ var _ = Describe("Manager", Ordered, func() {
 			verifyCAInjection := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get",
 					"mutatingwebhookconfigurations.admissionregistration.k8s.io",
-					"netbird-operator-mpod-webhook",
+					"kubernetes-operator-mpod-webhook",
 					"-o", "go-template={{ range .webhooks }}{{ .clientConfig.caBundle }}{{ end }}")
 				mwhOutput, err := utils.Run(cmd)
 				g.Expect(err).NotTo(HaveOccurred())
@@ -266,7 +266,7 @@ var _ = Describe("Manager", Ordered, func() {
 			verifyCAInjection := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get",
 					"validatingwebhookconfigurations.admissionregistration.k8s.io",
-					"netbird-operator-vnbsetupkey-webhook",
+					"kubernetes-operator-vnbsetupkey-webhook",
 					"-o", "go-template={{ range .webhooks }}{{ .clientConfig.caBundle }}{{ end }}")
 				vwhOutput, err := utils.Run(cmd)
 				g.Expect(err).NotTo(HaveOccurred())