Build common options for agent

Signed-off-by: Jian Qiu <[email protected]>
open-cluster-management-io · Jun 7, 2023 · 79e18b6 · 79e18b6
1 parent 6f21760
commit 79e18b6
Show file tree

Hide file tree

Showing 84 changed files with 576 additions and 497 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -33,15 +33,15 @@ jobs:
       - name: install imagebuilder
         run: go install github.com/openshift/imagebuilder/cmd/[email protected]
       - name: Build images
-        run: make images
+        run: IMAGE_TAG=e2e make images
       - name: Load images
         run: |
-          kind load docker-image --name=kind quay.io/open-cluster-management/registration-operator:latest
-          kind load docker-image --name=kind quay.io/open-cluster-management/registration:latest
-          kind load docker-image --name=kind quay.io/open-cluster-management/work:latest
-          kind load docker-image --name=kind quay.io/open-cluster-management/placement:latest
+          kind load docker-image --name=kind quay.io/open-cluster-management/registration-operator:e2e
+          kind load docker-image --name=kind quay.io/open-cluster-management/registration:e2e
+          kind load docker-image --name=kind quay.io/open-cluster-management/work:e2e
+          kind load docker-image --name=kind quay.io/open-cluster-management/placement:e2e
       - name: Test E2E
         run: |
-          make test-e2e
+          IMAGE_TAG=e2e make test-e2e
         env:
           KUBECONFIG: /home/runner/.kube/config
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ REGISTRATION_IMAGE ?= $(IMAGE_REGISTRY)/registration:$(IMAGE_TAG)
 # PLACEMENT_IMAGE can be set in the env to override calculated value
 PLACEMENT_IMAGE ?= $(IMAGE_REGISTRY)/placement:$(IMAGE_TAG)
 # ADDON_MANAGER_IMAGE can be set in the env to override calculated value
-ADDON_MANAGER_IMAGE ?= $(IMAGE_REGISTRY)/addon-manager:$(IMAGE_TAG)
+ADDON_MANAGER_IMAGE ?= $(IMAGE_REGISTRY)/addon-manager:latest
 
 $(call build-image,registration,$(REGISTRATION_IMAGE),./build/Dockerfile.registration,.)
 $(call build-image,work,$(WORK_IMAGE),./build/Dockerfile.work,.)

diff --git a/manifests/cluster-manager/management/cluster-manager-registration-webhook-deployment.yaml b/manifests/cluster-manager/management/cluster-manager-registration-webhook-deployment.yaml
@@ -56,7 +56,6 @@ spec:
         {{ if .HostedMode }}
         - "--kubeconfig=/var/run/secrets/hub/kubeconfig"
         {{ end }}
-        imagePullPolicy: Always
         resources:
           requests:
             cpu: 2m

diff --git a/manifests/klusterlet/management/klusterlet-registration-deployment.yaml b/manifests/klusterlet/management/klusterlet-registration-deployment.yaml
@@ -51,7 +51,7 @@ spec:
         args:
           - "/registration"
           - "agent"
-          - "--cluster-name={{ .ClusterName }}"
+          - "--spoke-cluster-name={{ .ClusterName }}"
           - "--bootstrap-kubeconfig=/spoke/bootstrap/kubeconfig"
           {{ if gt (len .RegistrationFeatureGates) 0 }}
           {{range .RegistrationFeatureGates}}

diff --git a/pkg/cmd/hub/operator.go b/pkg/cmd/hub/operator.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/openshift/library-go/pkg/controller/controllercmd"
 
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/clustermanager"
+	"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager"
 	"open-cluster-management.io/ocm/pkg/version"
 )
 

diff --git a/pkg/cmd/spoke/operator.go b/pkg/cmd/spoke/operator.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/openshift/library-go/pkg/controller/controllercmd"
 
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/klusterlet"
+	"open-cluster-management.io/ocm/pkg/operator/operators/klusterlet"
 	"open-cluster-management.io/ocm/pkg/version"
 )
 

