From 604720e147bf2486369f61078b80144d737b2233 Mon Sep 17 00:00:00 2001 From: Jack Lin Date: Mon, 6 May 2024 11:58:33 +0800 Subject: [PATCH] Revert "fix(webhook): disable tsl 1.0 and 1.1 on webhook service" This reverts commit a2dd56a4660015a6f41b4c4679d47036b49166fa. Signed-off-by: Jack Lin --- webhook/server/server.go | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/webhook/server/server.go b/webhook/server/server.go index 947edf0fe8..45525c3fdb 100644 --- a/webhook/server/server.go +++ b/webhook/server/server.go @@ -2,7 +2,6 @@ package server import ( "context" - "crypto/tls" "fmt" "net/http" "reflect" @@ -34,17 +33,6 @@ var ( sideEffectClassNone = admissionregv1.SideEffectClassNone ) -var ( - whiteListedCiphers = []uint16{ - tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, - tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, - tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, - tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, - } -) - type WebhookServer struct { context context.Context namespace string @@ -190,10 +178,6 @@ func (s *WebhookServer) runAdmissionWebhookListenAndServe(handler http.Handler, tlsName, }, FilterCN: dynamiclistener.OnlyAllow(tlsName), - TLSConfig: &tls.Config{ - MinVersion: tls.VersionTLS12, - CipherSuites: whiteListedCiphers, - }, }, }) } @@ -253,10 +237,6 @@ func (s *WebhookServer) runConversionWebhookListenAndServe(handler http.Handler, tlsName, }, FilterCN: dynamiclistener.OnlyAllow(tlsName), - TLSConfig: &tls.Config{ - MinVersion: tls.VersionTLS12, - CipherSuites: whiteListedCiphers, - }, }, }) }