Remove dapr-sandbox leftovers

Signed-off-by: Luca Burgazzoli <lburgazzoli@gmail.com>
2024-06-11 10:02:21 +02:00 · 2024-06-11 10:02:21 +02:00 · 74ec9cd791
parent 91fd9e4a00
commit 74ec9cd791
73 changed files with 248 additions and 226 deletions
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@ -30,6 +30,6 @@ jobs:
      version: "${{ github.ref_name }}-${{ github.sha }}"
      olm: false
    secrets:
-      registry: "quay.io"
-      registry-username: ${{ secrets.QUAY_USERNAME }}
-      registry-password: ${{ secrets.QUAY_PASSWORD }}
+      registry: "ghcr.io"
+      registry-username: ${{ github.actor }}
+      registry-password: ${{ github.token }}
--- a/.github/workflows/e2e-olm.yml
+++ b/.github/workflows/e2e-olm.yml
@ -77,10 +77,10 @@ jobs:
          config: test/e2e/kind.yaml
      - name: 'SetUp Kind Ingress'
        run: |
-          ./hack/scripts/deploy_ingress.sh
+          make deploy/e2e/ingress
      - name: "SetUp Dapr Kubernetes Operator OLM"
        run: |
-          ./hack/scripts/deploy_olm.sh
+          make deploy/e2e/olm
      - name: "Publish Dapr test Application"
        run: |
          make test/e2e/app
--- a/.github/workflows/e2e-operator.yml
+++ b/.github/workflows/e2e-operator.yml
@ -57,10 +57,10 @@ jobs:
          config: test/e2e/kind.yaml
      - name: 'SetUp Kind Ingress'
        run: |
-          ./hack/scripts/deploy_ingress.sh
+          make deploy/e2e/ingress
      - name: "SetUp Dapr Kubernetes Operator"
        run: |
-          ./hack/scripts/deploy_e2e.sh
+          make deploy/e2e/controller
      - name: "Publish Dapr test Application"
        run: |
          make test/e2e/app
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@ -34,9 +34,9 @@ jobs:
      - name: "Login to Container registry"
        uses: docker/login-action@v3
        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
+          registry: ${{ secrets.registry }}
+          username: ${{ secrets.registry-username }}
+          password: ${{ secrets.registry-password }}
      - name: Set versions
        run: |
          export INPUT_VERSION="${{ inputs.version }}"
--- a/33
+++ b/33
@ -1,12 +1,14 @@

-PROJECT_NAME ?= dapr-kubernetes-operator
+PROJECT_NAME ?= kubernetes-operator
 PROJECT_VERSION ?= 0.0.8

 CONTAINER_REGISTRY ?= ghcr.io
-CONTAINER_REGISTRY_ORG ?= dapr-sandbox
+CONTAINER_REGISTRY_ORG ?= dapr
 CONTAINER_IMAGE_VERSION ?= $(PROJECT_VERSION)
 CONTAINER_IMAGE ?= $(CONTAINER_REGISTRY)/$(CONTAINER_REGISTRY_ORG)/$(PROJECT_NAME):$(CONTAINER_IMAGE_VERSION)

+
+BUNDLE_NAME ?= dapr-kubernetes-operator
 BUNDLE_VERSION ?= $(PROJECT_VERSION)
 BUNDLE_CONTAINER_IMAGE ?= $(CONTAINER_REGISTRY)/$(CONTAINER_REGISTRY_ORG)/$(PROJECT_NAME)-bundle:$(BUNDLE_VERSION)

@ -133,7 +135,6 @@ test/e2e/operator: manifests generate fmt vet ## Run e2e operator tests.
 test/e2e/olm: ## Run e2e catalog tests.
 	DAPR_HELM_CHART_VERSION="$(HELM_CHART_VERSION)" go test -ldflags="$(GOLDFLAGS)" -p 1 -v ./test/e2e/olm/...

-
 .PHONY: test/e2e/app
 test/e2e/app: ko ## Deploy test app.
 	KO_DOCKER_REPO=kind.local $(LOCALBIN)/ko build -B ./test/e2e/support/dapr-test-app
@ -224,17 +225,31 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
 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.
 	$(KUSTOMIZE) build config/deploy/standalone | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -

-
-.PHONY: deploy/e2e
-deploy/e2e: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTAINER_IMAGE)
-	$(KUSTOMIZE) build config/deploy/e2e | kubectl apply -f -
 .PHONY: deploy/kind
 deploy/kind: manifests kustomize kind ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTAINER_IMAGE)
 	kind load docker-image $(CONTAINER_IMAGE)
 	$(KUSTOMIZE) build config/deploy/standalone | kubectl apply -f -

