Skip to content

Commit 77d188d

Browse files
committed
Parametrising TLS ciphers for observatorium-api
1 parent 0b7b3e4 commit 77d188d

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

Diff for: examples/main.jsonnet

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ local apiWithTLS = (import '../jsonnet/lib/observatorium-api.libsonnet')(config
7373
caKey: 'ca',
7474
reloadInterval: '1m',
7575
serverName: 'example.com',
76+
cipherSuites: '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',
7677
},
7778
});
7879

Diff for: examples/manifests/deployment-with-tls.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
- --tls.healthchecks.server-ca-file=/var/run/tls/ca
5858
- --tls.reload-interval=1m
5959
- --tls.healthchecks.server-name=example.com
60+
- --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
6061
image: quay.io/observatorium/api:master-2020-09-04-v0.1.1-131-ga4c5a9c
6162
imagePullPolicy: IfNotPresent
6263
livenessProbe:

Diff for: jsonnet/lib/observatorium-api.libsonnet

+6
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,12 @@ function(params) {
208208
'--tls.healthchecks.server-name=' + api.config.tls.serverName,
209209
]
210210
else []
211+
) + (
212+
if std.objectHas(api.config.tls, 'cipherSuites') then
213+
[
214+
'--tls.cipher-suites=' + api.config.tls.cipherSuites,
215+
]
216+
else []
211217
)
212218
else []
213219
) + (

0 commit comments

Comments
 (0)