Skip to content

Commit

Permalink
Generate curator certs
Browse files Browse the repository at this point in the history
Signed-off-by: Pavol Loffay <[email protected]>
  • Loading branch information
pavolloffay committed Feb 13, 2019
1 parent 4423b3c commit 0b0f41f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkg/storage/elasticsearch.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ func CreateElasticsearchObjects(j *v1alpha1.Jaeger, collector, query *v1.PodSpec
return os, nil
}

// TODO inject curator certs to es-index-cleaner
func inject(p *v1.PodSpec) {
p.Volumes = append(p.Volumes, v1.Volume{
Name: volumeName,
Expand Down
5 changes: 5 additions & 0 deletions pkg/storage/elasticsearch_secrets.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ var secretCertificates = map[string]map[string]string{
"jaeger-elasticsearch": {
"ca": "ca.crt",
},
"curator": {
"ca": "ca.crt",
"key": "system.logging.curator.key",
"cert": "system.logging.curator.crt",
},
}

func createESSecrets(jaeger *v1alpha1.Jaeger) []*v1.Secret {
Expand Down
1 change: 1 addition & 0 deletions scripts/cert_generation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ init_cert_files
create_signing_conf

generate_certs 'system.admin'
generate_certs 'system.logging.curator'

# TODO: get es SAN DNS, IP values from es service names
generate_certs 'elasticsearch' "$(generate_extensions true true elasticsearch elasticsearch-infra elasticsearch-apps)"
Expand Down

0 comments on commit 0b0f41f

Please sign in to comment.