From 79712b6b950bbd0f69892d56c3fb7f2b83c839fd Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 17 Jan 2019 16:27:57 +0100
Subject: [PATCH] kube-prometheus: Remove duplicate TLS cipher suites config
---
.../kube-state-metrics.libsonnet | 25 -------------------
1 file changed, 25 deletions(-)
diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
index 4a9ee58f..30a176f5 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
@@ -4,31 +4,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
_config+:: {
namespace: 'default',
- tlsCipherSuites: [
- // 'TLS_RSA_WITH_RC4_128_SHA', // insecure: https://access.redhat.com/security/cve/cve-2013-2566
- // 'TLS_RSA_WITH_3DES_EDE_CBC_SHA', // insecure: https://access.redhat.com/articles/2548661
- 'TLS_RSA_WITH_AES_128_CBC_SHA',
- 'TLS_RSA_WITH_AES_256_CBC_SHA',
- 'TLS_RSA_WITH_AES_128_CBC_SHA256',
- 'TLS_RSA_WITH_AES_128_GCM_SHA256',
- 'TLS_RSA_WITH_AES_256_GCM_SHA384',
- // 'TLS_ECDHE_ECDSA_WITH_RC4_128_SHA', // insecure: https://access.redhat.com/security/cve/cve-2013-2566
- 'TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA',
- 'TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA',
- // 'TLS_ECDHE_RSA_WITH_RC4_128_SHA', // insecure: https://access.redhat.com/security/cve/cve-2013-2566
- // 'TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA', // insecure: https://access.redhat.com/articles/2548661
- 'TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA',
- 'TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA',
- 'TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256',
- 'TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256',
- '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',
- ],
-
kubeStateMetrics+:: {
collectors: '', // empty string gets a default set
scrapeInterval: '30s',
--
GitLab