+.PHONY: deploy/e2e/controller
+deploy/e2e/controller: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+	cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTAINER_IMAGE)
+	$(KUSTOMIZE) build config/deploy/e2e | kubectl apply -f -
+	
+	kubectl wait \
+		--namespace=dapr-system \
+		--for=condition=ready \
+		pod \
+		--selector=control-plane=dapr-control-plane \
+		--timeout=90s
+
+.PHONY: deploy/e2e/ingress
+deploy/e2e/ingress: 
+	$(PROJECT_PATH)/hack/scripts/deploy_ingress.sh
+
+.PHONY: deploy/e2e/olm
+deploy/e2e/olm: 
+	$(PROJECT_PATH)/hack/scripts/deploy_olm.sh

 ##@ Bundles

@ -248,7 +263,7 @@ bundle/generate: generate manifests kustomize operator-sdk yq ## Generate bundle
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTAINER_IMAGE)
 	$(PROJECT_PATH)/hack/scripts/gen_bundle.sh \
 		$(PROJECT_PATH) \
-		$(PROJECT_NAME) \
+		$(BUNDLE_NAME) \
 		$(BUNDLE_VERSION) \
 		$(OPENSHIFT_VERSIONS)

--- a/8
+++ b/8
@ -7,7 +7,7 @@ layout:
 - go.kubebuilder.io/v4
 multigroup: true
 projectName: dapr-kubernetes-operator
-repo: github.com/dapr-sandbox/dapr-kubernetes-operator
+repo: github.com/dapr/kubernetes-operator
 resources:
 - api:
    crdVersion: v1
@ -16,7 +16,7 @@ resources:
  domain: dapr.io
  group: operator
  kind: DaprControlPlane
-  path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
+  path: github.com/dapr/kubernetes-operator/api/operator/v1alpha1
  version: v1alpha1
 - api:
    crdVersion: v1
@ -24,7 +24,7 @@ resources:
  domain: dapr.io
  group: operator
  kind: DaprInstance
-  path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
+  path: github.com/dapr/kubernetes-operator/api/operator/v1alpha1
  version: v1alpha1
 - api:
    crdVersion: v1
@ -32,6 +32,6 @@ resources:
  domain: dapr.io
  group: operator
  kind: DaprCruiseControl
-  path: github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
+  path: github.com/dapr/kubernetes-operator/api/operator/v1alpha1
  version: v1alpha1
 version: "3"
--- a/api/operator/v1alpha1/dapr_control_plane_types.go
+++ b/api/operator/v1alpha1/dapr_control_plane_types.go
@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

--- a/api/operator/v1alpha1/dapr_cruise_control_types.go
+++ b/api/operator/v1alpha1/dapr_cruise_control_types.go
@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

--- a/api/operator/v1alpha1/dapr_instance_types.go
+++ b/api/operator/v1alpha1/dapr_instance_types.go
@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

