Skip to content

Commit 9fb1d1d

Browse files
committed
SSL Medium Strength Cipher Suites Supported for operator
1 parent 0bec046 commit 9fb1d1d

File tree

4 files changed

+22
-0
lines changed

4 files changed

+22
-0
lines changed

bindata/assets/kube-apiserver/pod.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ spec:
239239
args:
240240
- --kubeconfig
241241
- /etc/kubernetes/static-pod-certs/configmaps/check-endpoints-kubeconfig/kubeconfig
242+
- --config
243+
- /etc/kubernetes/static-pod-certs/configmaps/kube-apiserver-operator-config/config.yaml
242244
- --listen
243245
- 0.0.0.0:17697
244246
- --namespace

manifests/0000_20_kube-apiserver-operator_03_configmap.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,12 @@ data:
1111
config.yaml: |
1212
apiVersion: operator.openshift.io/v1
1313
kind: GenericOperatorConfig
14+
servingInfo:
15+
cipherSuites:
16+
- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
17+
- TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
18+
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
19+
- TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
20+
- TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
21+
- TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
22+
minTLSVersion: VersionTLS12

pkg/operator/resourcesynccontroller/resourcesynccontroller.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,13 @@ func NewResourceSyncController(
9595
return nil, err
9696
}
9797

98+
// this config contains the cipherSuites and minTLSVersion which is used by check-endpoints
99+
if err := resourceSyncController.SyncConfigMap(
100+
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.TargetNamespace, Name: "kube-apiserver-operator-config"},
101+
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.OperatorNamespace, Name: "kube-apiserver-operator-config"},
102+
); err != nil {
103+
return nil, err
104+
}
105+
98106
return resourceSyncController, nil
99107
}

pkg/operator/starter.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,9 @@ var CertConfigMaps = []installer.UnrevisionedResource{
660660

661661
// kubeconfig for check-endpoints
662662
{Name: "check-endpoints-kubeconfig"},
663+
664+
// kube-apiserver-operator-config(contains safe cipherSuites and minTLSVersion) for check-endpoints
665+
{Name: "kube-apiserver-operator-config"},
663666
}
664667

665668
var CertSecrets = []installer.UnrevisionedResource{

0 commit comments

Comments
 (0)