Merge pull request clusterpedia-io#682 from Iceber/pkg_runtime

move discovery, scheme and informer to pkg/runtime
ONE7live · Jun 24, 2024 · 426c66f · 426c66f
2 parents 4056ee4 + 369cbab
commit 426c66f
Show file tree

Hide file tree

Showing 31 changed files with 22 additions and 22 deletions.
diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go
@@ -29,7 +29,7 @@ import (
 	"github.com/clusterpedia-io/clusterpedia/pkg/controller/pediaclusterlifecycle"
 	clientset "github.com/clusterpedia-io/clusterpedia/pkg/generated/clientset/versioned"
 	"github.com/clusterpedia-io/clusterpedia/pkg/generated/informers/externalversions"
-	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/informer"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/informer"
 	clusterpediafeature "github.com/clusterpedia-io/clusterpedia/pkg/utils/feature"
 	"github.com/clusterpedia-io/clusterpedia/pkg/version/verflag"
 )

diff --git a/hack/verify-forked-code.sh b/hack/verify-forked-code.sh
@@ -5,23 +5,23 @@ set -o nounset
 set -o pipefail
 
 reflector=0
-diff vendor/k8s.io/client-go/tools/cache/reflector.go pkg/synchromanager/clustersynchro/informer/cache/.reflector.go || reflector=$?
+diff vendor/k8s.io/client-go/tools/cache/reflector.go pkg/runtime/informer/cache/.reflector.go || reflector=$?
 
 if [[ $reflector -eq 0 ]]
 then
   echo "'reflector.go' is up to date."
 else
-  echo "the file 'reflector.go' in vendor has been changed, please update the 'cache/.reflector.go' and 'reflector.go' in the pkg/synchromanager/clustersynchro/informer"
+  echo "the file 'reflector.go' in vendor has been changed, please update the 'cache/.reflector.go' and 'reflector.go' in the pkg/runtime/informer"
   exit 1
 fi
 
 pager=0
-diff vendor/k8s.io/client-go/tools/pager/pager.go pkg/synchromanager/clustersynchro/informer/pager/.pager.go.copy || pager=$?
+diff vendor/k8s.io/client-go/tools/pager/pager.go pkg/runtime/informer/pager/.pager.go.copy || pager=$?
 
 if [[ $pager -eq 0 ]]
 then
   echo "'pager.go' is up to date."
 else
-  echo "the file 'pager.go' in vendor has been changed, please update the '.pager.go.copy' and 'pager.go' in the pkg/synchromanager/clustersynchro/informer/pager"
+  echo "the file 'pager.go' in vendor has been changed, please update the '.pager.go.copy' and 'pager.go' in the pkg/runtime/informer/pager"
   exit 1
 fi
