refactor: all components can be compiled successfully

Author: colin404

README.md

@@ -9,6 +9,11 @@
 <a href="https://konglingfei.com/"><img align="right" src="./docs/images/onex-orange.svg" alt="onex" title="onex" width="150"></a>
 
 <div align="left">一个专为 Go + 云原生学习而生的企业级 Go 项目</div>
+
+<br/>
+
+> OneX 技术栈项目之一，更多精彩项目见：[OneX 技术栈全景介绍](https://github.com/onexstack/community)
+
 <br/>
 
 [![GoDoc](https://godoc.org/github.com/onexstack/onex?status.svg)](https://godoc.org/github.com/onexstack/onex)

cmd/onex-apiserver/app/config.go

@@ -20,7 +20,7 @@ type Config struct {
 	Options options.CompletedOptions
 
 	Aggregator    *aggregatorapiserver.Config
-	ControlPlane  *controlplane.Config
+	KubeAPIs      *controlplane.Config
 	ApiExtensions *apiextensionsapiserver.Config
 
 	ExtraConfig
@@ -32,7 +32,7 @@ type completedConfig struct {
 	Options options.CompletedOptions
 
 	Aggregator    aggregatorapiserver.CompletedConfig
-	ControlPlane  controlplane.CompletedConfig
+	KubeAPIs      controlplane.CompletedConfig
 	ApiExtensions apiextensionsapiserver.CompletedConfig
 
 	ExtraConfig
@@ -48,7 +48,7 @@ func (c *Config) Complete() (CompletedConfig, error) {
 		Options: c.Options,
 
 		Aggregator:    c.Aggregator.Complete(),
-		ControlPlane:  c.ControlPlane.Complete(),
+		KubeAPIs:      c.KubeAPIs.Complete(),
 		ApiExtensions: c.ApiExtensions.Complete(),
 
 		ExtraConfig: c.ExtraConfig,
@@ -65,7 +65,7 @@ func NewConfig(opts options.CompletedOptions) (*Config, error) {
 	if err != nil {
 		return nil, err
 	}
-	c.ControlPlane = controlPlane
+	c.KubeAPIs = controlPlane
 
 	apiExtensions, err := apiserver.CreateAPIExtensionsConfig(
 		controlPlane.GenericConfig.Config,

cmd/onex-apiserver/app/server.go

@@ -55,8 +55,6 @@ import (
 	"github.com/onexstack/onexstack/pkg/version"
 )
 
-const appName = "onex-apiserver"
-
 func init() {
 	utilruntime.Must(logsapi.AddFeatureGates(utilfeature.DefaultMutableFeatureGate))
 }
@@ -143,7 +141,7 @@ func NewAPIServerCommand(serverRunOptions ...Option) *cobra.Command {
 	}
 
 	cmd := &cobra.Command{
-		Use:   appName,
+		Use:   "onex-apiserver",
 		Short: "Launch a onex API server",
 		Long: `The OneX API server validates and configures data
 for the api objects which include miners, minersets, configmaps, and
@@ -240,14 +238,14 @@ func Run(ctx context.Context, opts options.CompletedOptions) error {
 
 // CreateServerChain creates the apiservers connected via delegation.
 func CreateServerChain(config CompletedConfig) (*aggregatorapiserver.APIAggregator, error) {
-	notFoundHandler := notfoundhandler.New(config.ControlPlane.GenericConfig.Serializer, genericapifilters.NoMuxAndDiscoveryIncompleteKey)
+	notFoundHandler := notfoundhandler.New(config.KubeAPIs.GenericConfig.Serializer, genericapifilters.NoMuxAndDiscoveryIncompleteKey)
 	apiExtensionsServer, err := config.ApiExtensions.New(genericapiserver.NewEmptyDelegateWithCustomHandler(notFoundHandler))
 	if err != nil {
 		return nil, err
 	}
 	crdAPIEnabled := config.ApiExtensions.GenericConfig.MergedResourceConfig.ResourceEnabled(apiextensionsv1.SchemeGroupVersion.WithResource("customresourcedefinitions"))
 
-	onexAPIServer, err := config.ControlPlane.New(apiExtensionsServer.GenericAPIServer)
+	onexAPIServer, err := config.KubeAPIs.New(apiExtensionsServer.GenericAPIServer)
 	if err != nil {
 		return nil, err
 	}

cmd/onex-controller-manager/app/controllermanager.go

@@ -66,13 +66,11 @@ import (
 	"github.com/onexstack/onex/internal/pkg/util/ratelimiter"
 	"github.com/onexstack/onex/internal/webhooks"
 	v1beta1 "github.com/onexstack/onex/pkg/apis/apps/v1beta1"
-	"github.com/onexstack/onexstack/pkg/db"
 	"github.com/onexstack/onex/pkg/record"
+	"github.com/onexstack/onexstack/pkg/db"
 	"github.com/onexstack/onexstack/pkg/version"
 )
 
-const appName = "onex-controller-manager"
-
 var scheme = runtime.NewScheme()
 
 func init() {
@@ -102,7 +100,7 @@ func NewControllerManagerCommand() *cobra.Command {
 	}
 
 	cmd := &cobra.Command{
-		Use: appName,
+		Use: "onex-controller-manager",
 		Long: `The onex controller manager is a daemon that embeds
 the core control loops. In applications of robotics and
 automation, a control loop is a non-terminating loop that regulates the state of
@@ -117,7 +115,7 @@ current state towards the desired state.`,
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			version.PrintAndExitIfRequested(appName)
+			version.PrintAndExitIfRequested()
 
 			// Activate logging as soon as possible, after that
 			// show flags with the final logging configuration.

cmd/onex-controller-manager/app/core.go

@@ -163,11 +163,12 @@ func startGarbageCollectorController(ctx context.Context, cctx ControllerContext
 
 	// Start the garbage collector.
 	workers := int(cctx.Config.ComponentConfig.GarbageCollectorController.ConcurrentGCSyncs)
-	go garbageCollector.Run(ctx, workers)
+	const syncPeriod = 30 * time.Second
+	go garbageCollector.Run(ctx, workers, syncPeriod)
 
 	// Periodically refresh the RESTMapper with new discovery information and sync
 	// the garbage collector.
-	go garbageCollector.Sync(ctx, discoveryClient, 30*time.Second)
+	go garbageCollector.Sync(ctx, discoveryClient, syncPeriod)
 
 	return true, nil
 }

cmd/onex-miner-controller/app/controller.go

@@ -39,13 +39,11 @@ import (
 	"github.com/onexstack/onex/internal/pkg/util/ratelimiter"
 	"github.com/onexstack/onex/pkg/apis/apps/v1beta1"
 	"github.com/onexstack/onex/pkg/apis/apps/v1beta1/index"
-	"github.com/onexstack/onexstack/pkg/db"
 	"github.com/onexstack/onex/pkg/record"
+	"github.com/onexstack/onexstack/pkg/db"
 	"github.com/onexstack/onexstack/pkg/version"
 )
 
-const appName = "onex-miner-controller"
-
 func init() {
 	utilruntime.Must(logsapi.AddFeatureGates(utilfeature.DefaultMutableFeatureGate))
 	utilruntime.Must(features.AddFeatureGates(utilfeature.DefaultMutableFeatureGate))
@@ -60,7 +58,7 @@ func NewControllerCommand() *cobra.Command {
 	}
 
 	cmd := &cobra.Command{
-		Use: appName,
+		Use: "onex-miner-controller",
 		Long: `The cloud miner controller is a daemon that embeds
 the core control loops. In applications of robotics and
 automation, a control loop is a non-terminating loop that regulates the state of
@@ -75,7 +73,7 @@ current state towards the desired state.`,
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			version.PrintAndExitIfRequested(appName)
+			version.PrintAndExitIfRequested()
 
 			// Activate logging as soon as possible, after that
 			// show flags with the final logging configuration.

cmd/onex-minerset-controller/app/controller.go

@@ -40,8 +40,6 @@ import (
 	"github.com/onexstack/onexstack/pkg/version"
 )
 
-const appName = "onex-minerset-controller"
-
 func init() {
 	utilruntime.Must(logsapi.AddFeatureGates(utilfeature.DefaultMutableFeatureGate))
 	utilruntime.Must(features.AddFeatureGates(utilfeature.DefaultMutableFeatureGate))
@@ -56,7 +54,7 @@ func NewControllerCommand() *cobra.Command {
 	}
 
 	cmd := &cobra.Command{
-		Use: appName,
+		Use: "onex-minerset-controller",
 		Long: `The minerset controller is a daemon that embeds
 the core control loops. In applications of robotics and
 automation, a control loop is a non-terminating loop that regulates the state of
@@ -71,7 +69,7 @@ current state towards the desired state.`,
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			version.PrintAndExitIfRequested(appName)
+			version.PrintAndExitIfRequested()
 
 			// Activate logging as soon as possible, after that
 			// show flags with the final logging configuration.

go.mod

@@ -68,12 +68,12 @@ require (
 	gorm.io/gorm v1.25.12
 	k8s.io/api v0.32.1
 	k8s.io/apiextensions-apiserver v0.32.1
-	k8s.io/apimachinery v0.32.1
+	k8s.io/apimachinery v0.32.2
 	k8s.io/apiserver v0.32.1
 	k8s.io/cli-runtime v0.32.1
-	k8s.io/client-go v0.32.1
+	k8s.io/client-go v0.32.2
 	k8s.io/code-generator v0.32.1
-	k8s.io/component-base v0.32.1
+	k8s.io/component-base v0.32.2
 	k8s.io/controller-manager v0.32.1
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kube-aggregator v0.0.0

internal/controller/resourceclean/cleaner_chain.go

@@ -22,24 +22,24 @@ import (
 type Chain struct {
 	mu     sync.Mutex
 	client client.Client
-	ds     store.IStore
+	store  store.IStore
 }
 
 func (c *Chain) Name() string {
 	return "chain"
 }
 
-func (c *Chain) Initialize(client client.Client, ds store.IStore) {
+func (c *Chain) Initialize(client client.Client, store store.IStore) {
 	c.client = client
-	c.ds = ds
+	c.store = store
 }
 
 func (c *Chain) Delete(ctx context.Context) error {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
 	klog.V(4).InfoS("Cleanup chains from chain table")
-	_, chains, err := c.ds.Chains().List(ctx, nil)
+	_, chains, err := c.store.Chain().List(ctx, nil)
 	if err != nil {
 		klog.ErrorS(err, "Failed to list chains")
 		return err
@@ -51,7 +51,7 @@ func (c *Chain) Delete(ctx context.Context) error {
 		key := client.ObjectKey{Namespace: chain.Namespace, Name: chain.Name}
 		if err := c.client.Get(ctx, key, &ch); err != nil {
 			if apierrors.IsNotFound(err) {
-				if derr := c.ds.Chains().Delete(ctx, where.F("namespace", chain.Namespace, "name", chain.Name)); derr != nil {
+				if derr := c.store.Chain().Delete(ctx, where.F("namespace", chain.Namespace, "name", chain.Name)); derr != nil {
 					klog.V(1).InfoS("Failed to delete chain", "chain", klog.KRef(chain.Namespace, chain.Name), "err", derr)
 					continue
 				}

internal/controller/resourceclean/cleaner_miner.go

@@ -22,24 +22,24 @@ import (
 type Miner struct {
 	mu     sync.Mutex
 	client client.Client
-	ds     store.IStore
+	store  store.IStore
 }
 
 func (c *Miner) Name() string {
 	return "miner"
 }
 
-func (c *Miner) Initialize(client client.Client, ds store.IStore) {
+func (c *Miner) Initialize(client client.Client, store store.IStore) {
 	c.client = client
-	c.ds = ds
+	c.store = store
 }
 
 func (c *Miner) Delete(ctx context.Context) error {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
 	klog.V(4).InfoS("Cleanup miners from miner table")
-	_, miners, err := c.ds.Miners().List(ctx, nil)
+	_, miners, err := c.store.Miner().List(ctx, nil)
 	if err != nil {
 		klog.ErrorS(err, "Failed to list miners")
 		return err
@@ -51,7 +51,7 @@ func (c *Miner) Delete(ctx context.Context) error {
 		key := client.ObjectKey{Namespace: miner.Namespace, Name: miner.Name}
 		if err := c.client.Get(ctx, key, &m); err != nil {
 			if apierrors.IsNotFound(err) {
-				if derr := c.ds.Miners().Delete(ctx, where.F("namespace", miner.Namespace, "name", miner.Name)); derr != nil {
+				if derr := c.store.Miner().Delete(ctx, where.F("namespace", miner.Namespace, "name", miner.Name)); derr != nil {
 					klog.V(1).InfoS("Failed to delete miner", "miner", klog.KRef(miner.Namespace, miner.Name), "err", derr)
 					continue
 				}