Fix tests

Author: calind

.drone.yml

@@ -3,6 +3,17 @@ workspace:
   path: src/github.com/presslabs/mysql-operator
 
 pipeline:
+  build:
+    image: golang:1.9
+    environment:
+      - APP_VERSION=${DRONE_BRANCH/master/latest}
+    commands:
+      - make full-test
+      - make build
+      - make install-docker
+    when:
+      event: push
+
   build:
     image: golang:1.9
     environment:
@@ -11,6 +22,8 @@ pipeline:
       - make full-test
       - make build
       - make install-docker
+    when:
+      event: tag
 
   publish-operator:
     group: publish

pkg/mysqlcluster/cluster_test.go

@@ -40,10 +40,6 @@ func (f *cFactory) SyncHeadlessService() (string, error) {
 	return f.syncHeadlessService()
 }
 
-func (f *cFactory) SyncEnvSecret() (string, error) {
-	return f.syncEnvSecret()
-}
-
 func (f *cFactory) SyncConfigMapFiles() (string, error) {
 	return f.syncConfigMysqlMap()
 }
@@ -108,8 +104,10 @@ func getFakeFactory(ns string, cluster *api.MysqlCluster, client *fake.Clientset
 	}
 
 	rec := record.NewFakeRecorder(100)
+	opt := newFakeOption()
 
 	return rec, &cFactory{
+		opt:       opt,
 		cluster:   cluster,
 		client:    client,
 		myClient:  myClient,
@@ -173,12 +171,6 @@ func TestSyncClusterCreationWithSecret(t *testing.T) {
 	}
 
 	var err error
-	_, err = client.CoreV1().Secrets(ns).Get(cluster.GetNameForResource(api.EnvSecret), metav1.GetOptions{})
-	if err != nil {
-		t.Fail()
-		return
-	}
-
 	_, err = client.CoreV1().ConfigMaps(ns).Get(cluster.GetNameForResource(api.ConfigMap), metav1.GetOptions{})
 	if err != nil {
 		t.Fail()

pkg/util/options/options.go

@@ -61,6 +61,9 @@ const (
 	defaultExporterImage = "prom/mysqld-exporter:latest"
 
 	defaultImagePullPolicy = v1.PullIfNotPresent
+
+	defaultOrchestratorTopologyUser     = ""
+	defaultOrchestratorTopologyPassword = ""
 )
 
 var (
@@ -79,9 +82,9 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
 		"The secret name for used as pull secret.")
 	fs.StringVar(&o.OrchestratorUri, "orchestrator-uri", "",
 		"The orchestrator uri")
-	fs.StringVar(&o.OrchestratorTopologyPassword, "orchestrator-topology-password", "",
+	fs.StringVar(&o.OrchestratorTopologyPassword, "orchestrator-topology-password", defaultOrchestratorTopologyUser,
 		"The orchestrator topology password. Can also be set as ORC_TOPOLOGY_PASSWORD environment variable.")
-	fs.StringVar(&o.OrchestratorTopologyUser, "orchestrator-topology-user", "",
+	fs.StringVar(&o.OrchestratorTopologyUser, "orchestrator-topology-user", defaultOrchestratorTopologyPassword,
 		"The orchestrator topology user. Can also be set as ORC_TOPOLOGY_USER environment variable.")
 	fs.DurationVar(&o.JobCompleteSuccessGraceTime, "job-grace-time", defaultJobGraceTime,
 		"The time in hours how jobs after completion are keept.")
@@ -99,6 +102,9 @@ func GetOptions() *Options {
 
 			ImagePullPolicy:             defaultImagePullPolicy,
 			JobCompleteSuccessGraceTime: defaultJobGraceTime,
+
+			OrchestratorTopologyUser:     "",
+			OrchestratorTopologyPassword: "",
 		}
 	})