diff --git a/pkg/controller/dependentresource_manager.go b/pkg/controller/dependentresource_manager.go
@@ -16,7 +16,7 @@ import (
 	"k8s.io/klog/v2"
 
 	policyv1alpha1 "github.com/clusterpedia-io/api/policy/v1alpha1"
-	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/informer"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/informer"
 )
 
 type DependentResourceManager struct {

diff --git a/pkg/kube_state_metrics/metrics_store.go b/pkg/kube_state_metrics/metrics_store.go
@@ -16,7 +16,7 @@ import (
 	"k8s.io/kube-state-metrics/v2/pkg/optin"
 	"k8s.io/kube-state-metrics/v2/pkg/options"
 
-	"github.com/clusterpedia-io/clusterpedia/pkg/scheme"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storageconfig"
 )
 

diff --git a/pkg/kubeapiserver/restmanager.go b/pkg/kubeapiserver/restmanager.go
@@ -28,8 +28,8 @@ import (
 	"github.com/clusterpedia-io/clusterpedia/pkg/kubeapiserver/discovery"
 	"github.com/clusterpedia-io/clusterpedia/pkg/kubeapiserver/printers"
 	"github.com/clusterpedia-io/clusterpedia/pkg/kubeapiserver/resourcerest"
-	"github.com/clusterpedia-io/clusterpedia/pkg/scheme"
-	unstructuredscheme "github.com/clusterpedia-io/clusterpedia/pkg/scheme/unstructured"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme"
+	unstructuredscheme "github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme/unstructured"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storage"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storageconfig"
 )

diff --git a/pkg/discovery/controller/apiservice.go → ...untime/discovery/controller/apiservice.go b/pkg/discovery/controller/apiservice.go → ...untime/discovery/controller/apiservice.go
diff --git a/pkg/discovery/controller/crd.go → pkg/runtime/discovery/controller/crd.go b/pkg/discovery/controller/crd.go → pkg/runtime/discovery/controller/crd.go
@@ -17,8 +17,8 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	"github.com/clusterpedia-io/clusterpedia/pkg/scheme"
-	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/informer"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/informer"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme"
 )
 
 type CRDController struct {

diff --git a/pkg/discovery/discovery_cache.go → pkg/runtime/discovery/discovery_cache.go b/pkg/discovery/discovery_cache.go → pkg/runtime/discovery/discovery_cache.go
diff --git a/pkg/discovery/dynamic_discovery.go → pkg/runtime/discovery/dynamic_discovery.go b/pkg/discovery/dynamic_discovery.go → pkg/runtime/discovery/dynamic_discovery.go
@@ -17,7 +17,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	"github.com/clusterpedia-io/clusterpedia/pkg/discovery/controller"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/discovery/controller"
 )
 
 type DynamicDiscoveryInterface interface {

diff --git a/pkg/discovery/server_version.go → pkg/runtime/discovery/server_version.go b/pkg/discovery/server_version.go → pkg/runtime/discovery/server_version.go
diff --git a/...ustersynchro/informer/cache/.reflector.go → pkg/runtime/informer/cache/.reflector.go b/...ustersynchro/informer/cache/.reflector.go → pkg/runtime/informer/cache/.reflector.go
diff --git a/.../clustersynchro/informer/event_handler.go → pkg/runtime/informer/event_handler.go b/.../clustersynchro/informer/event_handler.go → pkg/runtime/informer/event_handler.go
diff --git a/...nager/clustersynchro/informer/informer.go → pkg/runtime/informer/informer.go b/...nager/clustersynchro/informer/informer.go → pkg/runtime/informer/informer.go
diff --git a/...ager/clustersynchro/informer/listwatch.go → pkg/runtime/informer/listwatch.go b/...ager/clustersynchro/informer/listwatch.go → pkg/runtime/informer/listwatch.go
diff --git a/...ustersynchro/informer/named_controller.go → pkg/runtime/informer/named_controller.go b/...ustersynchro/informer/named_controller.go → pkg/runtime/informer/named_controller.go
diff --git a/...stersynchro/informer/pager/.pager.go.copy → pkg/runtime/informer/pager/.pager.go.copy b/...stersynchro/informer/pager/.pager.go.copy → pkg/runtime/informer/pager/.pager.go.copy
diff --git a/...er/clustersynchro/informer/pager/pager.go → pkg/runtime/informer/pager/pager.go b/...er/clustersynchro/informer/pager/pager.go → pkg/runtime/informer/pager/pager.go
diff --git a/...ersynchro/informer/pager/result_stream.go → pkg/runtime/informer/pager/result_stream.go b/...ersynchro/informer/pager/result_stream.go → pkg/runtime/informer/pager/result_stream.go
diff --git a/...omanager/clustersynchro/informer/queue.go → pkg/runtime/informer/queue.go b/...omanager/clustersynchro/informer/queue.go → pkg/runtime/informer/queue.go
diff --git a/...ager/clustersynchro/informer/reflector.go → pkg/runtime/informer/reflector.go b/...ager/clustersynchro/informer/reflector.go → pkg/runtime/informer/reflector.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/utils/clock"
 	"k8s.io/utils/trace"
 
-	clspager "github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/informer/pager"
+	clspager "github.com/clusterpedia-io/clusterpedia/pkg/runtime/informer/pager"
 )
 
 const defaultExpectedTypeName = "<unspecified>"

