diff --git a/build/codegen/codegen.sh b/build/codegen/codegen.sh index f4758d8a5..12fb9055c 100755 --- a/build/codegen/codegen.sh +++ b/build/codegen/codegen.sh @@ -25,4 +25,8 @@ cd ${scriptdir}/../../vendor/k8s.io/code-generator && ./generate-groups.sh \ # --go-header-file ${SCRIPT_ROOT}/build/codegen/header.txt # workaround https://github.com/openshift/origin/issues/10357 -find ${scriptdir}/../../pkg/client -name "clientset_generated.go" -exec sed -i '' 's/return \&Clientset{fakePtr/return \&Clientset{\&fakePtr/g' {} + +find ${scriptdir}/../../pkg/client -name "clientset_generated.go" -exec sed -i '' 's/fakePtr := testing.Fake{}/cs := \&Clientset{}/g' {} + +find ${scriptdir}/../../pkg/client -name "clientset_generated.go" -exec sed -i '' 's/fakePtr.AddReactor/cs.Fake.AddReactor/g' {} + +find ${scriptdir}/../../pkg/client -name "clientset_generated.go" -exec sed -i '' 's/fakePtr.AddWatchReactor/cs.Fake.AddWatchReactor/g' {} + +find ${scriptdir}/../../pkg/client -name "clientset_generated.go" -exec sed -i '' 's/return &Clientset{fakePtr, \&fakediscovery.FakeDiscovery{Fake: &fakePtr}}/cs.discovery = \&fakediscovery.FakeDiscovery{Fake: \&cs.Fake}\ + return cs/g' {} + diff --git a/cmd/rook/agent.go b/cmd/rook/agent.go index 92aab8b1b..9151a5aec 100644 --- a/cmd/rook/agent.go +++ b/cmd/rook/agent.go @@ -42,7 +42,7 @@ func startAgent(cmd *cobra.Command, args []string) error { logStartupInfo(agentCmd.Flags()) - clientset, apiExtClientset, err := getClientset() + clientset, apiExtClientset, rookClientset, err := getClientset() if err != nil { terminateFatal(fmt.Errorf("failed to get k8s client. %+v", err)) } @@ -53,6 +53,7 @@ func startAgent(cmd *cobra.Command, args []string) error { context.ConfigDir = k8sutil.DataDir context.Clientset = clientset context.APIExtensionClientset = apiExtClientset + context.RookClientset = rookClientset agent := agent.New(context) err = agent.Run() diff --git a/cmd/rook/api.go b/cmd/rook/api.go index 99d553687..dac0354ac 100644 --- a/cmd/rook/api.go +++ b/cmd/rook/api.go @@ -62,7 +62,7 @@ func startAPI(cmd *cobra.Command, args []string) error { logStartupInfo(apiCmd.Flags()) - clientset, _, err := getClientset() + clientset, _, rookClientset, err := getClientset() if err != nil { terminateFatal(fmt.Errorf("failed to init k8s client. %+v\n", err)) } @@ -70,6 +70,7 @@ func startAPI(cmd *cobra.Command, args []string) error { clusterInfo.Monitors = mon.ParseMonEndpoints(cfg.monEndpoints) context := createContext() context.Clientset = clientset + context.RookClientset = rookClientset c := api.NewConfig(context, apiPort, &clusterInfo, namespace, versionTag, hostNetwork) err = api.Run(context, c) diff --git a/cmd/rook/main.go b/cmd/rook/main.go index bcbf1b997..122f87cd5 100644 --- a/cmd/rook/main.go +++ b/cmd/rook/main.go @@ -28,6 +28,7 @@ import ( "github.com/spf13/pflag" rookalpha "github.com/rook/rook/pkg/apis/rook.io/v1alpha1" + rookclient "github.com/rook/rook/pkg/client/clientset/versioned" "github.com/rook/rook/pkg/clusterd" "github.com/rook/rook/pkg/daemon/ceph/mon" "github.com/rook/rook/pkg/util/exec" @@ -130,22 +131,26 @@ func createContext() *clusterd.Context { } } -func getClientset() (kubernetes.Interface, apiextensionsclient.Interface, error) { +func getClientset() (kubernetes.Interface, apiextensionsclient.Interface, rookclient.Interface, error) { // create the k8s client config, err := rest.InClusterConfig() if err != nil { - return nil, nil, fmt.Errorf("failed to get k8s config. %+v", err) + return nil, nil, nil, fmt.Errorf("failed to get k8s config. %+v", err) } clientset, err := kubernetes.NewForConfig(config) if err != nil { - return nil, nil, fmt.Errorf("failed to create k8s clientset. %+v", err) + return nil, nil, nil, fmt.Errorf("failed to create k8s clientset. %+v", err) } apiExtClientset, err := apiextensionsclient.NewForConfig(config) if err != nil { - return nil, nil, fmt.Errorf("failed to create k8s API extension clientset. %+v", err) + return nil, nil, nil, fmt.Errorf("failed to create k8s API extension clientset. %+v", err) } - return clientset, apiExtClientset, nil + rookClientset, err := rookclient.NewForConfig(config) + if err != nil { + return nil, nil, nil, fmt.Errorf("failed to create rook clientset. %+v", err) + } + return clientset, apiExtClientset, rookClientset, nil } func terminateFatal(reason error) { diff --git a/cmd/rook/operator.go b/cmd/rook/operator.go index 885b3466a..cc4f40b5c 100644 --- a/cmd/rook/operator.go +++ b/cmd/rook/operator.go @@ -50,7 +50,7 @@ func startOperator(cmd *cobra.Command, args []string) error { logStartupInfo(operatorCmd.Flags()) - clientset, apiExtClientset, err := getClientset() + clientset, apiExtClientset, rookClientset, err := getClientset() if err != nil { terminateFatal(fmt.Errorf("failed to get k8s client. %+v", err)) } @@ -61,6 +61,7 @@ func startOperator(cmd *cobra.Command, args []string) error { context.ConfigDir = k8sutil.DataDir context.Clientset = clientset context.APIExtensionClientset = apiExtClientset + context.RookClientset = rookClientset volumeAttachmentClient, _, err := opkit.NewHTTPClient(rookalpha.CustomResourceGroup, rookalpha.Version, attachment.SchemeBuilder) if err != nil { terminateFatal(err) diff --git a/cmd/rook/osd.go b/cmd/rook/osd.go index 049f6a604..af1baab24 100644 --- a/cmd/rook/osd.go +++ b/cmd/rook/osd.go @@ -86,13 +86,14 @@ func startOSD(cmd *cobra.Command, args []string) error { logStartupInfo(osdCmd.Flags()) - clientset, _, err := getClientset() + clientset, _, rookClientset, err := getClientset() if err != nil { terminateFatal(fmt.Errorf("failed to init k8s client. %+v\n", err)) } context := createContext() context.Clientset = clientset + context.RookClientset = rookClientset kv := k8sutil.NewConfigMapKVStore(clusterInfo.Name, clientset) diff --git a/pkg/apis/rook.io/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/rook.io/v1alpha1/zz_generated.deepcopy.go index 72c7dd329..805448479 100644 --- a/pkg/apis/rook.io/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/rook.io/v1alpha1/zz_generated.deepcopy.go @@ -316,11 +316,6 @@ func (in *Node) DeepCopyInto(out *Node) { *out = make([]Device, len(*in)) copy(*out, *in) } - if in.Directories != nil { - in, out := &in.Directories, &out.Directories - *out = make([]Directory, len(*in)) - copy(*out, *in) - } in.Resources.DeepCopyInto(&out.Resources) in.Selection.DeepCopyInto(&out.Selection) out.Config = in.Config @@ -671,6 +666,11 @@ func (in *Selection) DeepCopyInto(out *Selection) { **out = **in } } + if in.Directories != nil { + in, out := &in.Directories, &out.Directories + *out = make([]Directory, len(*in)) + copy(*out, *in) + } return } diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 5899f75d6..204445afc 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -39,11 +39,12 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { } } - fakePtr := testing.Fake{} - fakePtr.AddReactor("*", "*", testing.ObjectReaction(o)) - fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) + cs := &Clientset{} + cs.Fake.AddReactor("*", "*", testing.ObjectReaction(o)) + cs.Fake.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) - return &Clientset{&fakePtr, &fakediscovery.FakeDiscovery{Fake: &fakePtr}} + cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake} + return cs } // Clientset implements clientset.Interface. Meant to be embedded into a diff --git a/pkg/clusterd/context.go b/pkg/clusterd/context.go index 8e3d6c22e..ab5200a5a 100644 --- a/pkg/clusterd/context.go +++ b/pkg/clusterd/context.go @@ -17,6 +17,7 @@ package clusterd import ( "github.com/coreos/pkg/capnslog" + rookclient "github.com/rook/rook/pkg/client/clientset/versioned" "github.com/rook/rook/pkg/util/exec" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/client-go/kubernetes" @@ -30,6 +31,9 @@ type Context struct { // APIExtensionClientset is a connection to the API Extension kubernetes API APIExtensionClientset apiextensionsclient.Interface + // RookClientset is a typed connection to the rook API + RookClientset rookclient.Interface + // The implementation of executing a console command Executor exec.Executor diff --git a/pkg/daemon/agent/cluster/controller.go b/pkg/daemon/agent/cluster/controller.go index 0f563d5af..865a807b2 100644 --- a/pkg/daemon/agent/cluster/controller.go +++ b/pkg/daemon/agent/cluster/controller.go @@ -20,7 +20,6 @@ which also has the apache 2.0 license. package cluster import ( - "fmt" "os" "sync" "time" @@ -68,18 +67,12 @@ func NewClusterController(context *clusterd.Context, flexvolumeController flexvo // StartWatch will start the watching of cluster events by this controller func (c *ClusterController) StartWatch(namespace string, stopCh chan struct{}) error { - customResourceClient, scheme, err := opkit.NewHTTPClient(rookalpha.CustomResourceGroup, rookalpha.Version, opcluster.SchemeBuilder) - if err != nil { - return fmt.Errorf("failed to get a k8s client for watching cluster resources: %v", err) - } - c.scheme = scheme - resourceHandlerFuncs := cache.ResourceEventHandlerFuncs{ DeleteFunc: c.onDelete, } logger.Infof("start watching cluster resources") - watcher := opkit.NewWatcher(opcluster.ClusterResource, namespace, resourceHandlerFuncs, customResourceClient) + watcher := opkit.NewWatcher(opcluster.ClusterResource, namespace, resourceHandlerFuncs, c.context.RookClientset.Rook().RESTClient()) go watcher.Watch(&rookalpha.Cluster{}, stopCh) return nil } diff --git a/pkg/operator/cluster/controller.go b/pkg/operator/cluster/controller.go index a5d2ebdd4..6fcf96f4c 100644 --- a/pkg/operator/cluster/controller.go +++ b/pkg/operator/cluster/controller.go @@ -44,7 +44,6 @@ import ( apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" ) @@ -83,7 +82,6 @@ var ClusterResource = opkit.CustomResource{ // ClusterController controls an instance of a Rook cluster type ClusterController struct { context *clusterd.Context - scheme *runtime.Scheme volumeAttachmentController attachment.Controller devicesInUse bool } @@ -109,11 +107,6 @@ func NewClusterController(context *clusterd.Context, volumeAttachmentController // Watch watches instances of cluster resources func (c *ClusterController) StartWatch(namespace string, stopCh chan struct{}) error { - customResourceClient, scheme, err := opkit.NewHTTPClient(rookalpha.CustomResourceGroup, rookalpha.Version, SchemeBuilder) - if err != nil { - return fmt.Errorf("failed to get a k8s client for watching cluster resources: %v", err) - } - c.scheme = scheme resourceHandlerFuncs := cache.ResourceEventHandlerFuncs{ AddFunc: c.onAdd, @@ -122,7 +115,7 @@ func (c *ClusterController) StartWatch(namespace string, stopCh chan struct{}) e } logger.Infof("start watching clusters in all namespaces") - watcher := opkit.NewWatcher(ClusterResource, namespace, resourceHandlerFuncs, customResourceClient) + watcher := opkit.NewWatcher(ClusterResource, namespace, resourceHandlerFuncs, c.context.RookClientset.Rook().RESTClient()) go watcher.Watch(&rookalpha.Cluster{}, stopCh) return nil } diff --git a/pkg/operator/mds/controller.go b/pkg/operator/mds/controller.go index e7b93dadd..807d3f701 100644 --- a/pkg/operator/mds/controller.go +++ b/pkg/operator/mds/controller.go @@ -29,7 +29,6 @@ import ( "github.com/rook/rook/pkg/clusterd" "github.com/rook/rook/pkg/operator/pool" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" ) @@ -46,7 +45,6 @@ var FilesystemResource = opkit.CustomResource{ // FilesystemController represents a controller for file system custom resources type FilesystemController struct { context *clusterd.Context - scheme *runtime.Scheme versionTag string hostNetwork bool } @@ -62,11 +60,6 @@ func NewFilesystemController(context *clusterd.Context, versionTag string, hostN // StartWatch watches for instances of Filesystem custom resources and acts on them func (c *FilesystemController) StartWatch(namespace string, stopCh chan struct{}) error { - client, scheme, err := opkit.NewHTTPClient(rookalpha.CustomResourceGroup, rookalpha.Version, schemeBuilder) - if err != nil { - return fmt.Errorf("failed to get a k8s client for watching file system resources: %v", err) - } - c.scheme = scheme resourceHandlerFuncs := cache.ResourceEventHandlerFuncs{ AddFunc: c.onAdd, @@ -75,7 +68,7 @@ func (c *FilesystemController) StartWatch(namespace string, stopCh chan struct{} } logger.Infof("start watching filesystem resource in namespace %s", namespace) - watcher := opkit.NewWatcher(FilesystemResource, namespace, resourceHandlerFuncs, client) + watcher := opkit.NewWatcher(FilesystemResource, namespace, resourceHandlerFuncs, c.context.RookClientset.Rook().RESTClient()) go watcher.Watch(&rookalpha.Filesystem{}, stopCh) return nil } diff --git a/pkg/operator/pool/controller.go b/pkg/operator/pool/controller.go index 049c7184e..264f369bd 100644 --- a/pkg/operator/pool/controller.go +++ b/pkg/operator/pool/controller.go @@ -31,7 +31,6 @@ import ( ceph "github.com/rook/rook/pkg/daemon/ceph/client" "github.com/rook/rook/pkg/model" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" ) @@ -57,7 +56,6 @@ var PoolResource = opkit.CustomResource{ // PoolController represents a controller object for pool custom resources type PoolController struct { context *clusterd.Context - scheme *runtime.Scheme } // NewPoolController create controller for watching pool custom resources created @@ -69,11 +67,6 @@ func NewPoolController(context *clusterd.Context) *PoolController { // Watch watches for instances of Pool custom resources and acts on them func (c *PoolController) StartWatch(namespace string, stopCh chan struct{}) error { - client, scheme, err := opkit.NewHTTPClient(rookalpha.CustomResourceGroup, rookalpha.Version, schemeBuilder) - if err != nil { - return fmt.Errorf("failed to get a k8s client for watching pool resources: %v", err) - } - c.scheme = scheme resourceHandlerFuncs := cache.ResourceEventHandlerFuncs{ AddFunc: c.onAdd, @@ -82,24 +75,15 @@ func (c *PoolController) StartWatch(namespace string, stopCh chan struct{}) erro } logger.Infof("start watching pool resources in namespace %s", namespace) - watcher := opkit.NewWatcher(PoolResource, namespace, resourceHandlerFuncs, client) + watcher := opkit.NewWatcher(PoolResource, namespace, resourceHandlerFuncs, c.context.RookClientset.Rook().RESTClient()) go watcher.Watch(&rookalpha.Pool{}, stopCh) return nil } func (c *PoolController) onAdd(obj interface{}) { - pool := obj.(*rookalpha.Pool) + pool := obj.(*rookalpha.Pool).DeepCopy() - // NEVER modify objects from the store. It's a read-only, local cache. - // Use scheme.Copy() to make a deep copy of original object. - copyObj, err := c.scheme.Copy(pool) - if err != nil { - logger.Errorf("failed to create a deep copy of pool object: %v\n", err) - return - } - poolCopy := copyObj.(*rookalpha.Pool) - - err = createPool(c.context, poolCopy) + err := createPool(c.context, pool) if err != nil { logger.Errorf("failed to create pool %s. %+v", pool.ObjectMeta.Name, err) } diff --git a/pkg/operator/rgw/controller.go b/pkg/operator/rgw/controller.go index 2f08eb086..b0449e9fe 100644 --- a/pkg/operator/rgw/controller.go +++ b/pkg/operator/rgw/controller.go @@ -29,7 +29,6 @@ import ( "github.com/rook/rook/pkg/clusterd" "github.com/rook/rook/pkg/operator/pool" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" ) @@ -46,7 +45,6 @@ var ObjectStoreResource = opkit.CustomResource{ // ObjectStoreController represents a controller object for object store custom resources type ObjectStoreController struct { context *clusterd.Context - scheme *runtime.Scheme versionTag string hostNetwork bool } @@ -62,11 +60,6 @@ func NewObjectStoreController(context *clusterd.Context, versionTag string, host // StartWatch watches for instances of ObjectStore custom resources and acts on them func (c *ObjectStoreController) StartWatch(namespace string, stopCh chan struct{}) error { - client, scheme, err := opkit.NewHTTPClient(rookalpha.CustomResourceGroup, rookalpha.Version, schemeBuilder) - if err != nil { - return fmt.Errorf("failed to get a k8s client for watching object store resources: %v", err) - } - c.scheme = scheme resourceHandlerFuncs := cache.ResourceEventHandlerFuncs{ AddFunc: c.onAdd, @@ -75,8 +68,8 @@ func (c *ObjectStoreController) StartWatch(namespace string, stopCh chan struct{ } logger.Infof("start watching object store resources in namespace %s", namespace) - watcher := opkit.NewWatcher(ObjectStoreResource, namespace, resourceHandlerFuncs, client) - go watcher.Watch(&rookalpha.ObjectStore{}, stopCh) + watcher := opkit.NewWatcher(ObjectStoreResource, namespace, resourceHandlerFuncs, c.context.RookClientset.Rook().RESTClient()) + go watcher.Watch(&apiver.ObjectStore{}, stopCh) return nil }