diff --git a/pkg/storage/elasticsearch_secrets.go b/pkg/storage/elasticsearch_secrets.go index 742bb5b90..a3b8bc651 100644 --- a/pkg/storage/elasticsearch_secrets.go +++ b/pkg/storage/elasticsearch_secrets.go @@ -26,15 +26,6 @@ type secret struct { content map[string]string } -// TODO remove? -var masterSecret = secret{ - name: "master-certs", - content: map[string]string{ - "masterca": "ca.crt", - "masterkey": "ca.key", - }, -} - var esSecret = secret{ name: "elasticsearch", content: map[string]string{ @@ -75,7 +66,6 @@ func ESSecrets(jaeger *v1alpha1.Jaeger) []v1.Secret { // the other problem for us is that sg_config.yml defines a role which depends on namespace // we could make the "resource" configurable once ES image and es-operator-are refactored // https://jira.coreos.com/browse/LOG-326 - createSecret(jaeger, masterSecret.name, getWorkingDirContents(masterSecret.content)), createSecret(jaeger, esSecret.name, getWorkingDirContents(esSecret.content)), createSecret(jaeger, secretName(jaeger.Name, jaegerSecret.name), getWorkingDirContents(jaegerSecret.content)), createSecret(jaeger, secretName(jaeger.Name, curatorSecret.name), getWorkingDirContents(curatorSecret.content)), diff --git a/pkg/storage/elasticsearch_secrets_test.go b/pkg/storage/elasticsearch_secrets_test.go index 16827e8db..8a664df47 100644 --- a/pkg/storage/elasticsearch_secrets_test.go +++ b/pkg/storage/elasticsearch_secrets_test.go @@ -33,13 +33,12 @@ func TestCreateESSecrets(t *testing.T) { err := createESCerts("../../scripts/cert_generation.sh") assert.NoError(t, err) sec := ESSecrets(j) - assert.Equal(t, 4, len(sec)) + assert.Equal(t, 3, len(sec)) assert.Equal(t, []string{ - "master-certs", "elasticsearch", fmt.Sprintf("%s-%s", j.Name, jaegerSecret.name), fmt.Sprintf("%s-%s", j.Name, curatorSecret.name)}, - []string{sec[0].Name, sec[1].Name, sec[2].Name, sec[3].Name}) + []string{sec[0].Name, sec[1].Name, sec[2].Name}) for _, s := range sec { if s.Name == fmt.Sprintf("%s-%s", j.Name, jaegerSecret.name) { ca, err := ioutil.ReadFile(workingDir + "/ca.crt")