--- a/api/operator/v1alpha1/groupversion_info.go
+++ b/api/operator/v1alpha1/groupversion_info.go
@ -20,7 +20,7 @@ limitations under the License.
 package v1alpha1

 import (
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator"
+	"github.com/dapr/kubernetes-operator/api/operator"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
--- a/api/operator/v1alpha1/zz_generated.deepcopy.go
+++ b/api/operator/v1alpha1/zz_generated.deepcopy.go
@ -21,7 +21,7 @@ limitations under the License.
 package v1alpha1

 import (
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )

--- a/cmd/main.go
+++ b/cmd/main.go
@ -20,8 +20,8 @@ import (
 	"flag"
 	"os"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/cmd/run"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/logger"
+	"github.com/dapr/kubernetes-operator/cmd/run"
+	"github.com/dapr/kubernetes-operator/pkg/logger"

 	"github.com/spf13/cobra"

--- a/cmd/run/run.go
+++ b/cmd/run/run.go
@ -5,9 +5,9 @@ import (

 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/controlplane"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/instance"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/internal/controller/operator/controlplane"
+	"github.com/dapr/kubernetes-operator/internal/controller/operator/instance"
+	"github.com/dapr/kubernetes-operator/pkg/helm"

 	"github.com/spf13/cobra"
 	admregv1 "k8s.io/api/admissionregistration/v1"
@ -19,8 +19,8 @@ import (
 	rtclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
 )

 func init() {
--- a/config/manifests/bases/dapr-kubernetes-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/dapr-kubernetes-operator.clusterserviceversion.yaml
@ -6,7 +6,7 @@ metadata:
    capabilities: "Basic Install"
    categories: "Application Runtime"
    certified: "false"
-    repository: "https://github.com/dapr-sandbox/dapr-kubernetes-operator"
+    repository: "https://github.com/dapr/kubernetes-operator"
    containerImage: ""
    support: contact@dapr.io
    description: "Dapr Control Plane Operator"
@ -56,7 +56,7 @@ spec:
    - name: Dapr
      url: https://dapr.io
    - name: Dapr Kubernetes Operator
-      url: https://github.com/dapr-sandbox/dapr-kubernetes-operator
+      url: https://github.com/dapr/kubernetes-operator
  maintainers:
    - email: "lburgazzoli@gmail.com"
      name: "Luca Burgazzoli"
--- a/docs/install/olm.md
+++ b/docs/install/olm.md
@ -65,10 +65,10 @@ That's it, OLM should be installed and availble to manage the Dapr Operator.

 ## Operator Install

-The [dapr-kubernetes-operator](https://github.com/dapr-sandbox/dapr-kubernetes-operator/) provides a pre-made kustomization file to deploy the Dapr Kubernetes Operator with OLM:
+The [dapr-kubernetes-operator](https://github.com/dapr/kubernetes-operator/) provides a pre-made kustomization file to deploy the Dapr Kubernetes Operator with OLM:

 ```bash
-kubectl apply -k https://github.com/dapr-sandbox/dapr-kubernetes-operator//config/samples/olm
+kubectl apply -k https://github.com/dapr/kubernetes-operator//config/samples/olm
 ```

 This command should:
@ -109,5 +109,5 @@ Once the operator is installed and running, new `DaprControlPlane` resources can
 You can clean up the operator resources by running the following commands.

 ```bash
-kubectl delete -k https://github.com/dapr-sandbox/dapr-kubernetes-operator//config/samples/olm
+kubectl delete -k https://github.com/dapr/kubernetes-operator//config/samples/olm
 ```
--- a/go.mod
+++ b/go.mod
@ -1,4 +1,4 @@
-module github.com/dapr-sandbox/dapr-kubernetes-operator
+module github.com/dapr/kubernetes-operator

 go 1.22.5

--- a/hack/scripts/deploy_e2e.sh
+++ b/hack/scripts/deploy_e2e.sh
@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-make deploy/e2e
-
-kubectl wait \
-  --namespace=dapr-system \
-  --for=condition=ready \
-  pod \
-  --selector=control-plane=dapr-control-plane \
-  --timeout=90s
--- a/hack/scripts/gen_client.sh
+++ b/hack/scripts/gen_client.sh
@ -16,35 +16,35 @@ echo "applyconfiguration-gen"
 "${PROJECT_ROOT}"/bin/applyconfiguration-gen \
  --go-header-file="${PROJECT_ROOT}/hack/boilerplate.go.txt" \
  --output-dir="${TMP_DIR}/client/applyconfiguration" \
-  --output-pkg=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration \
-  github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
+  --output-pkg=github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration \
+  github.com/dapr/kubernetes-operator/api/operator/v1alpha1

 echo "client-gen"
 "${PROJECT_ROOT}"/bin/client-gen \
  --go-header-file="${PROJECT_ROOT}/hack/boilerplate.go.txt" \
  --output-dir="${TMP_DIR}/client/clientset" \
-  --input-base=github.com/dapr-sandbox/dapr-kubernetes-operator/api \
+  --input-base=github.com/dapr/kubernetes-operator/api \
  --input=operator/v1alpha1 \
  --fake-clientset=false \
  --clientset-name "versioned"  \
-  --apply-configuration-package=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration \
-  --output-pkg=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset
+  --apply-configuration-package=github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration \
+  --output-pkg=github.com/dapr/kubernetes-operator/pkg/client/clientset

 echo "lister-gen"
 "${PROJECT_ROOT}"/bin/lister-gen \
  --go-header-file="${PROJECT_ROOT}/hack/boilerplate.go.txt" \
  --output-dir="${TMP_DIR}/client/listers" \
-  --output-pkg=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/listers \
-  github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
+  --output-pkg=github.com/dapr/kubernetes-operator/pkg/client/listers \
+  github.com/dapr/kubernetes-operator/api/operator/v1alpha1

 echo "informer-gen"
 "${PROJECT_ROOT}"/bin/informer-gen \
  --go-header-file="${PROJECT_ROOT}/hack/boilerplate.go.txt" \
  --output-dir="${TMP_DIR}/client/informers" \
-  --versioned-clientset-package=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned \
-  --listers-package=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/listers \
-  --output-pkg=github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers \
-  github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1
+  --versioned-clientset-package=github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned \
+  --listers-package=github.com/dapr/kubernetes-operator/pkg/client/listers \
+  --output-pkg=github.com/dapr/kubernetes-operator/pkg/client/informers \
+  github.com/dapr/kubernetes-operator/api/operator/v1alpha1

 # This should not be needed but for some reasons, the applyconfiguration-gen tool
 # sets a wrong APIVersion for the Dapr type (operator/v1alpha1 instead of the one with
--- a/internal/controller/operator/controlplane/dapr_controlplane_controller.go
+++ b/internal/controller/operator/controlplane/dapr_controlplane_controller.go
@ -22,9 +22,9 @@ import (

 	"sigs.k8s.io/controller-runtime/pkg/reconcile"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/openshift"
+	"github.com/dapr/kubernetes-operator/pkg/openshift"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/pkg/helm"

 	"k8s.io/client-go/tools/record"

@ -34,9 +34,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
 	"github.com/go-logr/logr"

 	ctrlRt "sigs.k8s.io/controller-runtime"
--- a/internal/controller/operator/controlplane/dapr_controlplane_controller_action_apply.go
+++ b/internal/controller/operator/controlplane/dapr_controlplane_controller_action_apply.go
@ -4,18 +4,18 @@ import (
 	"context"
 	"fmt"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/controller"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/resources"
+	"github.com/dapr/kubernetes-operator/pkg/resources"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/instance"
+	"github.com/dapr/kubernetes-operator/internal/controller/operator/instance"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	daprAc "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	daprAc "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/predicates"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
+	"github.com/dapr/kubernetes-operator/pkg/controller/predicates"
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
--- a/internal/controller/operator/controlplane/dapr_controlplane_controller_action_status.go
+++ b/internal/controller/operator/controlplane/dapr_controlplane_controller_action_status.go
@ -4,14 +4,14 @@ import (
 	"context"
 	"fmt"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/instance"
+	"github.com/dapr/kubernetes-operator/internal/controller/operator/instance"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/gc"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
+	"github.com/dapr/kubernetes-operator/pkg/controller/gc"
+	"github.com/dapr/kubernetes-operator/pkg/helm"
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 )
--- a/internal/controller/operator/controlplane/dapr_controlplane_controller_reconcile.go
+++ b/internal/controller/operator/controlplane/dapr_controlplane_controller_reconcile.go
@ -23,11 +23,11 @@ import (
 	"os"
 	"sort"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/reconciler"
+	"github.com/dapr/kubernetes-operator/pkg/controller/reconciler"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/controller"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"

 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@ -36,7 +36,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 )

 func (r *Reconciler) Reconcile(ctx context.Context, res *daprApi.DaprControlPlane) (ctrl.Result, error) {
--- a/internal/controller/operator/controlplane/dapr_controlplane_controller_type.go
+++ b/internal/controller/operator/controlplane/dapr_controlplane_controller_type.go
@ -3,9 +3,9 @@ package controlplane
 import (
 	"context"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 )
--- a/internal/controller/operator/instance/dapr_instance_controller.go
+++ b/internal/controller/operator/instance/dapr_instance_controller.go
@ -20,9 +20,9 @@ import (
 	"context"
 	"fmt"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/openshift"
+	"github.com/dapr/kubernetes-operator/pkg/openshift"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/pkg/helm"

 	"k8s.io/client-go/tools/record"

@ -37,9 +37,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
 	"github.com/go-logr/logr"

 	ctrlRt "sigs.k8s.io/controller-runtime"
--- a/internal/controller/operator/instance/dapr_instance_controller_action_apply_crds.go
+++ b/internal/controller/operator/instance/dapr_instance_controller_action_apply_crds.go
@ -8,12 +8,12 @@ import (

 	k8serrors "k8s.io/apimachinery/pkg/api/errors"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/helm"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/resources"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
+	"github.com/dapr/kubernetes-operator/pkg/resources"
 	"github.com/go-logr/logr"

 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
--- a/internal/controller/operator/instance/dapr_instance_controller_action_apply_resources.go
+++ b/internal/controller/operator/instance/dapr_instance_controller_action_apply_resources.go
@ -6,9 +6,9 @@ import (
 	"sort"
 	"strconv"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm/customizers"
+	"github.com/dapr/kubernetes-operator/pkg/helm/customizers"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/controller"

 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
@ -18,12 +18,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/handler"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/gc"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/pointer"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/resources"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
+	"github.com/dapr/kubernetes-operator/pkg/controller/gc"
+	"github.com/dapr/kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/pkg/pointer"
+	"github.com/dapr/kubernetes-operator/pkg/resources"
 )

 const autoPullPolicySidecarInjector = `
--- a/internal/controller/operator/instance/dapr_instance_controller_action_chart.go
+++ b/internal/controller/operator/instance/dapr_instance_controller_action_chart.go
@ -8,9 +8,9 @@ import (

 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
+	"github.com/dapr/kubernetes-operator/pkg/helm"
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 )
--- a/internal/controller/operator/instance/dapr_instance_controller_action_conditions.go
+++ b/internal/controller/operator/instance/dapr_instance_controller_action_conditions.go
@ -4,14 +4,14 @@ import (
 	"context"
 	"fmt"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/gc"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/controller/gc"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
+	"github.com/dapr/kubernetes-operator/pkg/helm"
 	"github.com/go-logr/logr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
--- a/internal/controller/operator/instance/dapr_instance_controller_reconcile.go
+++ b/internal/controller/operator/instance/dapr_instance_controller_reconcile.go
@ -23,11 +23,11 @@ import (
 	"os"
 	"sort"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/reconciler"
+	"github.com/dapr/kubernetes-operator/pkg/controller/reconciler"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/controller"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"

 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@ -36,7 +36,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 )

 func (r *Reconciler) Reconcile(ctx context.Context, res *daprApi.DaprInstance) (ctrl.Result, error) {
--- a/internal/controller/operator/instance/dapr_instance_controller_support.go
+++ b/internal/controller/operator/instance/dapr_instance_controller_support.go
@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/helm"
+	"github.com/dapr/kubernetes-operator/pkg/helm"

 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
@ -14,7 +14,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/predicates"
+	"github.com/dapr/kubernetes-operator/pkg/controller/predicates"
 )

 func gcSelector(rc *ReconciliationRequest) (labels.Selector, error) {
--- a/internal/controller/operator/instance/dapr_instance_controller_type.go
+++ b/internal/controller/operator/instance/dapr_instance_controller_type.go
@ -3,9 +3,9 @@ package instance
 import (
 	"context"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
 	"helm.sh/helm/v3/pkg/chart"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
--- a/pkg/client/applyconfiguration/operator/v1alpha1/daprcruisecontrol.go
+++ b/pkg/client/applyconfiguration/operator/v1alpha1/daprcruisecontrol.go
@ -18,7 +18,7 @@ limitations under the License.
 package v1alpha1

 import (
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	v1 "k8s.io/client-go/applyconfigurations/meta/v1"
--- a/pkg/client/applyconfiguration/operator/v1alpha1/json.go
+++ b/pkg/client/applyconfiguration/operator/v1alpha1/json.go
@ -18,7 +18,7 @@ limitations under the License.
 package v1alpha1

 import (
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 )

 // JSONApplyConfiguration represents an declarative configuration of the JSON type for use
--- a/pkg/client/applyconfiguration/utils.go
+++ b/pkg/client/applyconfiguration/utils.go
@ -18,8 +18,8 @@ limitations under the License.
 package applyconfiguration

 import (
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 )

--- a/pkg/client/clientset/versioned/clientset.go
+++ b/pkg/client/clientset/versioned/clientset.go
@ -21,7 +21,7 @@ import (
 	"fmt"
 	"net/http"

-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned/typed/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned/typed/operator/v1alpha1"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
--- a/pkg/client/clientset/versioned/scheme/register.go
+++ b/pkg/client/clientset/versioned/scheme/register.go
@ -18,7 +18,7 @@ limitations under the License.
 package scheme

 import (
-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
--- a/pkg/client/clientset/versioned/typed/operator/v1alpha1/daprcontrolplane.go
+++ b/pkg/client/clientset/versioned/typed/operator/v1alpha1/daprcontrolplane.go
@ -23,9 +23,9 @@ import (
 	"fmt"
 	"time"

-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	scheme "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	scheme "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/pkg/client/clientset/versioned/typed/operator/v1alpha1/daprcruisecontrol.go
+++ b/pkg/client/clientset/versioned/typed/operator/v1alpha1/daprcruisecontrol.go
@ -23,9 +23,9 @@ import (
 	"fmt"
 	"time"

-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	scheme "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	scheme "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/pkg/client/clientset/versioned/typed/operator/v1alpha1/daprinstance.go
+++ b/pkg/client/clientset/versioned/typed/operator/v1alpha1/daprinstance.go
@ -23,9 +23,9 @@ import (
 	"fmt"
 	"time"

-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	scheme "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	scheme "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/pkg/client/clientset/versioned/typed/operator/v1alpha1/operator_client.go
+++ b/pkg/client/clientset/versioned/typed/operator/v1alpha1/operator_client.go
@ -20,8 +20,8 @@ package v1alpha1
 import (
 	"net/http"

-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )

--- a/pkg/client/informers/externalversions/factory.go
+++ b/pkg/client/informers/externalversions/factory.go
@ -22,9 +22,9 @@ import (
 	sync "sync"
 	time "time"

-	versioned "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
-	operator "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers/externalversions/operator"
+	versioned "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/dapr/kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
+	operator "github.com/dapr/kubernetes-operator/pkg/client/informers/externalversions/operator"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
--- a/pkg/client/informers/externalversions/generic.go
+++ b/pkg/client/informers/externalversions/generic.go
@ -20,7 +20,7 @@ package externalversions
 import (
 	"fmt"

-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 )
--- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
+++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
@ -20,7 +20,7 @@ package internalinterfaces
 import (
 	time "time"

-	versioned "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned"
+	versioned "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
--- a/pkg/client/informers/externalversions/operator/interface.go
+++ b/pkg/client/informers/externalversions/operator/interface.go
@ -18,8 +18,8 @@ limitations under the License.
 package operator

 import (
-	internalinterfaces "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers/externalversions/operator/v1alpha1"
+	internalinterfaces "github.com/dapr/kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/informers/externalversions/operator/v1alpha1"
 )

 // Interface provides access to each of this group's versions.
--- a/pkg/client/informers/externalversions/operator/v1alpha1/daprcontrolplane.go
+++ b/pkg/client/informers/externalversions/operator/v1alpha1/daprcontrolplane.go
@ -21,10 +21,10 @@ import (
 	"context"
 	time "time"

-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	versioned "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/listers/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	versioned "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/dapr/kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/listers/operator/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/pkg/client/informers/externalversions/operator/v1alpha1/daprcruisecontrol.go
+++ b/pkg/client/informers/externalversions/operator/v1alpha1/daprcruisecontrol.go
@ -21,10 +21,10 @@ import (
 	"context"
 	time "time"

-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	versioned "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/listers/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	versioned "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/dapr/kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/listers/operator/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/pkg/client/informers/externalversions/operator/v1alpha1/daprinstance.go
+++ b/pkg/client/informers/externalversions/operator/v1alpha1/daprinstance.go
@ -21,10 +21,10 @@ import (
 	"context"
 	time "time"

-	operatorv1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	versioned "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/listers/operator/v1alpha1"
+	operatorv1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	versioned "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/dapr/kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/dapr/kubernetes-operator/pkg/client/listers/operator/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/pkg/client/informers/externalversions/operator/v1alpha1/interface.go
+++ b/pkg/client/informers/externalversions/operator/v1alpha1/interface.go
@ -18,7 +18,7 @@ limitations under the License.
 package v1alpha1

 import (
-	internalinterfaces "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/dapr/kubernetes-operator/pkg/client/informers/externalversions/internalinterfaces"
 )

 // Interface provides access to all the informers in this group version.
--- a/pkg/client/listers/operator/v1alpha1/daprcontrolplane.go
+++ b/pkg/client/listers/operator/v1alpha1/daprcontrolplane.go
@ -18,7 +18,7 @@ limitations under the License.
 package v1alpha1

 import (
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
--- a/pkg/client/listers/operator/v1alpha1/daprcruisecontrol.go
+++ b/pkg/client/listers/operator/v1alpha1/daprcruisecontrol.go
@ -18,7 +18,7 @@ limitations under the License.
 package v1alpha1

 import (
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
--- a/pkg/client/listers/operator/v1alpha1/daprinstance.go
+++ b/pkg/client/listers/operator/v1alpha1/daprinstance.go
@ -18,7 +18,7 @@ limitations under the License.
 package v1alpha1

 import (
-	v1alpha1 "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	v1alpha1 "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
--- a/pkg/controller/client/client.go
+++ b/pkg/controller/client/client.go
@ -20,7 +20,7 @@ import (
 	"k8s.io/client-go/scale"
 	ctrl "sigs.k8s.io/controller-runtime/pkg/client"

-	daprClient "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned"
+	daprClient "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned"
 )

 const (
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@ -20,7 +20,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/logger"
+	"github.com/dapr/kubernetes-operator/pkg/logger"
 )

 var (
--- a/pkg/controller/gc/gc.go
+++ b/pkg/controller/gc/gc.go
@ -19,8 +19,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	ctrlCli "sigs.k8s.io/controller-runtime/pkg/client"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/resources"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
+	"github.com/dapr/kubernetes-operator/pkg/resources"
 )

 func New() *GC {
--- a/pkg/controller/reconciler/types.go
+++ b/pkg/controller/reconciler/types.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller/client"
+	"github.com/dapr/kubernetes-operator/pkg/controller/client"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"
--- a/pkg/helm/helm.go
+++ b/pkg/helm/helm.go
@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/resources"
+	"github.com/dapr/kubernetes-operator/pkg/resources"

 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/cli"
@ -18,8 +18,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	k8syaml "k8s.io/apimachinery/pkg/runtime/serializer/yaml"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/utils/maputils"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/utils/maputils"
 )

 const (
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@ -12,7 +12,7 @@ import (

 	"k8s.io/apimachinery/pkg/runtime/schema"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/pointer"
+	"github.com/dapr/kubernetes-operator/pkg/pointer"

 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
--- a/test/e2e/common/dapr_app.go
+++ b/test/e2e/common/dapr_app.go
@ -8,8 +8,8 @@ import (
 	"github.com/onsi/gomega"
 	"github.com/rs/xid"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support/dapr"
+	"github.com/dapr/kubernetes-operator/test/support"
+	"github.com/dapr/kubernetes-operator/test/support/dapr"
 	"github.com/lburgazzoli/gomega-matchers/pkg/matchers/jq"

 	appsv1 "k8s.io/api/apps/v1"
--- a/test/e2e/olm/dapr_olm_test.go
+++ b/test/e2e/olm/dapr_olm_test.go
@ -4,19 +4,19 @@ import (
 	"os"
 	"testing"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/controlplane"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/instance"
-	daprAc "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support/dapr"
+	"github.com/dapr/kubernetes-operator/internal/controller/operator/controlplane"
+	"github.com/dapr/kubernetes-operator/internal/controller/operator/instance"
+	daprAc "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/test/support/dapr"
 	"sigs.k8s.io/controller-runtime/pkg/client"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support/olm"
+	"github.com/dapr/kubernetes-operator/test/support/olm"

-	daprTC "github.com/dapr-sandbox/dapr-kubernetes-operator/test/e2e/common"
+	daprTC "github.com/dapr/kubernetes-operator/test/e2e/common"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

-	. "github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
+	. "github.com/dapr/kubernetes-operator/test/support"
 	. "github.com/onsi/gomega"
 )

--- a/test/e2e/operator/dapr_controlplane_test.go
+++ b/test/e2e/operator/dapr_controlplane_test.go
@ -3,19 +3,19 @@ package operator
 import (
 	"testing"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support/dapr"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/test/support/dapr"

 	"github.com/rs/xid"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

-	. "github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
+	. "github.com/dapr/kubernetes-operator/test/support"
 	. "github.com/onsi/gomega"

-	daprAc "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	daprTC "github.com/dapr-sandbox/dapr-kubernetes-operator/test/e2e/common"
+	daprAc "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	daprTC "github.com/dapr/kubernetes-operator/test/e2e/common"
 )

 func TestDaprControlPlaneDeployWithApp(t *testing.T) {
--- a/test/e2e/operator/dapr_instance_test.go
+++ b/test/e2e/operator/dapr_instance_test.go
@ -7,20 +7,20 @@ import (

 	"github.com/lburgazzoli/gomega-matchers/pkg/matchers/jq"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support/dapr"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/test/support/dapr"

 	"github.com/rs/xid"

 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

-	. "github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
+	. "github.com/dapr/kubernetes-operator/test/support"
 	. "github.com/onsi/gomega"

-	daprAc "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	daprTC "github.com/dapr-sandbox/dapr-kubernetes-operator/test/e2e/common"
+	daprAc "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	daprTC "github.com/dapr/kubernetes-operator/test/e2e/common"
 )

 func TestDaprInstanceDeployWithDefaults(t *testing.T) {
--- a/test/support/client/client.go
+++ b/test/support/client/client.go
@ -17,7 +17,7 @@ import (

 	"sigs.k8s.io/controller-runtime/pkg/client/config"

-	daprClient "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/clientset/versioned"
+	daprClient "github.com/dapr/kubernetes-operator/pkg/client/clientset/versioned"
 	olmAC "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
 	apiextClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
 )
--- a/test/support/dapr/support_dapr.go
+++ b/test/support/dapr/support_dapr.go
@ -5,16 +5,16 @@ import (
 	"strconv"
 	"strings"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/pointer"
+	"github.com/dapr/kubernetes-operator/pkg/pointer"

 	"k8s.io/apimachinery/pkg/runtime"

 	netv1 "k8s.io/api/networking/v1"
 	netv1ac "k8s.io/client-go/applyconfigurations/networking/v1"

-	daprAc "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/resources"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
+	daprAc "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/resources"
+	"github.com/dapr/kubernetes-operator/test/support"
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
--- a/test/support/dapr/support_dapr_controlplane.go
+++ b/test/support/dapr/support_dapr_controlplane.go
@ -1,11 +1,11 @@
 package dapr

 import (
-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/controlplane"
-	daprAc "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/internal/controller/operator/controlplane"
+	daprAc "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/test/support"
 	"github.com/onsi/gomega"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
--- a/test/support/dapr/support_dapr_http.go
+++ b/test/support/dapr/support_dapr_http.go
@ -4,7 +4,7 @@ import (
 	"bytes"
 	"net/http"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
+	"github.com/dapr/kubernetes-operator/test/support"
 	"github.com/onsi/gomega"
 )

--- a/test/support/dapr/support_dapr_instance.go
+++ b/test/support/dapr/support_dapr_instance.go
@ -1,11 +1,11 @@
 package dapr

 import (
-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/internal/controller/operator/instance"
-	daprAc "github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/controller"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/internal/controller/operator/instance"
+	daprAc "github.com/dapr/kubernetes-operator/pkg/client/applyconfiguration/operator/v1alpha1"
+	"github.com/dapr/kubernetes-operator/pkg/controller"
+	"github.com/dapr/kubernetes-operator/test/support"
 	"github.com/onsi/gomega"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
--- a/test/support/helm/helm_install.go
+++ b/test/support/helm/helm_install.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"time"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/utils/maputils"
+	"github.com/dapr/kubernetes-operator/pkg/utils/maputils"
 	"github.com/rs/xid"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart/loader"
--- a/test/support/helm/helm_install_opts.go
+++ b/test/support/helm/helm_install_opts.go
@ -3,7 +3,7 @@ package helm
 import (
 	"time"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/utils/maputils"
+	"github.com/dapr/kubernetes-operator/pkg/utils/maputils"
 	"helm.sh/helm/v3/pkg/action"
 )

--- a/test/support/olm/support_olm.go
+++ b/test/support/olm/support_olm.go
@ -2,13 +2,12 @@ package olm

 import (
 	"fmt"
-	"time"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/pointer"
+	"github.com/dapr/kubernetes-operator/pkg/pointer"

 	"k8s.io/apimachinery/pkg/runtime"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/test/support"
+	"github.com/dapr/kubernetes-operator/test/support"
 	"github.com/onsi/gomega"
 	olmV1 "github.com/operator-framework/api/pkg/operators/v1"
 	olmV1Alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
@ -18,7 +17,7 @@ import (
 )

 const (
-	CatalogRegistryPollInterval = 10 * time.Minute
+	CatalogRegistryPollInterval = "15m0s"
 )

 func DeployOperator(test support.Test, ns *corev1.Namespace, image string) {
@ -93,9 +92,7 @@ func DeployOperator(test support.Test, ns *corev1.Namespace, image string) {
 				},
 				UpdateStrategy: &olmV1Alpha1.UpdateStrategy{
 					RegistryPoll: &olmV1Alpha1.RegistryPoll{
-						Interval: &metav1.Duration{
-							Duration: CatalogRegistryPollInterval,
-						},
+						RawInterval: "15m0s",
 					},
 				},
 			},
--- a/test/support/support.go
+++ b/test/support/support.go
@ -6,8 +6,8 @@ import (

 	"github.com/onsi/gomega"

-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/pointer"
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/resources"
+	"github.com/dapr/kubernetes-operator/pkg/pointer"
+	"github.com/dapr/kubernetes-operator/pkg/resources"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
--- a/test/support/support_k8s_conditions.go
+++ b/test/support/support_k8s_conditions.go
@ -1,7 +1,7 @@
 package support

 import (
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/conditions"
+	"github.com/dapr/kubernetes-operator/pkg/conditions"
 	corev1 "k8s.io/api/core/v1"
 )

--- a/test/support/support_k8s_namespace.go
+++ b/test/support/support_k8s_namespace.go
@ -1,7 +1,7 @@
 package support

 import (
-	"github.com/dapr-sandbox/dapr-kubernetes-operator/pkg/pointer"
+	"github.com/dapr/kubernetes-operator/pkg/pointer"
 	"github.com/onsi/gomega"
 	"github.com/rs/xid"
 	corev1 "k8s.io/api/core/v1"
--- a/test/support/test.go
+++ b/test/support/test.go
@ -4,13 +4,14 @@ import (
 	"context"
 	"errors"
 	"net/http"
+	"os"
 	"sync"
 	"testing"
 	"time"

-	helmsupport "github.com/dapr-sandbox/dapr-kubernetes-operator/test/support/helm"
+	helmsupport "github.com/dapr/kubernetes-operator/test/support/helm"

-	daprApi "github.com/dapr-sandbox/dapr-kubernetes-operator/api/operator/v1alpha1"
+	daprApi "github.com/dapr/kubernetes-operator/api/operator/v1alpha1"
 	"k8s.io/client-go/kubernetes/scheme"

 	"github.com/go-logr/logr/testr"
@ -18,7 +19,7 @@ import (
 	"github.com/onsi/gomega"
 	"github.com/rs/xid"

-	supportclient "github.com/dapr-sandbox/dapr-kubernetes-operator/test/support/client"
+	supportclient "github.com/dapr/kubernetes-operator/test/support/client"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"

@ -28,11 +29,32 @@ import (
 	olmV1Alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 )

+func durationFromEnvOrDefault(name string, def time.Duration) time.Duration {
+	val := os.Getenv(name)
+	if val == "" {
+		return def
+	}
+
+	result, err := time.ParseDuration(val)
+	if err != nil {
+		panic(err)
+	}
+
+	return result
+}
+
 const (
-	TestTimeoutMini   = 5 * time.Second
-	TestTimeoutShort  = 1 * time.Minute
-	TestTimeoutMedium = 2 * time.Minute
-	TestTimeoutLong   = 5 * time.Minute
+	DefaultTestTimeoutMini   = 5 * time.Second
+	DefaultTestTimeoutShort  = 1 * time.Minute
+	DefaultTestTimeoutMedium = 2 * time.Minute
+	DefaultTestTimeoutLong   = 5 * time.Minute
+)
+
+var (
+	TestTimeoutMini   = durationFromEnvOrDefault("E2E_TEST_TIMEOUT_MINI", DefaultTestTimeoutMini)
+	TestTimeoutShort  = durationFromEnvOrDefault("E2E_TEST_TIMEOUT_SHORT", DefaultTestTimeoutShort)
+	TestTimeoutMedium = durationFromEnvOrDefault("E2E_TEST_TIMEOUT_MEDIUM", DefaultTestTimeoutMedium)
+	TestTimeoutLong   = durationFromEnvOrDefault("E2E_TEST_TIMEOUT_LONG", DefaultTestTimeoutLong)

 	DefaultEventuallyPollingInterval   = 500 * time.Millisecond
 	DefaultEventuallyTimeout           = TestTimeoutLong