allow multiple instances of rook, but only one that uses devices
This commit is contained in:
1 parent
1e0d0e1aae
commit
69ce2009cd
2 files changed
+48
-43
No files matched your search
+15
-18
@@ -33,7 +33,6 @@ import (
|
||||
)
|
||||
|
||||
type Cluster struct {
|
||||
Namespace string
|
||||
factory client.ConnectionFactory
|
||||
clientset *kubernetes.Clientset
|
||||
Metadata v1.ObjectMeta `json:"metadata,omitempty"`
|
||||
@@ -56,43 +55,40 @@ type ClusterSpec struct {
|
||||
UseAllDevices bool `json:"useAllDevices"`
|
||||
}
|
||||
|
||||
func newCluster(namespace, version string, useAllDevices bool, factory client.ConnectionFactory, clientset *kubernetes.Clientset) *Cluster {
|
||||
c := &Cluster{
|
||||
Namespace: namespace,
|
||||
func newCluster(spec ClusterSpec, factory client.ConnectionFactory, clientset *kubernetes.Clientset) *Cluster {
|
||||
return &Cluster{
|
||||
Spec: spec,
|
||||
factory: factory,
|
||||
clientset: clientset,
|
||||
}
|
||||
c.Spec.Version = version
|
||||
c.Spec.UseAllDevices = useAllDevices
|
||||
return c
|
||||
}
|
||||
|
||||
func (c *Cluster) CreateInstance() error {
|
||||
|
||||
// Create the namespace if not already created
|
||||
ns := &v1.Namespace{ObjectMeta: v1.ObjectMeta{Name: c.Namespace}}
|
||||
ns := &v1.Namespace{ObjectMeta: v1.ObjectMeta{Name: c.Spec.Namespace}}
|
||||
_, err := c.clientset.Namespaces().Create(ns)
|
||||
if err != nil {
|
||||
if !k8sutil.IsKubernetesResourceAlreadyExistError(err) {
|
||||
return fmt.Errorf("failed to create namespace %s. %+v", c.Namespace, err)
|
||||
return fmt.Errorf("failed to create namespace %s. %+v", c.Spec.Namespace, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Start the mon pods
|
||||
m := mon.New(c.Namespace, c.factory, c.Spec.Version)
|
||||
m := mon.New(c.Spec.Namespace, c.factory, c.Spec.Version)
|
||||
cluster, err := m.Start(c.clientset)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to start the mons. %+v", err)
|
||||
}
|
||||
|
||||
a := api.New(c.Namespace, c.Spec.Version)
|
||||
a := api.New(c.Spec.Namespace, c.Spec.Version)
|
||||
err = a.Start(c.clientset, cluster)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to start the REST api. %+v", err)
|
||||
}
|
||||
|
||||
// Start the OSDs
|
||||
osds := osd.New(c.Namespace, c.Spec.Version, c.Spec.UseAllDevices)
|
||||
osds := osd.New(c.Spec.Namespace, c.Spec.Version, c.Spec.UseAllDevices)
|
||||
err = osds.Start(c.clientset, cluster)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to start the osds. %+v", err)
|
||||
@@ -103,7 +99,7 @@ func (c *Cluster) CreateInstance() error {
|
||||
return fmt.Errorf("failed to create client access. %+v", err)
|
||||
}
|
||||
|
||||
logger.Infof("Done creating rook instance in namespace %s", c.Namespace)
|
||||
logger.Infof("Done creating rook instance in namespace %s", c.Spec.Namespace)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -133,28 +129,29 @@ func (c *Cluster) createClientAccess(clusterInfo *cephmon.ClusterInfo) error {
|
||||
}
|
||||
|
||||
// store the secret for the rbd user in the default namespace
|
||||
name := fmt.Sprintf("%s-rbd-user", c.Spec.Namespace)
|
||||
secrets := map[string]string{
|
||||
"key": rbdKey,
|
||||
}
|
||||
secret := &v1.Secret{
|
||||
ObjectMeta: v1.ObjectMeta{Name: "rook-rbd-user"},
|
||||
ObjectMeta: v1.ObjectMeta{Name: name},
|
||||
StringData: secrets,
|
||||
Type: k8sutil.RbdType,
|
||||
}
|
||||
_, err = c.clientset.Secrets(k8sutil.DefaultNamespace).Create(secret)
|
||||
if err != nil {
|
||||
if !k8sutil.IsKubernetesResourceAlreadyExistError(err) {
|
||||
return fmt.Errorf("failed to save rook-rbd-user secret. %+v", err)
|
||||
return fmt.Errorf("failed to save %s secret. %+v", name, err)
|
||||
}
|
||||
|
||||
// update the secret in case we have a new cluster
|
||||
_, err = c.clientset.Secrets(k8sutil.DefaultNamespace).Update(secret)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to update rook-rbd-user secret. %+v", err)
|
||||
return fmt.Errorf("failed to update %s secret. %+v", name, err)
|
||||
}
|
||||
logger.Infof("updated existing rook-rbd-user secret")
|
||||
logger.Infof("updated existing %s secret", name)
|
||||
} else {
|
||||
logger.Infof("saved rook-rbd-user secret")
|
||||
logger.Infof("saved %s secret", name)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
+33
-25
@@ -53,14 +53,15 @@ const (
|
||||
)
|
||||
|
||||
type Operator struct {
|
||||
Namespace string
|
||||
MasterHost string
|
||||
clientset *kubernetes.Clientset
|
||||
waitCluster sync.WaitGroup
|
||||
factory client.ConnectionFactory
|
||||
stopChMap map[string]chan struct{}
|
||||
clusters map[string]*Cluster
|
||||
kubeHttpCli *http.Client
|
||||
Namespace string
|
||||
MasterHost string
|
||||
devicesInUse bool
|
||||
clientset *kubernetes.Clientset
|
||||
waitCluster sync.WaitGroup
|
||||
factory client.ConnectionFactory
|
||||
stopChMap map[string]chan struct{}
|
||||
clusters map[string]*Cluster
|
||||
kubeHttpCli *http.Client
|
||||
// Kubernetes resource version of the clusters
|
||||
clusterRVs map[string]string
|
||||
}
|
||||
@@ -140,18 +141,14 @@ func (o *Operator) watchTPR(watchVersion string) error {
|
||||
continue
|
||||
}
|
||||
|
||||
if len(o.stopChMap) > 0 {
|
||||
logger.Warningf("only a single rook cluster is currently supported. Ignoring cluster for namespace %s", ns)
|
||||
} else {
|
||||
newCluster := newCluster(ns, c.Spec.Version, c.Spec.UseAllDevices, o.factory, o.clientset)
|
||||
stopCh := make(chan struct{})
|
||||
o.stopChMap[ns] = stopCh
|
||||
o.clusters[ns] = newCluster
|
||||
o.clusterRVs[ns] = c.Metadata.ResourceVersion
|
||||
newCluster := newCluster(c.Spec, o.factory, o.clientset)
|
||||
stopCh := make(chan struct{})
|
||||
o.stopChMap[ns] = stopCh
|
||||
o.clusters[ns] = newCluster
|
||||
o.clusterRVs[ns] = c.Metadata.ResourceVersion
|
||||
|
||||
logger.Infof("starting new cluster %s in namespace %s", c.Metadata.Name, ns)
|
||||
go startCluster(newCluster)
|
||||
}
|
||||
logger.Infof("starting new cluster %s in namespace %s", c.Metadata.Name, ns)
|
||||
o.startCluster(newCluster)
|
||||
|
||||
case kwatch.Modified:
|
||||
logger.Infof("modifying a cluster not implemented")
|
||||
@@ -167,11 +164,22 @@ func (o *Operator) watchTPR(watchVersion string) error {
|
||||
|
||||
}
|
||||
|
||||
func startCluster(cluster *Cluster) {
|
||||
err := cluster.CreateInstance()
|
||||
if err != nil {
|
||||
logger.Errorf("failed to create cluster in namespace %s. %+v", cluster.Namespace, err)
|
||||
func (o *Operator) startCluster(cluster *Cluster) {
|
||||
if o.devicesInUse && cluster.Spec.UseAllDevices {
|
||||
logger.Warningf("devices in more than one namespace not supported. ignoring devices in namespace %s", cluster.Spec.Namespace)
|
||||
cluster.Spec.UseAllDevices = false
|
||||
}
|
||||
|
||||
if cluster.Spec.UseAllDevices {
|
||||
o.devicesInUse = true
|
||||
}
|
||||
|
||||
go func() {
|
||||
err := cluster.CreateInstance()
|
||||
if err != nil {
|
||||
logger.Errorf("failed to create cluster in namespace %s. %+v", cluster.Spec.Namespace, err)
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func (o *Operator) findAllClusters() (string, error) {
|
||||
@@ -186,13 +194,13 @@ func (o *Operator) findAllClusters() (string, error) {
|
||||
|
||||
stopCh := make(chan struct{})
|
||||
ns := c.Spec.Namespace
|
||||
existingCluster := newCluster(ns, c.Spec.Version, c.Spec.UseAllDevices, o.factory, o.clientset)
|
||||
existingCluster := newCluster(c.Spec, o.factory, o.clientset)
|
||||
o.stopChMap[ns] = stopCh
|
||||
o.clusters[ns] = existingCluster
|
||||
o.clusterRVs[ns] = c.Metadata.ResourceVersion
|
||||
|
||||
logger.Infof("resuming cluster %s in namespace %s", c.Metadata.Name, ns)
|
||||
go startCluster(existingCluster)
|
||||
o.startCluster(existingCluster)
|
||||
}
|
||||
|
||||
return clusterList.Metadata.ResourceVersion, nil
|
||||
|
||||
Reference in new issue
Block a user