chore: rename pkgs (#51)

Signed-off-by: yue9944882 <[email protected]>
open-cluster-management-io · Jan 13, 2022 · ff1d8df · ff1d8df
1 parent 74b49e9
commit ff1d8df
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ test: manifests generate fmt vet ## Run tests.
 	source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; \
 		fetch_envtest_tools $(ENVTEST_ASSETS_DIR); \
 		setup_envtest_env $(ENVTEST_ASSETS_DIR); \
-		go test ./pkg/... ./controllers/... -coverprofile cover.out
+		go test ./pkg/... -coverprofile cover.out
 
 ##@ Build
 

diff --git a/cmd/Dockerfile b/cmd/Dockerfile
@@ -30,8 +30,6 @@ RUN go mod download
 # Copy the go source
 COPY cmd/ cmd/
 COPY pkg pkg/
-COPY controllers controllers/
-
 
 # Build addons
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o agent cmd/addon-agent/main.go

diff --git a/cmd/addon-agent/main.go b/cmd/addon-agent/main.go
@@ -9,8 +9,8 @@ import (
 
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
-	"open-cluster-management.io/cluster-proxy/pkg/addon/health"
 	"open-cluster-management.io/cluster-proxy/pkg/common"
+	"open-cluster-management.io/cluster-proxy/pkg/proxyagent/health"
 	"open-cluster-management.io/cluster-proxy/pkg/util"
 )
 

diff --git a/cmd/addon-manager/main.go b/cmd/addon-manager/main.go
@@ -39,11 +39,11 @@ import (
 	addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
 	"open-cluster-management.io/api/client/addon/clientset/versioned"
 	"open-cluster-management.io/api/client/addon/informers/externalversions"
-	"open-cluster-management.io/cluster-proxy/controllers"
-	"open-cluster-management.io/cluster-proxy/pkg/addon/agent"
-	"open-cluster-management.io/cluster-proxy/pkg/addon/operator/authentication/selfsigned"
 	proxyv1alpha1 "open-cluster-management.io/cluster-proxy/pkg/apis/proxy/v1alpha1"
 	"open-cluster-management.io/cluster-proxy/pkg/config"
+	"open-cluster-management.io/cluster-proxy/pkg/proxyagent/agent"
+	"open-cluster-management.io/cluster-proxy/pkg/proxyserver/controllers"
+	"open-cluster-management.io/cluster-proxy/pkg/proxyserver/operator/authentication/selfsigned"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/pkg/addon/agent/agent.go → pkg/proxyagent/agent/agent.go b/pkg/addon/agent/agent.go → pkg/proxyagent/agent/agent.go
@@ -13,9 +13,9 @@ import (
 	"open-cluster-management.io/addon-framework/pkg/agent"
 	addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
 	clusterv1 "open-cluster-management.io/api/cluster/v1"
-	"open-cluster-management.io/cluster-proxy/pkg/addon/operator/authentication/selfsigned"
 	proxyv1alpha1 "open-cluster-management.io/cluster-proxy/pkg/apis/proxy/v1alpha1"
 	"open-cluster-management.io/cluster-proxy/pkg/common"
+	"open-cluster-management.io/cluster-proxy/pkg/proxyserver/operator/authentication/selfsigned"
 
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/pkg/addon/health/lease.go → pkg/proxyagent/health/lease.go b/pkg/addon/health/lease.go → pkg/proxyagent/health/lease.go
diff --git a/...lers/clustermanagementaddon_controller.go → ...lers/clustermanagementaddon_controller.go b/...lers/clustermanagementaddon_controller.go → ...lers/clustermanagementaddon_controller.go
@@ -17,8 +17,8 @@ import (
 	"open-cluster-management.io/addon-framework/pkg/certrotation"
 	addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
 	addonlister "open-cluster-management.io/api/client/addon/listers/addon/v1alpha1"
-	"open-cluster-management.io/cluster-proxy/pkg/addon/operator/authentication/selfsigned"
-	"open-cluster-management.io/cluster-proxy/pkg/addon/operator/eventhandler"
+	"open-cluster-management.io/cluster-proxy/pkg/proxyserver/operator/authentication/selfsigned"
+	"open-cluster-management.io/cluster-proxy/pkg/proxyserver/operator/eventhandler"
 
 	"github.com/openshift/library-go/pkg/crypto"
 	"github.com/openshift/library-go/pkg/operator/events"

diff --git a/.../configuration_notification_controller.go → .../configuration_notification_controller.go b/.../configuration_notification_controller.go → .../configuration_notification_controller.go
diff --git a/controllers/ensure_secret_test.go → ...yserver/controllers/ensure_secret_test.go b/controllers/ensure_secret_test.go → ...yserver/controllers/ensure_secret_test.go
@@ -6,8 +6,8 @@ import (
 
 	openshiftcrypto "github.com/openshift/library-go/pkg/crypto"
 	"github.com/stretchr/testify/assert"
-	"open-cluster-management.io/cluster-proxy/pkg/addon/operator/authentication/selfsigned"
 	"open-cluster-management.io/cluster-proxy/pkg/apis/proxy/v1alpha1"
+	"open-cluster-management.io/cluster-proxy/pkg/proxyserver/operator/authentication/selfsigned"
 )
 
 func TestEnsureSecretRotation(t *testing.T) {

diff --git a/controllers/manifests.go → pkg/proxyserver/controllers/manifests.go b/controllers/manifests.go → pkg/proxyserver/controllers/manifests.go
diff --git a/controllers/suite_test.go → pkg/proxyserver/controllers/suite_test.go b/controllers/suite_test.go → pkg/proxyserver/controllers/suite_test.go
diff --git a/...ddon/operator/authentication/interface.go → ...rver/operator/authentication/interface.go b/...ddon/operator/authentication/interface.go → ...rver/operator/authentication/interface.go
diff --git a/...rator/authentication/selfsigned/secret.go → ...rator/authentication/selfsigned/secret.go b/...rator/authentication/selfsigned/secret.go → ...rator/authentication/selfsigned/secret.go
diff --git a/...ation/selfsigned/self_sign_certificate.go → ...ation/selfsigned/self_sign_certificate.go b/...ation/selfsigned/self_sign_certificate.go → ...ation/selfsigned/self_sign_certificate.go
diff --git a/...nthandler/clustermanagementaddon_event.go → ...nthandler/clustermanagementaddon_event.go b/...nthandler/clustermanagementaddon_event.go → ...nthandler/clustermanagementaddon_event.go
diff --git a/.../eventhandler/proxyconfiguration_event.go → .../eventhandler/proxyconfiguration_event.go b/.../eventhandler/proxyconfiguration_event.go → .../eventhandler/proxyconfiguration_event.go