From 56aa9b69a8a0494dee6f59c819018d454309efdf Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Mon, 10 Apr 2023 14:53:45 +0200 Subject: [PATCH 1/5] Add support for Kubelet --- docs/index.html | 9 ++++++++- src/js/configs.js | 9 +++++++++ src/templates/partials/kubelet.hbs | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/templates/partials/kubelet.hbs diff --git a/docs/index.html b/docs/index.html index 36fdd6d0..4e0154b2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -186,7 +186,14 @@
 
- +
+ + +
+ +
-
- - -
-
diff --git a/src/templates/partials/kubelet.hbs b/src/templates/partials/kubelet.hbs index 2dc2fb4e..a1091d38 100644 --- a/src/templates/partials/kubelet.hbs +++ b/src/templates/partials/kubelet.hbs @@ -5,10 +5,4 @@ kind: KubeletConfiguration tlsCertFile: /path/to/ca.crt tlsPrivateKeyFile: /path/to/privkey.pem tlsCipherSuites: '{{{join output.ciphers ","}}}' -{{#if (includes "intermediate" form.config)}} -tlsMinVersion: TLSv1.2 -{{else if (includes "modern" form.config)}} -tlsMinVersion: TLSv1.3 -{{else}} -tlsMinVersion: TLSv1.0 -{{/if}} +tlsMinorVersion: {{output.protocols.[0]}} From e21e0b13fffe0a9dbf17992a59a8fcccba8c24f6 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Sun, 7 Jan 2024 12:05:05 +0100 Subject: [PATCH 3/5] review --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 95c4c388..58e65172 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1 +1 @@ -Mozilla SSL Configuration Generator
moz://a SSL Configuration Generator SSL Config Generator
Server Software
 
Mozilla Configuration
Environment
Server Version
OpenSSL Version
Miscellaneous
This also redirects to HTTPS, if possible
+Mozilla SSL Configuration Generator
moz://a SSL Configuration Generator SSL Config Generator
Server Software
 
Mozilla Configuration
Environment
Server Version
OpenSSL Version
Miscellaneous
This also redirects to HTTPS, if possible
\ No newline at end of file From 8764c5665eb9f64794ff355d2e9aed2d03be627c Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Thu, 18 Jan 2024 08:11:01 +0100 Subject: [PATCH 4/5] Review --- src/js/configs.js | 5 +++-- src/templates/partials/kubelet.hbs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/configs.js b/src/js/configs.js index e68d1033..47a3d554 100644 --- a/src/js/configs.js +++ b/src/js/configs.js @@ -185,7 +185,7 @@ module.exports = { tls13: '5.50', usesOpenssl: true, }, -tomcat: { + tomcat: { highlighter: 'xml', latestVersion: '9.0.30', name: 'Tomcat', @@ -197,7 +197,8 @@ tomcat: { kubelet: { cipherFormat: 'go', highlighter: 'yaml', - hasVersions: false, + tls13: '1.14', + latestVersion: '1.29', name: 'Kubernetes', supportsHsts: false, supportsOcspStapling: false, diff --git a/src/templates/partials/kubelet.hbs b/src/templates/partials/kubelet.hbs index a1091d38..9ed0f6ea 100644 --- a/src/templates/partials/kubelet.hbs +++ b/src/templates/partials/kubelet.hbs @@ -5,4 +5,4 @@ kind: KubeletConfiguration tlsCertFile: /path/to/ca.crt tlsPrivateKeyFile: /path/to/privkey.pem tlsCipherSuites: '{{{join output.ciphers ","}}}' -tlsMinorVersion: {{output.protocols.[0]}} +tlsMinVersion: {{output.protocols.[0]}} From 01d853b5aea2e286663eacaa32a19eb8c61810d1 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Fri, 9 Feb 2024 11:10:59 +0100 Subject: [PATCH 5/5] Add brackets --- src/templates/partials/kubelet.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/partials/kubelet.hbs b/src/templates/partials/kubelet.hbs index 9ed0f6ea..4847fbb5 100644 --- a/src/templates/partials/kubelet.hbs +++ b/src/templates/partials/kubelet.hbs @@ -4,5 +4,5 @@ apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration tlsCertFile: /path/to/ca.crt tlsPrivateKeyFile: /path/to/privkey.pem -tlsCipherSuites: '{{{join output.ciphers ","}}}' +tlsCipherSuites: [{{{join output.ciphers ","}}}] tlsMinVersion: {{output.protocols.[0]}}