cleanup

Signed-off-by: Yuri Shkuro <[email protected]>
jaegertracing · Dec 12, 2024 · 8720eb8 · 8720eb8
1 parent 4569ab2
commit 8720eb8
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/cmd/internal/flags/admin.go b/cmd/internal/flags/admin.go
@@ -76,19 +76,13 @@ func (s *AdminServer) AddFlags(flagSet *flag.FlagSet) {
 func (s *AdminServer) initFromViper(v *viper.Viper, logger *zap.Logger) error {
 	s.setLogger(logger)
 
-	s.serverCfg.Endpoint = v.GetString(adminHTTPHostPort)
 	tlsAdminHTTP, err := tlsAdminHTTPFlagsConfig.InitFromViper(v)
 	if err != nil {
 		return fmt.Errorf("failed to parse admin server TLS options: %w", err)
 	}
-	tlsAdminHTTPConfig := tlsAdminHTTP.ToOtelServerConfig()
-	if tlsAdminHTTPConfig != nil {
-		s.serverCfg.TLSSetting = tlsAdminHTTPConfig
-		_, err = s.serverCfg.TLSSetting.LoadTLSConfig(context.Background())
-		if err != nil {
-			return err
-		}
-	}
+
+	s.serverCfg.Endpoint = v.GetString(adminHTTPHostPort)
+	s.serverCfg.TLSSetting = tlsAdminHTTP.ToOtelServerConfig()
 	return nil
 }