Allow Configuration of Mongo image and registry (#137)

Author: chatton

.evergreen.yml

@@ -40,7 +40,7 @@ functions:
           DIR: ${workdir}/bin
 
   # upload_e2e_logs has the responsibility of dumping as much information as
-  # posible into the S3 bucket
+  # possible into the S3 bucket
   upload_e2e_logs:
     - command: s3.put
       params:

deploy/operator.yaml

@@ -17,7 +17,7 @@ spec:
         - name: mongodb-kubernetes-operator
           image: quay.io/mongodb/mongodb-kubernetes-operator:0.2.0
           command:
-          - mongodb-kubernetes-operator
+            - mongodb-kubernetes-operator
           imagePullPolicy: Always
           env:
             - name: WATCH_NAMESPACE
@@ -34,3 +34,7 @@ spec:
               value: quay.io/mongodb/mongodb-agent:10.19.0.6562-1
             - name: VERSION_UPGRADE_HOOK_IMAGE
               value: quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.2
+            - name: MONGODB_IMAGE
+              value: "library/mongo"
+            - name: MONGODB_REPO_URL
+              value: "registry.hub.docker.com"

pkg/authentication/scramcredentials/scram_credentials.go

@@ -2,7 +2,7 @@ package scramcredentials
 
 import (
 	"crypto/hmac"
-	"crypto/md5"
+	"crypto/md5"  //nolint
 	"crypto/sha1" //nolint
 	"crypto/sha256"
 	"encoding/base64"
@@ -44,8 +44,8 @@ func ComputeScramSha1Creds(username, password string, salt []byte) (ScramCreds,
 }
 
 func md5Hex(s string) string {
-	h := md5.New()
-	h.Write([]byte(s))
+	h := md5.New()     // nolint
+	h.Write([]byte(s)) //nolint
 	return hex.EncodeToString(h.Sum(nil))
 }
 

pkg/authentication/scramcredentials/scram_credentials_test.go

@@ -1,7 +1,7 @@
 package scramcredentials
 
 import (
-	"crypto/sha1"
+	"crypto/sha1" //nolint
 	"crypto/sha256"
 	"hash"
 	"testing"

pkg/controller/mongodb/build_statefulset_test.go

@@ -18,6 +18,9 @@ func init() {
 }
 
 func TestMultipleCalls_DoNotCauseSideEffects(t *testing.T) {
+	_ = os.Setenv(mongodbRepoUrl, "repo")
+	_ = os.Setenv(mongodbImageEnv, "mongo")
+
 	mdb := newTestReplicaSet()
 	stsFunc := buildStatefulSetModificationFunction(mdb)
 	sts := &appsv1.StatefulSet{}
@@ -56,7 +59,7 @@ func assertStatefulSetIsBuiltCorrectly(t *testing.T, mdb mdbv1.MongoDB, sts *app
 	assert.Len(t, agentContainer.VolumeMounts, 4)
 
 	mongodContainer := sts.Spec.Template.Spec.Containers[1]
-	assert.Equal(t, "mongo:4.2.2", mongodContainer.Image)
+	assert.Equal(t, "repo/mongo:4.2.2", mongodContainer.Image)
 	assert.NotNil(t, sts.Spec.Template.Spec.Containers[0].ReadinessProbe)
 	assert.Len(t, mongodContainer.VolumeMounts, 4)
 

pkg/controller/mongodb/replica_set_controller.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/util/envvar"
@@ -56,6 +57,8 @@ const (
 	agentImageEnv                = "AGENT_IMAGE"
 	versionUpgradeHookImageEnv   = "VERSION_UPGRADE_HOOK_IMAGE"
 	agentHealthStatusFilePathEnv = "AGENT_STATUS_FILEPATH"
+	mongodbImageEnv              = "MONGODB_IMAGE"
+	mongodbRepoUrl               = "MONGODB_REPO_URL"
 	mongodbToolsVersionEnv       = "MONGODB_TOOLS_VERSION"
 
 	AutomationConfigKey            = "automation-config"
@@ -505,7 +508,7 @@ func getMongodConfigModification(mdb mdbv1.MongoDB) automationconfig.Modificatio
 	return func(ac *automationconfig.AutomationConfig) {
 		for i := range ac.Processes {
 			// Mergo requires both objects to have the same type
-			// TODO: proper error handling
+			// TODO: handle this error gracefully, we may need to add an error as second argument for all modification functions
 			_ = mergo.Merge(&ac.Processes[i].Args26, objx.New(mdb.Spec.AdditionalMongodConfig.Object), mergo.WithOverride)
 		}
 	}
@@ -572,6 +575,15 @@ func versionUpgradeHookInit(volumeMount []corev1.VolumeMount) container.Modifica
 	)
 }
 
+func getMongoDBImage(version string) string {
+	repoUrl := os.Getenv(mongodbRepoUrl)
+	if strings.HasSuffix(repoUrl, "/") {
+		repoUrl = strings.TrimRight(repoUrl, "/")
+	}
+	mongoImageName := os.Getenv(mongodbImageEnv)
+	return fmt.Sprintf("%s/%s:%s", repoUrl, mongoImageName, version)
+}
+
 func mongodbContainer(version string, volumeMounts []corev1.VolumeMount) container.Modification {
 	mongoDbCommand := []string{
 		"/bin/sh",
@@ -590,7 +602,7 @@ exec mongod -f /data/automation-mongod.conf ;
 
 	return container.Apply(
 		container.WithName(mongodbName),
-		container.WithImage(fmt.Sprintf("mongo:%s", version)),
+		container.WithImage(getMongoDBImage(version)),
 		container.WithResourceRequirements(resourcerequirements.Defaults()),
 		container.WithCommand(mongoDbCommand),
 		container.WithEnvs(

pkg/controller/mongodb/replicaset_controller_test.go

@@ -142,6 +142,9 @@ func TestKubernetesResources_AreCreated(t *testing.T) {
 }
 
 func TestStatefulSet_IsCorrectlyConfigured(t *testing.T) {
+	_ = os.Setenv(mongodbRepoUrl, "repo")
+	_ = os.Setenv(mongodbImageEnv, "mongo")
+
 	mdb := newTestReplicaSet()
 	mgr := client.NewManager(&mdb)
 	r := newReconciler(mgr, mockManifestProvider(mdb.Spec.Version))
@@ -162,7 +165,7 @@ func TestStatefulSet_IsCorrectlyConfigured(t *testing.T) {
 
 	mongodbContainer := sts.Spec.Template.Spec.Containers[1]
 	assert.Equal(t, mongodbName, mongodbContainer.Name)
-	assert.Equal(t, "mongo:4.2.2", mongodbContainer.Image)
+	assert.Equal(t, "repo/mongo:4.2.2", mongodbContainer.Image)
 
 	assert.Equal(t, resourcerequirements.Defaults(), agentContainer.Resources)
 

test/e2e/setup/setup.go

@@ -50,7 +50,7 @@ func registerTypesWithFramework(newTypes ...runtime.Object) error {
 
 // CreateTLSResources will setup the CA ConfigMap and cert-key Secret necessary for TLS
 // The certificates and keys are stored in testdata/tls
-func CreateTLSResources(namespace string, ctx *f.TestCtx) error {
+func CreateTLSResources(namespace string, ctx *f.TestCtx) error { //nolint
 	tlsConfig := e2eutil.NewTestTLSConfig(false)
 
 	// Create CA ConfigMap