diff --git a/pkg/managerdriver/testdata/translator/gwapi-gateway-tls-valid.yaml b/pkg/managerdriver/testdata/translator/gwapi-gateway-tls-valid.yaml index 392abf98..636dbd2e 100644 --- a/pkg/managerdriver/testdata/translator/gwapi-gateway-tls-valid.yaml +++ b/pkg/managerdriver/testdata/translator/gwapi-gateway-tls-valid.yaml @@ -31,10 +31,6 @@ input: caCertificateRefs: - kind: ConfigMap name: ca-configmap - options: - "k8s.ngrok.com/min_version": "1.2" - "k8s.ngrok.com/max_version": "1.3" - "k8s.ngrok.com/mutual_tls_verification_strategy": "require-and-verify" httpRoutes: - apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute @@ -125,9 +121,6 @@ expected: actions: - type: terminate-tls config: - "mutual_tls_verification_strategy": "require-and-verify" - "min_version": "1.2" - "max_version": "1.3" "mutual_tls_certificate_authorities": - "CACert" "server_certificate": "ServerCert" diff --git a/pkg/managerdriver/translate_gatewayapi.go b/pkg/managerdriver/translate_gatewayapi.go index 122d6181..5855a6c9 100644 --- a/pkg/managerdriver/translate_gatewayapi.go +++ b/pkg/managerdriver/translate_gatewayapi.go @@ -18,12 +18,6 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" ) -const ( - GatewayTLSOption_MinVersion = "k8s.ngrok.com/min_version" - GatewayTLSOption_MaxVersion = "k8s.ngrok.com/max_version" - GatewayTLSOption_MTLSStrategy = "k8s.ngrok.com/mutual_tls_verification_strategy" -) - // #region GWAPI to IR type GatewayMatch struct { @@ -966,18 +960,5 @@ func gatewayTLSConfigToIR(log logr.Logger, store store.Storer, tlsCfg *gatewayv1 } } - if minTLSVersion, exists := tlsCfg.Options[GatewayTLSOption_MinVersion]; exists { - minTLSVersionString := string(minTLSVersion) - tlsTermCfg.MinVersion = &minTLSVersionString - } - if maxTLSVersion, exists := tlsCfg.Options[GatewayTLSOption_MaxVersion]; exists { - maxTLSVersionString := string(maxTLSVersion) - tlsTermCfg.MaxVersion = &maxTLSVersionString - } - if mtlsStrat, exists := tlsCfg.Options[GatewayTLSOption_MTLSStrategy]; exists { - mtlsStratString := string(mtlsStrat) - tlsTermCfg.MutualTLSVerificationStrategy = &mtlsStratString - } - return tlsTermCfg, nil }