some fixes

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

pkg/storage/elasticsearch_secrets.go

@@ -100,7 +100,7 @@ func CreateESCerts(jaeger *v1.Jaeger, existingSecrets []corev1.Secret) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to extract certificates from secrets to file")
 	}
-	return createESCerts(certScript, getWorkingDir(jaeger), jaeger.Namespace)
+	return createESCerts(certScript, jaeger)
 }
 
 func extractSecretsToFile(jaeger *v1.Jaeger, secrets []corev1.Secret, s ...secret) error {
@@ -133,12 +133,12 @@ func getWorkingDir(jaeger *v1.Jaeger) string {
 }
 
 // createESCerts runs bash scripts which generates certificates
-func createESCerts(script, workDir, namespace string) error {
+func createESCerts(script string, jaeger *v1.Jaeger) error {
 	// #nosec   G204: Subprocess launching should be audited
 	cmd := exec.Command("bash", script)
 	cmd.Env = append(os.Environ(),
-		"NAMESPACE="+namespace,
-		"WORKING_DIR="+workDir,
+		"NAMESPACE="+jaeger.Namespace,
+		"WORKING_DIR="+getWorkingDir(jaeger),
 	)
 	if out, err := cmd.CombinedOutput(); err != nil {
 		log.WithFields(log.Fields{

pkg/storage/elasticsearch_secrets_test.go

@@ -21,22 +21,27 @@ func TestCreateESSecrets(t *testing.T) {
 }
 
 func TestCreateESSecrets_internal(t *testing.T) {
-	defer os.RemoveAll(tmpWorkingDir + "/foo")
+	//defer os.RemoveAll(tmpWorkingDir)
 	j := v1.NewJaeger("foo")
-	err := createESCerts("../../scripts/cert_generation.sh", tmpWorkingDir+"/foo", "")
+	j.Namespace = "myproject"
+	err := createESCerts("../../scripts/cert_generation.sh", j)
 	assert.NoError(t, err)
 	sec := ESSecrets(j)
 	assert.Equal(t, []string{
 		masterSecret.instanceName(j),
-		"elasticsearch",
+		esSecret.instanceName(j),
 		jaegerSecret.instanceName(j),
 		curatorSecret.instanceName(j)},
 		[]string{sec[0].Name, sec[1].Name, sec[2].Name, sec[3].Name})
 	for _, s := range sec {
 		if s.Name == jaegerSecret.instanceName(j) {
-			ca, err := ioutil.ReadFile(tmpWorkingDir + "/foo/ca.crt")
+			ca, err := ioutil.ReadFile(tmpWorkingDir + "/myproject/foo/ca.crt")
+			assert.NoError(t, err)
+			key, err := ioutil.ReadFile(tmpWorkingDir + "/myproject/foo/user.myproject.jaeger.key")
+			assert.NoError(t, err)
+			cert, err := ioutil.ReadFile(tmpWorkingDir + "/myproject/foo/user.myproject.jaeger.crt")
 			assert.NoError(t, err)
-			assert.Equal(t, map[string][]byte{"ca": ca}, s.Data)
+			assert.Equal(t, map[string][]byte{"ca": ca, "key": key, "cert": cert}, s.Data)
 		}
 	}
 }

pkg/storage/elasticsearch_test.go

@@ -189,7 +189,7 @@ func TestInject(t *testing.T) {
 						"--es.tls=true",
 						"--es.tls.ca=" + caPath,
 						"--es.tls.cert=" + certPath,
-						"--es.tls.path=" + keyPath,
+						"--es.tls.key=" + keyPath,
 						"--es.timeout=15s",
 						"--es.num-shards=12",
 						"--es.num-replicas=11",