Merge current v2.8 into master

This commit is contained in:
kevinpollet 2022-08-18 14:50:44 +02:00
commit 626da4c0ae
No known key found for this signature in database
GPG key ID: 0C9A5DDD1B292453
90 changed files with 1019 additions and 707 deletions

View file

@ -881,9 +881,8 @@ func buildTLSOptions(ctx context.Context, client Client) map[string]tls.Options
CAFiles: clientCAs,
ClientAuthType: tlsOption.Spec.ClientAuth.ClientAuthType,
},
SniStrict: tlsOption.Spec.SniStrict,
PreferServerCipherSuites: tlsOption.Spec.PreferServerCipherSuites,
ALPNProtocols: alpnProtocols,
SniStrict: tlsOption.Spec.SniStrict,
ALPNProtocols: alpnProtocols,
}
}