diff --git a/...chro/informer/resourceversion_informer.go → ...time/informer/resourceversion_informer.go b/...chro/informer/resourceversion_informer.go → ...time/informer/resourceversion_informer.go
diff --git a/...nchro/informer/resourceversion_storage.go → ...ntime/informer/resourceversion_storage.go b/...nchro/informer/resourceversion_storage.go → ...ntime/informer/resourceversion_storage.go
diff --git a/pkg/scheme/import_known_versions.go → pkg/runtime/scheme/import_known_versions.go b/pkg/scheme/import_known_versions.go → pkg/runtime/scheme/import_known_versions.go
diff --git a/pkg/scheme/scheme.go → pkg/runtime/scheme/scheme.go b/pkg/scheme/scheme.go → pkg/runtime/scheme/scheme.go
@@ -4,7 +4,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
-	unstructuredscheme "github.com/clusterpedia-io/clusterpedia/pkg/scheme/unstructured"
+	unstructuredscheme "github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme/unstructured"
 )
 
 var (

diff --git a/pkg/scheme/unstructured/scheme.go → pkg/runtime/scheme/unstructured/scheme.go b/pkg/scheme/unstructured/scheme.go → pkg/runtime/scheme/unstructured/scheme.go
diff --git a/pkg/storage/internalstorage/collectionresource.go b/pkg/storage/internalstorage/collectionresource.go
@@ -5,7 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	internal "github.com/clusterpedia-io/api/clusterpedia"
-	"github.com/clusterpedia-io/clusterpedia/pkg/scheme"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme"
 )
 
 const (

diff --git a/pkg/storage/memorystorage/watchcache/watch_cache.go b/pkg/storage/memorystorage/watchcache/watch_cache.go
@@ -20,7 +20,7 @@ import (
 	"k8s.io/utils/strings/slices"
 
 	internal "github.com/clusterpedia-io/api/clusterpedia"
-	"github.com/clusterpedia-io/clusterpedia/pkg/scheme"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme"
 	utilwatch "github.com/clusterpedia-io/clusterpedia/pkg/utils/watch"
 )
 

diff --git a/pkg/storageconfig/storageconfig_factory.go b/pkg/storageconfig/storageconfig_factory.go
@@ -8,7 +8,7 @@ import (
 	serverstorage "k8s.io/apiserver/pkg/server/storage"
 	apisstorage "k8s.io/kubernetes/pkg/apis/storage"
 
-	"github.com/clusterpedia-io/clusterpedia/pkg/scheme"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storage"
 )
 

diff --git a/pkg/synchromanager/clustersynchro/cluster_synchro.go b/pkg/synchromanager/clustersynchro/cluster_synchro.go
@@ -16,11 +16,11 @@ import (
 	metricsstore "k8s.io/kube-state-metrics/v2/pkg/metrics_store"
 
 	clusterv1alpha2 "github.com/clusterpedia-io/api/cluster/v1alpha2"
-	"github.com/clusterpedia-io/clusterpedia/pkg/discovery"
 	kubestatemetrics "github.com/clusterpedia-io/clusterpedia/pkg/kube_state_metrics"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/discovery"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/informer"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storage"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storageconfig"
-	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/informer"
 	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/features"
 	clusterpediafeature "github.com/clusterpedia-io/clusterpedia/pkg/utils/feature"
 )

diff --git a/pkg/synchromanager/clustersynchro/resource_negotiator.go b/pkg/synchromanager/clustersynchro/resource_negotiator.go
@@ -13,8 +13,8 @@ import (
 	"k8s.io/klog/v2"
 
 	clusterv1alpha2 "github.com/clusterpedia-io/api/cluster/v1alpha2"
-	"github.com/clusterpedia-io/clusterpedia/pkg/discovery"
-	"github.com/clusterpedia-io/clusterpedia/pkg/scheme"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/discovery"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/scheme"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storage"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storageconfig"
 	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/features"

diff --git a/pkg/synchromanager/clustersynchro/resource_synchro.go b/pkg/synchromanager/clustersynchro/resource_synchro.go
@@ -20,8 +20,8 @@ import (
 
 	clusterv1alpha2 "github.com/clusterpedia-io/api/cluster/v1alpha2"
 	kubestatemetrics "github.com/clusterpedia-io/clusterpedia/pkg/kube_state_metrics"
+	"github.com/clusterpedia-io/clusterpedia/pkg/runtime/informer"
 	"github.com/clusterpedia-io/clusterpedia/pkg/storage"
-	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/informer"
 	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/clustersynchro/queue"
 	"github.com/clusterpedia-io/clusterpedia/pkg/synchromanager/features"
 	"github.com/clusterpedia-io/clusterpedia/pkg/utils"