@@ -17,7 +17,6 @@ package main
17
17
18
18
import (
19
19
"context"
20
- "crypto/tls"
21
20
"flag"
22
21
"fmt"
23
22
"net/http"
52
51
notAfterLimit timestampFlag
53
52
54
53
httpEndpoint = flag .String ("http_endpoint" , "localhost:6962" , "Endpoint for HTTP (host:port)." )
55
- tlsCert = flag .String ("tls_certificate" , "" , "Path to server TLS certificate." )
56
- tlsKey = flag .String ("tls_key" , "" , "Path to server TLS private key." )
57
54
metricsEndpoint = flag .String ("metrics_endpoint" , "" , "Endpoint for serving metrics; if left empty, metrics will be visible on --http_endpoint." )
58
55
tesseraDeadline = flag .Duration ("tessera_deadline" , time .Second * 10 , "Deadline for Tessera requests." )
59
56
maskInternalErrors = flag .Bool ("mask_internal_errors" , false , "Don't return error strings with Internal Server Error HTTP responses." )
@@ -165,20 +162,7 @@ func main() {
165
162
}
166
163
167
164
// Bring up the HTTP server and serve until we get a signal not to.
168
- srv := http.Server {}
169
- if * tlsCert != "" && * tlsKey != "" {
170
- cert , err := tls .LoadX509KeyPair (* tlsCert , * tlsKey )
171
- if err != nil {
172
- klog .Errorf ("failed to load TLS certificate/key: %v" , err )
173
- }
174
- tlsConfig := & tls.Config {
175
- Certificates : []tls.Certificate {cert },
176
- MinVersion : tls .VersionTLS12 ,
177
- }
178
- srv = http.Server {Addr : * httpEndpoint , Handler : handler , TLSConfig : tlsConfig }
179
- } else {
180
- srv = http.Server {Addr : * httpEndpoint , Handler : handler }
181
- }
165
+ srv := http.Server {Addr : * httpEndpoint , Handler : handler }
182
166
shutdownWG := new (sync.WaitGroup )
183
167
go awaitSignal (func () {
184
168
shutdownWG .Add (1 )
@@ -194,14 +178,7 @@ func main() {
194
178
klog .Info ("HTTP server shutdown" )
195
179
})
196
180
197
- if * tlsCert != "" && * tlsKey != "" {
198
- err = srv .ListenAndServeTLS ("" , "" )
199
- } else {
200
- err = srv .ListenAndServe ()
201
- }
202
- if err != http .ErrServerClosed {
203
- klog .Warningf ("Server exited: %v" , err )
204
- }
181
+ err = srv .ListenAndServe ()
205
182
// Wait will only block if the function passed to awaitSignal was called,
206
183
// in which case it'll block until the HTTP server has gracefully shutdown
207
184
shutdownWG .Wait ()
0 commit comments