diff --git a/pkg/common/options/options.go b/pkg/common/options/options.go
@@ -0,0 +1,64 @@
+package options
+
+import (
+	"fmt"
+	"github.com/openshift/library-go/pkg/controller/controllercmd"
+	"github.com/spf13/pflag"
+	apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+	"strings"
+)
+
+// AgentOptions is the common agent options
+type AgentOptions struct {
+	SpokeKubeconfigFile string
+	SpokeClusterName    string
+	Burst               int
+	QPS                 float32
+}
+
+// NewWorkloadAgentOptions returns the flags with default value set
+func NewAgentOptions() *AgentOptions {
+	return &AgentOptions{
+		QPS:   50,
+		Burst: 100,
+	}
+}
+
+func (o *AgentOptions) AddFlags(flags *pflag.FlagSet) {
+	flags.StringVar(&o.SpokeKubeconfigFile, "spoke-kubeconfig", o.SpokeKubeconfigFile,
+		"Location of kubeconfig file to connect to spoke cluster. If this is not set, will use '--kubeconfig' to build client to connect to the managed cluster.")
+	flags.StringVar(&o.SpokeClusterName, "spoke-cluster-name", o.SpokeClusterName, "Name of the spoke cluster.")
+	flags.MarkDeprecated("cluster-name", "use spoke-cluster-name flag")
+	flags.StringVar(&o.SpokeClusterName, "cluster-name", o.SpokeClusterName,
+		"Name of the spoke cluster.")
+	flags.Float32Var(&o.QPS, "spoke-kube-api-qps", o.QPS, "QPS to use while talking with apiserver on spoke cluster.")
+	flags.IntVar(&o.Burst, "spoke-kube-api-burst", o.Burst, "Burst to use while talking with apiserver on spoke cluster.")
+}
+
+// spokeKubeConfig builds kubeconfig for the spoke/managed cluster
+func (o *AgentOptions) SpokeKubeConfig(controllerContext *controllercmd.ControllerContext) (*rest.Config, error) {
+	if o.SpokeKubeconfigFile == "" {
+		return controllerContext.KubeConfig, nil
+	}
+
+	spokeRestConfig, err := clientcmd.BuildConfigFromFlags("" /* leave masterurl as empty */, o.SpokeKubeconfigFile)
+	if err != nil {
+		return nil, fmt.Errorf("unable to load spoke kubeconfig from file %q: %w", o.SpokeKubeconfigFile, err)
+	}
+	spokeRestConfig.QPS = o.QPS
+	spokeRestConfig.Burst = o.Burst
+	return spokeRestConfig, nil
+}
+
+func (o *AgentOptions) Validate() error {
+	if o.SpokeClusterName == "" {
+		return fmt.Errorf("cluster name is empty")
+	}
+	if errMsgs := apimachineryvalidation.ValidateNamespaceName(o.SpokeClusterName, false); len(errMsgs) > 0 {
+		return fmt.Errorf("metadata.name format is not correct: %s", strings.Join(errMsgs, ","))
+	}
+
+	return nil
+}
diff --git a/...tration-operator/certrotation/cabundle.go → pkg/operator/certrotation/cabundle.go b/...tration-operator/certrotation/cabundle.go → pkg/operator/certrotation/cabundle.go
diff --git a/...on-operator/certrotation/cabundle_test.go → pkg/operator/certrotation/cabundle_test.go b/...on-operator/certrotation/cabundle_test.go → pkg/operator/certrotation/cabundle_test.go
diff --git a/...istration-operator/certrotation/signer.go → pkg/operator/certrotation/signer.go b/...istration-operator/certrotation/signer.go → pkg/operator/certrotation/signer.go
diff --git a/...tion-operator/certrotation/signer_test.go → pkg/operator/certrotation/signer_test.go b/...tion-operator/certrotation/signer_test.go → pkg/operator/certrotation/signer_test.go
diff --git a/...istration-operator/certrotation/target.go → pkg/operator/certrotation/target.go b/...istration-operator/certrotation/target.go → pkg/operator/certrotation/target.go
diff --git a/...tion-operator/certrotation/target_test.go → pkg/operator/certrotation/target_test.go b/...tion-operator/certrotation/target_test.go → pkg/operator/certrotation/target_test.go
diff --git a/pkg/registration-operator/helpers/error.go → pkg/operator/helpers/error.go b/pkg/registration-operator/helpers/error.go → pkg/operator/helpers/error.go
diff --git a/pkg/registration-operator/helpers/helpers.go → pkg/operator/helpers/helpers.go b/pkg/registration-operator/helpers/helpers.go → pkg/operator/helpers/helpers.go
diff --git a/...stration-operator/helpers/helpers_test.go → pkg/operator/helpers/helpers_test.go b/...stration-operator/helpers/helpers_test.go → pkg/operator/helpers/helpers_test.go
diff --git a/...registration-operator/helpers/queuekey.go → pkg/operator/helpers/queuekey.go b/...registration-operator/helpers/queuekey.go → pkg/operator/helpers/queuekey.go
diff --git a/...tration-operator/helpers/queuekey_test.go → pkg/operator/helpers/queuekey_test.go b/...tration-operator/helpers/queuekey_test.go → pkg/operator/helpers/queuekey_test.go
diff --git a/...egistration-operator/helpers/sa_syncer.go → pkg/operator/helpers/sa_syncer.go b/...egistration-operator/helpers/sa_syncer.go → pkg/operator/helpers/sa_syncer.go
diff --git a/...ration-operator/helpers/sa_syncer_test.go → pkg/operator/helpers/sa_syncer_test.go b/...ration-operator/helpers/sa_syncer_test.go → pkg/operator/helpers/sa_syncer_test.go
diff --git a/...ion-operator/helpers/testing/assertion.go → pkg/operator/helpers/testing/assertion.go b/...ion-operator/helpers/testing/assertion.go → pkg/operator/helpers/testing/assertion.go
@@ -9,7 +9,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	opratorapiv1 "open-cluster-management.io/api/operator/v1"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 func NamedCondition(name, reason string, status metav1.ConditionStatus) metav1.Condition {

diff --git a/...tioncontroller/certrotation_controller.go → ...tioncontroller/certrotation_controller.go b/...tioncontroller/certrotation_controller.go → ...tioncontroller/certrotation_controller.go
@@ -21,8 +21,8 @@ import (
 	operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1"
 	operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1"
 	operatorv1 "open-cluster-management.io/api/operator/v1"
-	"open-cluster-management.io/ocm/pkg/registration-operator/certrotation"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/certrotation"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 const (

diff --git a/...ontroller/certrotation_controller_test.go → ...ontroller/certrotation_controller_test.go b/...ontroller/certrotation_controller_test.go → ...ontroller/certrotation_controller_test.go
@@ -22,7 +22,7 @@ import (
 	operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	testingcommon "open-cluster-management.io/ocm/pkg/common/testing"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 const (

diff --git a/...ercontroller/clustermanager_controller.go → ...ercontroller/clustermanager_controller.go b/...ercontroller/clustermanager_controller.go → ...ercontroller/clustermanager_controller.go
@@ -33,7 +33,7 @@ import (
 	ocmfeature "open-cluster-management.io/api/feature"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 	migrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1"
 )
 

diff --git a/...troller/clustermanager_controller_test.go → ...troller/clustermanager_controller_test.go b/...troller/clustermanager_controller_test.go → ...troller/clustermanager_controller_test.go
@@ -30,7 +30,7 @@ import (
 	fakemigrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/fake"
 	migrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1"
 
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 var (

diff --git a/...ontroller/clustermanager_crd_reconcile.go → ...ontroller/clustermanager_crd_reconcile.go b/...ontroller/clustermanager_crd_reconcile.go → ...ontroller/clustermanager_crd_reconcile.go
@@ -17,8 +17,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/crdmanager"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/operators/crdmanager"
 	migrationclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1"
 )
 

diff --git a/...ontroller/clustermanager_hub_reconcile.go → ...ontroller/clustermanager_hub_reconcile.go b/...ontroller/clustermanager_hub_reconcile.go → ...ontroller/clustermanager_hub_reconcile.go
@@ -17,7 +17,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 var (

diff --git a/...oller/clustermanager_runtime_reconcile.go → ...oller/clustermanager_runtime_reconcile.go b/...oller/clustermanager_runtime_reconcile.go → ...oller/clustermanager_runtime_reconcile.go
@@ -19,7 +19,7 @@ import (
 	"k8s.io/client-go/rest"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 var (

diff --git a/...oller/clustermanager_webhook_reconcile.go → ...oller/clustermanager_webhook_reconcile.go b/...oller/clustermanager_webhook_reconcile.go → ...oller/clustermanager_webhook_reconcile.go
@@ -17,7 +17,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 var (

diff --git a/...statuccontroller/crd_status_controller.go → ...statuccontroller/crd_status_controller.go b/...statuccontroller/crd_status_controller.go → ...statuccontroller/crd_status_controller.go
@@ -22,8 +22,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/clustermanager/controllers/migrationcontroller"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/migrationcontroller"
 )
 
 var (

diff --git a/...ccontroller/crd_status_controller_test.go → ...ccontroller/crd_status_controller_test.go b/...ccontroller/crd_status_controller_test.go → ...ccontroller/crd_status_controller_test.go
@@ -19,7 +19,7 @@ import (
 	operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	testingcommon "open-cluster-management.io/ocm/pkg/common/testing"
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/clustermanager/controllers/migrationcontroller"
+	"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/migrationcontroller"
 )
 
 func TestSync(t *testing.T) {

diff --git a/...grationcontroller/migration_controller.go → ...grationcontroller/migration_controller.go b/...grationcontroller/migration_controller.go → ...grationcontroller/migration_controller.go
@@ -27,7 +27,7 @@ import (
 	operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1"
 	operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 	migrationv1alpha1 "sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1"
 	migrationv1alpha1client "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/typed/migration/v1alpha1"
 )

diff --git a/...oncontroller/migration_controller_test.go → ...oncontroller/migration_controller_test.go b/...oncontroller/migration_controller_test.go → ...oncontroller/migration_controller_test.go
diff --git a/...oller/clustermanager_status_controller.go → ...oller/clustermanager_status_controller.go b/...oller/clustermanager_status_controller.go → ...oller/clustermanager_status_controller.go
@@ -15,7 +15,7 @@ import (
 	operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1"
 	operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1"
 	operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 
 	"github.com/openshift/library-go/pkg/controller/factory"
 	"github.com/openshift/library-go/pkg/operator/events"

diff --git a/.../clustermanager_status_controller_test.go → .../clustermanager_status_controller_test.go b/.../clustermanager_status_controller_test.go → .../clustermanager_status_controller_test.go
@@ -17,7 +17,7 @@ import (
 	operatorinformers "open-cluster-management.io/api/client/operator/informers/externalversions"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	testingcommon "open-cluster-management.io/ocm/pkg/common/testing"
-	testinghelper "open-cluster-management.io/ocm/pkg/registration-operator/helpers/testing"
+	testinghelper "open-cluster-management.io/ocm/pkg/operator/helpers/testing"
 )
 
 const testClusterManagerName = "testclustermanager"

diff --git a/...rator/operators/clustermanager/options.go → ...rator/operators/clustermanager/options.go b/...rator/operators/clustermanager/options.go → ...rator/operators/clustermanager/options.go
@@ -7,18 +7,18 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	corev1informers "k8s.io/client-go/informers/core/v1"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 
 	"github.com/openshift/library-go/pkg/controller/controllercmd"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 	operatorclient "open-cluster-management.io/api/client/operator/clientset/versioned"
 	operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions"
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/clustermanager/controllers/certrotationcontroller"
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/clustermanager/controllers/clustermanagercontroller"
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/clustermanager/controllers/crdstatuccontroller"
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/clustermanager/controllers/migrationcontroller"
-	clustermanagerstatuscontroller "open-cluster-management.io/ocm/pkg/registration-operator/operators/clustermanager/controllers/statuscontroller"
+	"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/certrotationcontroller"
+	"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/clustermanagercontroller"
+	"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/crdstatuccontroller"
+	"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/migrationcontroller"
+	clustermanagerstatuscontroller "open-cluster-management.io/ocm/pkg/operator/operators/clustermanager/controllers/statuscontroller"
 )
 
 type Options struct {

diff --git a/...-operator/operators/crdmanager/manager.go → pkg/operator/operators/crdmanager/manager.go b/...-operator/operators/crdmanager/manager.go → pkg/operator/operators/crdmanager/manager.go
diff --git a/...ator/operators/crdmanager/manager_test.go → ...ator/operators/crdmanager/manager_test.go b/...ator/operators/crdmanager/manager_test.go → ...ator/operators/crdmanager/manager_test.go
diff --git a/...llers/addonsecretcontroller/controller.go → ...llers/addonsecretcontroller/controller.go b/...llers/addonsecretcontroller/controller.go → ...llers/addonsecretcontroller/controller.go
@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	coreinformer "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/kubernetes"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 const (

diff --git a/.../addonsecretcontroller/controller_test.go → .../addonsecretcontroller/controller_test.go b/.../addonsecretcontroller/controller_test.go → .../addonsecretcontroller/controller_test.go
diff --git a/...ootstrapcontroller/bootstrapcontroller.go → ...ootstrapcontroller/bootstrapcontroller.go b/...ootstrapcontroller/bootstrapcontroller.go → ...ootstrapcontroller/bootstrapcontroller.go
@@ -8,7 +8,7 @@ import (
 
 	operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1"
 	operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 
 	"github.com/openshift/library-go/pkg/controller/factory"
 	"github.com/openshift/library-go/pkg/operator/events"

diff --git a/...rapcontroller/bootstrapcontroller_test.go → ...rapcontroller/bootstrapcontroller_test.go b/...rapcontroller/bootstrapcontroller_test.go → ...rapcontroller/bootstrapcontroller_test.go
diff --git a/...rs/klusterletcontroller/client_builder.go → ...rs/klusterletcontroller/client_builder.go b/...rs/klusterletcontroller/client_builder.go → ...rs/klusterletcontroller/client_builder.go
diff --git a/...ntroller/klusterlet_cleanup_controller.go → ...ntroller/klusterlet_cleanup_controller.go b/...ntroller/klusterlet_cleanup_controller.go → ...ntroller/klusterlet_cleanup_controller.go
@@ -27,7 +27,7 @@ import (
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 type klusterletCleanupController struct {

diff --git a/...ler/klusterlet_cleanup_controller_test.go → ...ler/klusterlet_cleanup_controller_test.go b/...ler/klusterlet_cleanup_controller_test.go → ...ler/klusterlet_cleanup_controller_test.go
@@ -11,7 +11,7 @@ import (
 	clienttesting "k8s.io/client-go/testing"
 	"k8s.io/klog/v2"
 	testingcommon "open-cluster-management.io/ocm/pkg/common/testing"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 // TestSyncDelete test cleanup hub deploy

diff --git a/...terletcontroller/klusterlet_controller.go → ...terletcontroller/klusterlet_controller.go b/...terletcontroller/klusterlet_controller.go → ...terletcontroller/klusterlet_controller.go
@@ -29,7 +29,7 @@ import (
 	workv1client "open-cluster-management.io/api/client/work/clientset/versioned/typed/work/v1"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 const (

diff --git a/...tcontroller/klusterlet_controller_test.go → ...tcontroller/klusterlet_controller_test.go b/...tcontroller/klusterlet_controller_test.go → ...tcontroller/klusterlet_controller_test.go
@@ -34,8 +34,8 @@ import (
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	workapiv1 "open-cluster-management.io/api/work/v1"
 	testingcommon "open-cluster-management.io/ocm/pkg/common/testing"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
-	testinghelper "open-cluster-management.io/ocm/pkg/registration-operator/helpers/testing"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
+	testinghelper "open-cluster-management.io/ocm/pkg/operator/helpers/testing"
 )
 
 type testController struct {

diff --git a/...letcontroller/klusterlet_crd_reconcile.go → ...letcontroller/klusterlet_crd_reconcile.go b/...letcontroller/klusterlet_crd_reconcile.go → ...letcontroller/klusterlet_crd_reconcile.go
@@ -17,8 +17,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/version"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
-	"open-cluster-management.io/ocm/pkg/registration-operator/operators/crdmanager"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/operators/crdmanager"
 )
 
 var (

diff --git a/...ontroller/klusterlet_managed_reconcile.go → ...ontroller/klusterlet_managed_reconcile.go b/...ontroller/klusterlet_managed_reconcile.go → ...ontroller/klusterlet_managed_reconcile.go
@@ -20,7 +20,7 @@ import (
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 var (

diff --git a/...troller/klusterlet_management_recocile.go → ...troller/klusterlet_management_recocile.go b/...troller/klusterlet_management_recocile.go → ...troller/klusterlet_management_recocile.go
@@ -18,7 +18,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 var (

diff --git a/...ontroller/klusterlet_runtime_reconcile.go → ...ontroller/klusterlet_runtime_reconcile.go b/...ontroller/klusterlet_runtime_reconcile.go → ...ontroller/klusterlet_runtime_reconcile.go
@@ -18,7 +18,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	operatorapiv1 "open-cluster-management.io/api/operator/v1"
 	"open-cluster-management.io/ocm/manifests"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 // runtimeReconcile ensure all runtime of klusterlet is applied

diff --git a/...rcontroller/klusterlet_ssar_controller.go → ...rcontroller/klusterlet_ssar_controller.go b/...rcontroller/klusterlet_ssar_controller.go → ...rcontroller/klusterlet_ssar_controller.go
@@ -23,7 +23,7 @@ import (
 	operatorv1client "open-cluster-management.io/api/client/operator/clientset/versioned/typed/operator/v1"
 	operatorinformer "open-cluster-management.io/api/client/operator/informers/externalversions/operator/v1"
 	operatorlister "open-cluster-management.io/api/client/operator/listers/operator/v1"
-	"open-cluster-management.io/ocm/pkg/registration-operator/helpers"
+	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
 // SSARReSyncTime is exposed so that integration tests can crank up the controller sync speed.