luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #13678 from hashicorp/envoy-prometheus-tls-fix 

Fix syntax for envoy bootstrap prometheus secret config
This commit is contained in:
Kyle Havlovitz 2022-07-08 15:58:19 -07:00 committed by GitHub
parent 5b801db24b c31554ec64
commit 18aacf9b55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/connect/envoy/bootstrap_config.go
View File

@ -653,12 +653,10 @@ func (c *BootstrapConfig) generateListenerConfig(args *BootstrapTplArgs, bindAdd
}
],
"validationContextSdsSecretConfig": {
"trustedCa": {
"name": "prometheus_validation_context"
}
}
}
}
}`
}

2
command/connect/envoy/bootstrap_config_test.go
View File

@ -342,14 +342,12 @@ const (
}
],
"validationContextSdsSecretConfig": {
"trustedCa": {
"name": "prometheus_validation_context"
}
}
}
}
}
}
]
}`

2
command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden vendored
View File

@ -151,14 +151,12 @@
}
],
"validationContextSdsSecretConfig": {
"trustedCa": {
"name": "prometheus_validation_context"
}
}
}
}
}
}
]
}
],

2
command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden vendored
View File

@ -151,14 +151,12 @@
}
],
"validationContextSdsSecretConfig": {
"trustedCa": {
"name": "prometheus_validation_context"
}
}
}
}
}
}
]
}
],