Skip to content

Commit a91d43a

Browse files
authored
Merge pull request #1808 from tkatila/tls-cipher-updates
TLS cipher updates
2 parents e01c4e4 + 1a13dcd commit a91d43a

File tree

7 files changed

+31
-4
lines changed

7 files changed

+31
-4
lines changed

cmd/fpga_admissionwebhook/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ controller webhook plugin.
5454
The default webhook deployment depends on having [cert-manager](https://cert-manager.io/)
5555
installed. See its installation instructions [here](https://cert-manager.io/docs/installation/kubectl/).
5656

57+
> **Note**: The default deployment for the Intel FPGA webhook uses self-signed certificates. For a production cluster, the certificate issuer should be properly set and not use a self-signed method.
58+
5759
Also if your cluster operates behind a corporate proxy make sure that the API
5860
server is configured not to send requests to cluster services through the
5961
proxy. You can check that with the following command:

cmd/fpga_admissionwebhook/main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,14 @@ func main() {
5555
ctrl.SetLogger(textlogger.NewLogger(tlConf))
5656

5757
tlsCfgFunc := func(cfg *tls.Config) {
58-
cfg.MinVersion = tls.VersionTLS13
58+
cfg.MinVersion = tls.VersionTLS12
59+
cfg.MaxVersion = tls.VersionTLS12
60+
cfg.CipherSuites = []uint16{
61+
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
62+
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
63+
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
64+
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
65+
}
5966
}
6067

6168
webhookOptions := webhook.Options{

cmd/operator/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml: intel.feat
6262

6363
### Cert-Manager
6464

65+
> **Note**: The default deployment for the Intel Device Plugin operator uses self-signed certificates. For a production cluster, the certificate issuer should be properly set and not use a self-signed method.
66+
6567
The default operator deployment depends on [cert-manager](https://cert-manager.io/) running in the cluster.
6668
See installation instructions [here](https://cert-manager.io/docs/installation/kubectl/).
6769

cmd/operator/main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,14 @@ func main() {
135135
}
136136

137137
tlsCfgFunc := func(cfg *tls.Config) {
138-
cfg.MinVersion = tls.VersionTLS13
138+
cfg.MinVersion = tls.VersionTLS12
139+
cfg.MaxVersion = tls.VersionTLS12
140+
cfg.CipherSuites = []uint16{
141+
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
142+
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
143+
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
144+
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
145+
}
139146
}
140147

141148
webhookOptions := webhook.Options{

cmd/sgx_admissionwebhook/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ controller webhook plugin.
3232
The default webhook deployment depends on having [cert-manager](https://cert-manager.io/)
3333
installed. See its installation instructions [here](https://cert-manager.io/docs/installation/kubectl/).
3434

35+
> **Note**: The default deployment for the Intel SGX webhook uses self-signed certificates. For a production cluster, the certificate issuer should be properly set and not use a self-signed method.
36+
3537
Also if your cluster operates behind a corporate proxy make sure that the API
3638
server is configured not to send requests to cluster services through the
3739
proxy. You can check that with the following command:

cmd/sgx_admissionwebhook/main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@ func main() {
3737
ctrl.SetLogger(textlogger.NewLogger(tlConf))
3838

3939
tlsCfgFunc := func(cfg *tls.Config) {
40-
cfg.MinVersion = tls.VersionTLS13
40+
cfg.MinVersion = tls.VersionTLS12
41+
cfg.MaxVersion = tls.VersionTLS12
42+
cfg.CipherSuites = []uint16{
43+
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
44+
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
45+
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
46+
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
47+
}
4148
}
4249

4350
webhookOptions := webhook.Options{

deployments/operator/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
- "--secure-listen-address=0.0.0.0:8443"
1616
- "--upstream=http://127.0.0.1:8080/"
1717
- "--logtostderr=true"
18-
- "--tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305"
18+
- "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305"
1919
- "--v=10"
2020
ports:
2121
- containerPort: 8443

0 commit comments

Comments
 (0)