Added unit tests for ensuring server image default

Author: bcurrerb

pkg/apis/mysql/v1alpha1/cluster_test.go

@@ -85,8 +85,8 @@ func TestDefaultVersion(t *testing.T) {
 	cluster := &Cluster{}
 	cluster.EnsureDefaults()
 
-	if cluster.Spec.Version != defaultVersion {
-		t.Errorf("Expected default version to be %s but got %s", defaultVersion, cluster.Spec.Version)
+	if cluster.Spec.Version != DefaultVersion {
+		t.Errorf("Expected default version to be %s but got %s", DefaultVersion, cluster.Spec.Version)
 	}
 }
 

pkg/apis/mysql/v1alpha1/helpers.go

@@ -20,14 +20,15 @@ import (
 )
 
 const (
-	// The default MySQL version to use if not specified explicitly by user
-	defaultVersion      = "8.0.12"
+	// DefaultVersion is the MySQL version to use if not specified explicitly by user
+	DefaultVersion      = "8.0.12"
 	defaultMembers      = 3
 	defaultBaseServerID = 1000
 	// maxBaseServerID is the maximum safe value for BaseServerID calculated
 	// as max MySQL server_id value - max Replication Group size.
 	maxBaseServerID uint32 = 4294967295 - 9
-	mysqlServer            = "mysql/mysql-server"
+	// MysqlServer is the image to use if no image is specified explicitly by the user.
+	MysqlServer = "mysql/mysql-server"
 )
 
 const (
@@ -65,11 +66,11 @@ func (c *Cluster) EnsureDefaults() *Cluster {
 	}
 
 	if c.Spec.Version == "" {
-		c.Spec.Version = defaultVersion
+		c.Spec.Version = DefaultVersion
 	}
 
 	if c.Spec.MySQLServerImage == "" {
-		c.Spec.MySQLServerImage = mysqlServer
+		c.Spec.MySQLServerImage = MysqlServer
 	}
 
 	return c

pkg/resources/statefulsets/statefulset_test.go

@@ -18,9 +18,10 @@ import (
 	"reflect"
 	"testing"
 
+	"k8s.io/api/core/v1"
+
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/oracle/mysql-operator/pkg/apis/mysql/v1alpha1"
@@ -223,67 +224,34 @@ func TestClusterWithTolerations(t *testing.T) {
 	}
 }
 
-func TestClusterWithResourceRequirements(t *testing.T) {
-	mysqlServerResourceRequirements := corev1.ResourceRequirements{
-		Limits: corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse("2"),
-			corev1.ResourceMemory: resource.MustParse("2Gi"),
-		},
-		Requests: corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse("500m"),
-			corev1.ResourceMemory: resource.MustParse("1Gi"),
-		},
-	}
-
-	mysqlAgentResourceRequirements := corev1.ResourceRequirements{
-		Limits: corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse("500m"),
-			corev1.ResourceMemory: resource.MustParse("512Mi"),
-		},
-		Requests: corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse("100m"),
-			corev1.ResourceMemory: resource.MustParse("128Mi"),
-		},
-	}
-
+func TestClusterEnterpriseImage(t *testing.T) {
 	cluster := &v1alpha1.Cluster{
 		Spec: v1alpha1.ClusterSpec{
-			Resources: &v1alpha1.Resources{
-				Server: &mysqlServerResourceRequirements,
-				Agent:  &mysqlAgentResourceRequirements,
+			MySQLServerImage: "some/image/path",
+			ImagePullSecret: &v1.LocalObjectReference{
+				Name: "someSecretName",
 			},
 		},
 	}
+	cluster.EnsureDefaults()
 
 	statefulSet := NewForCluster(cluster, mockOperatorConfig().Images, "mycluster")
 
-	assert.Equal(t, mysqlServerResourceRequirements, statefulSet.Spec.Template.Spec.Containers[0].Resources, "MySQL-Server container resource requirements do not match expected.")
-	assert.Equal(t, mysqlAgentResourceRequirements, statefulSet.Spec.Template.Spec.Containers[1].Resources, "MySQL-Agent container resource requirements do not match expected.")
-}
+	pullSecrets := statefulSet.Spec.Template.Spec.ImagePullSecrets
+	ps := pullSecrets[len(pullSecrets)-1]
+	si := statefulSet.Spec.Template.Spec.Containers[0].Image
 
-func TestClusterWithOnlyMysqlServerResourceRequirements(t *testing.T) {
-	mysqlServerResourceRequirements := corev1.ResourceRequirements{
-		Limits: corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse("2"),
-			corev1.ResourceMemory: resource.MustParse("2Gi"),
-		},
-		Requests: corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse("500m"),
-			corev1.ResourceMemory: resource.MustParse("1Gi"),
-		},
-	}
+	assert.Equal(t, "someSecretName", ps.Name)
+	assert.Equal(t, "some/image/path:"+v1alpha1.DefaultVersion, si)
+}
 
-	cluster := &v1alpha1.Cluster{
-		Spec: v1alpha1.ClusterSpec{
-			Resources: &v1alpha1.Resources{
-				Server: &mysqlServerResourceRequirements,
-			},
-		},
-	}
+func TestClusterNoImage(t *testing.T) {
+	cluster := &v1alpha1.Cluster{}
+	cluster.EnsureDefaults()
 
 	statefulSet := NewForCluster(cluster, mockOperatorConfig().Images, "mycluster")
 
-	assert.Equal(t, mysqlServerResourceRequirements, statefulSet.Spec.Template.Spec.Containers[0].Resources, "MySQL-Server container resource requirements do not match expected.")
-	assert.Nil(t, statefulSet.Spec.Template.Spec.Containers[1].Resources.Limits, "MySQL-Agent container has resource limits set which were not initially defined in the spec")
-	assert.Nil(t, statefulSet.Spec.Template.Spec.Containers[1].Resources.Requests, "MySQL-Agent container has resource requests set which were not initially defined in the spec")
+	si := statefulSet.Spec.Template.Spec.Containers[0].Image
+
+	assert.Equal(t, v1alpha1.MysqlServer+":"+v1alpha1.DefaultVersion, si)
 }