Skip to content

Commit

Permalink
Remove ES master certs (#256)
Browse files Browse the repository at this point in the history
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
  • Loading branch information
pavolloffay authored and jpkrohling committed Mar 4, 2019
1 parent 15c9dac commit a31a5be
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
10 changes: 0 additions & 10 deletions pkg/storage/elasticsearch_secrets.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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)),
Expand Down
5 changes: 2 additions & 3 deletions pkg/storage/elasticsearch_secrets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit a31a5be

Please sign in to comment.