set default ceph version to luminous

Signed-off-by: travisn <tnielsen@redhat.com>
This commit is contained in:
travisn committed 2018-11-01 11:49:36 -06:00
1 parent 94a7a0d4bc
commit ceb47f260d
3 files changed
+77 -4

No files matched your search

+4 -3
View File
@@ -16,7 +16,8 @@ limitations under the License.
package v1beta1
const (
Luminous = "luminous"
Mimic = "mimic"
Nautilus = "nautilus"
Luminous = "luminous"
Mimic = "mimic"
Nautilus = "nautilus"
DefaultLuminousImage = "ceph/ceph:v12.2.7"
)
+39 -1
View File
@@ -20,6 +20,7 @@ package cluster
import (
"fmt"
"strconv"
"strings"
opkit "github.com/rook/operator-kit"
cephv1beta1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1beta1"
@@ -48,7 +49,9 @@ func getClusterObject(obj interface{}) (cluster *cephv1beta1.Cluster, migrationN
cluster, ok = obj.(*cephv1beta1.Cluster)
if ok {
// the cluster object is of the latest type, simply return it
return cluster.DeepCopy(), false, nil
cluster = cluster.DeepCopy()
setClusterDefaults(cluster)
return cluster, false, nil
}
// type assertion to current cluster type failed, try instead asserting to the legacy cluster types
@@ -61,6 +64,41 @@ func getClusterObject(obj interface{}) (cluster *cephv1beta1.Cluster, migrationN
return nil, false, fmt.Errorf("not a known cluster object: %+v", obj)
}
func setClusterDefaults(cluster *cephv1beta1.Cluster) {
// The ceph version image should be set in the CRD.
// If/when the v1beta1 CRD is converted to v1, we could set this permanently during the conversion instead of
// setting this default in memory every time we run the operator.
if cluster.Spec.CephVersion.Image == "" {
logger.Infof("setting default luminous image: %s", cephv1beta1.DefaultLuminousImage)
cluster.Spec.CephVersion.Image = cephv1beta1.DefaultLuminousImage
cluster.Spec.CephVersion.Name = cephv1beta1.Luminous
} else {
// validate the major version of the image
parts := strings.Split(cluster.Spec.CephVersion.Image, ":")
if len(parts) == 2 {
v := parts[1]
if strings.HasPrefix(v, "v12.") {
setVersionName(cluster, cephv1beta1.Luminous)
} else if strings.HasPrefix(v, "v13.") {
setVersionName(cluster, cephv1beta1.Mimic)
} else if strings.HasPrefix(v, "v14.") {
setVersionName(cluster, cephv1beta1.Nautilus)
}
}
}
}
func setVersionName(cluster *cephv1beta1.Cluster, name string) {
if cluster.Spec.CephVersion.Name == name {
// the major version name is already set
return
}
if cluster.Spec.CephVersion.Name != "" {
logger.Warningf("changing the major version to %s from %s to match the image version", name, cluster.Spec.CephVersion.Name)
}
cluster.Spec.CephVersion.Name = name
}
func (c *ClusterController) migrateClusterObject(clusterToMigrate *cephv1beta1.Cluster, legacyObj interface{}) error {
logger.Infof("migrating legacy cluster %s in namespace %s", clusterToMigrate.Name, clusterToMigrate.Namespace)
@@ -54,6 +54,40 @@ func TestGetClusterObject(t *testing.T) {
assert.NotNil(t, err)
}
func TestDefaultClustervalues(t *testing.T) {
// the default ceph version should be set
cluster, _, err := getClusterObject(&cephv1beta1.Cluster{})
assert.NotNil(t, cluster)
assert.Nil(t, err)
assert.Equal(t, cephv1beta1.DefaultLuminousImage, cluster.Spec.CephVersion.Image)
assert.Equal(t, cephv1beta1.Luminous, cluster.Spec.CephVersion.Name)
// the correct ceph version name should be set based on the image
c := &cephv1beta1.Cluster{Spec: cephv1beta1.ClusterSpec{CephVersion: cephv1beta1.CephVersionSpec{Image: "ceph/ceph:v12.2.7"}}}
cluster, _, err = getClusterObject(c)
assert.NotNil(t, cluster)
assert.Nil(t, err)
assert.Equal(t, "ceph/ceph:v12.2.7", cluster.Spec.CephVersion.Image)
assert.Equal(t, cephv1beta1.Luminous, cluster.Spec.CephVersion.Name)
// the correct ceph version name should be set based on the image and override luminous
c.Spec.CephVersion.Image = "ceph/ceph:v13.2.1"
c.Spec.CephVersion.Name = cephv1beta1.Luminous
cluster, _, err = getClusterObject(c)
assert.NotNil(t, cluster)
assert.Nil(t, err)
assert.Equal(t, "ceph/ceph:v13.2.1", cluster.Spec.CephVersion.Image)
assert.Equal(t, cephv1beta1.Mimic, cluster.Spec.CephVersion.Name)
// the correct ceph version name should be set based on the image
c.Spec.CephVersion.Image = "ceph/ceph:v14.0.0"
cluster, _, err = getClusterObject(c)
assert.NotNil(t, cluster)
assert.Nil(t, err)
assert.Equal(t, "ceph/ceph:v14.0.0", cluster.Spec.CephVersion.Image)
assert.Equal(t, cephv1beta1.Nautilus, cluster.Spec.CephVersion.Name)
}
func TestMigrateClusterObject(t *testing.T) {
// create a legacy cluster that will get migrated
legacyCluster := &rookv1alpha1.Cluster{