Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix EnterpriseSearch upgrade with TLS disabled #6224

Merged
merged 2 commits into from
Dec 20, 2022
Merged

Fix EnterpriseSearch upgrade with TLS disabled #6224

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34d5391
correctly create ent http client when tls disabled
thbkrkr Dec 12, 2022
9713e52
Transform ent no tls e2e test to test version upgrade
thbkrkr Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkg/controller/enterprisesearch/version_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,13 @@ func (r *VersionUpgrade) setReadOnlyMode(ctx context.Context, enabled bool) erro
httpClient := r.httpClient
if httpClient == nil {
// build an HTTP client to reach the Enterprise Search service
tlsCerts, err := r.retrieveTLSCerts()
if err != nil {
return err
var tlsCerts []*x509.Certificate
if r.ent.Spec.HTTP.TLS.Enabled() {
var err error
tlsCerts, err = r.retrieveTLSCerts()
if err != nil {
return err
}
}
httpClient = apmhttp.WrapClient(
commonhttp.Client(r.dialer, tlsCerts, 0),
Expand Down