coreos/prometheus-operator
1
0
Fork 0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 06:45:27 +01:00
Code Issues Releases Wiki Activity

chore: make TLSConfig fields optional

Browse Source 
This commit changes the `serverName` and `insecureSkipVerify` fields of
TLS configuration to pointers instead of values.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This commit is contained in:
Simon Pasquier
2024-05-07 11:12:55 +02:00
parent 5e6aa47e9e
commit b63aa1871a
26 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/prometheus_test.go
View File

@@ -141,7 +141,7 @@ func deployInstrumentedApplicationWithTLS(name, ns string) error {
Scheme: "https",
TLSConfig: &monitoringv1.TLSConfig{
SafeTLSConfig: monitoringv1.SafeTLSConfig{
ServerName: "caandserver.com",
ServerName: ptr.To("caandserver.com"),
CA: monitoringv1.SecretOrConfigMap{
Secret: &v1.SecretKeySelector{
LocalObjectReference: v1.LocalObjectReference{
@@ -3039,7 +3039,7 @@ func testPromArbitraryFSAcc(t *testing.T) {
Port: "web",
TLSConfig: &monitoringv1.TLSConfig{
SafeTLSConfig: monitoringv1.SafeTLSConfig{
InsecureSkipVerify: true,
InsecureSkipVerify: ptr.To(true),
CA: monitoringv1.SecretOrConfigMap{
Secret: &v1.SecretKeySelector{
LocalObjectReference: v1.LocalObjectReference{
@@ -3076,7 +3076,7 @@ func testPromArbitraryFSAcc(t *testing.T) {
Port: "web",
TLSConfig: &monitoringv1.TLSConfig{
SafeTLSConfig: monitoringv1.SafeTLSConfig{
InsecureSkipVerify: true,
InsecureSkipVerify: ptr.To(true),
CA: monitoringv1.SecretOrConfigMap{
ConfigMap: &v1.ConfigMapKeySelector{
LocalObjectReference: v1.LocalObjectReference{
@@ -3333,7 +3333,7 @@ func testPromTLSConfigViaSecret(t *testing.T) {
Scheme: "https",
TLSConfig: &monitoringv1.TLSConfig{
SafeTLSConfig: monitoringv1.SafeTLSConfig{
InsecureSkipVerify: true,
InsecureSkipVerify: ptr.To(true),
Cert: monitoringv1.SecretOrConfigMap{
Secret: &v1.SecretKeySelector{
LocalObjectReference: v1.LocalObjectReference{
@@ -3533,7 +3533,7 @@ func testPromSecurePodMonitor(t *testing.T) {
Port: "mtls",
Scheme: "https",
TLSConfig: &monitoringv1.SafeTLSConfig{
InsecureSkipVerify: true,
InsecureSkipVerify: ptr.To(true),
CA: monitoringv1.SecretOrConfigMap{
Secret: &v1.SecretKeySelector{
LocalObjectReference: v1.LocalObjectReference{
@@ -3566,7 +3566,7 @@ func testPromSecurePodMonitor(t *testing.T) {
Port: "mtls",
Scheme: "https",
TLSConfig: &monitoringv1.SafeTLSConfig{
InsecureSkipVerify: true,
InsecureSkipVerify: ptr.To(true),
CA: monitoringv1.SecretOrConfigMap{
ConfigMap: &v1.ConfigMapKeySelector{
LocalObjectReference: v1.LocalObjectReference{

2
test/e2e/scrapeconfig_test.go
View File

@@ -390,7 +390,7 @@ func testScrapeConfigKubernetesNodeRole(t *testing.T) {
}
sc.Spec.TLSConfig = &monitoringv1.SafeTLSConfig{
// since we cannot validate server name in cert
InsecureSkipVerify: true,
InsecureSkipVerify: ptr.To(true),
CA: monitoringv1.SecretOrConfigMap{
Secret: &v1.SecretKeySelector{
LocalObjectReference: v1.LocalObjectReference{

4
test/framework/prometheus.go
View File

@@ -229,7 +229,7 @@ func (prwtc PromRemoteWriteTestConfig) AddRemoteWriteWithTLSToPrometheus(p *moni
p.Spec.RemoteWrite[0].TLSConfig = &monitoringv1.TLSConfig{
SafeTLSConfig: monitoringv1.SafeTLSConfig{
ServerName: "caandserver.com",
ServerName: ptr.To("caandserver.com"),
},
}
@@ -280,7 +280,7 @@ func (prwtc PromRemoteWriteTestConfig) AddRemoteWriteWithTLSToPrometheus(p *moni
}
case prwtc.InsecureSkipVerify:
p.Spec.RemoteWrite[0].TLSConfig.InsecureSkipVerify = true
p.Spec.RemoteWrite[0].TLSConfig.InsecureSkipVerify = ptr.To(true)
}
}