Skip to content

Commit

Permalink
delete patch for virt-operator
Browse files Browse the repository at this point in the history
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
  • Loading branch information
nevermarine committed Nov 29, 2024
1 parent 2590d7e commit 8d62cf3
Showing 1 changed file with 0 additions and 29 deletions.
29 changes: 0 additions & 29 deletions images/virt-artifact/patches/024-cover-kubevirt-metrics.patch
Original file line number Diff line number Diff line change
Expand Up @@ -229,35 +229,6 @@ index f80a0653ad..4a8d20d7be 100644

vca.AddCommonFlags()

diff --git a/pkg/virt-operator/application.go b/pkg/virt-operator/application.go
index 47b4880c38..7eb20f19b0 100644
--- a/pkg/virt-operator/application.go
+++ b/pkg/virt-operator/application.go
@@ -341,7 +341,6 @@ func Execute() {
}

func (app *VirtOperatorApp) Run() {
- promTLSConfig := kvtls.SetupPromTLS(app.operatorCertManager, app.clusterConfig)

go func() {

@@ -361,14 +360,10 @@ func (app *VirtOperatorApp) Run() {
restfulContainer.Add(webService)

server := http.Server{
- Addr: app.ServiceListen.Address(),
+ Addr: app.ServiceListen.MetricsAddress(),
Handler: mux,
- TLSConfig: promTLSConfig,
- // Disable HTTP/2
- // See CVE-2023-44487
- TLSNextProto: map[string]func(*http.Server, *tls.Conn, http.Handler){},
}
- if err := server.ListenAndServeTLS("", ""); err != nil {
+ if err := server.ListenAndServe(); err != nil {
golog.Fatal(err)
}
}()
diff --git a/pkg/virt-operator/resource/generate/components/daemonsets.go b/pkg/virt-operator/resource/generate/components/daemonsets.go
index da6e00c783..9bfd336b70 100644
--- a/pkg/virt-operator/resource/generate/components/daemonsets.go
Expand Down

0 comments on commit 8d62cf3

Please sign in to comment.