Remove deprecated warning (#1501)

giantswarm · Feb 5, 2024 · 9c58b75 · 9c58b75
1 parent ae05095
commit 9c58b75
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix how we enable `remote-write-receiver` to avoid deprecated warnings.
+
 ### Removed
 
 - Free retention duration property of it's 2 weeks limitation if the free storage allows it.

diff --git a/service/controller/resource/monitoring/prometheus/resource.go b/service/controller/resource/monitoring/prometheus/resource.go
@@ -185,7 +185,7 @@ func toPrometheus(ctx context.Context, v interface{}, config Config) (metav1.Obj
 						},
 					},
 				},
-				EnableFeatures: []string{"remote-write-receiver"},
+				EnableRemoteWriteReceiver: true,
 				ExternalLabels: map[string]string{
 					key.ClusterIDKey:    key.ClusterID(cluster),
 					key.ClusterTypeKey:  key.ClusterType(config.Installation, cluster),

diff --git a/service/controller/resource/monitoring/prometheus/test/case-1-vintage-mc.golden b/service/controller/resource/monitoring/prometheus/test/case-1-vintage-mc.golden
@@ -30,8 +30,7 @@ spec:
       cert: {}
       insecureSkipVerify: true
   arbitraryFSAccessThroughSMs: {}
-  enableFeatures:
-  - remote-write-receiver
+  enableRemoteWriteReceiver: true
   evaluationInterval: 60s
   externalLabels:
     cluster_id: kubernetes

diff --git a/service/controller/resource/monitoring/prometheus/test/case-2-aws-v16.golden b/service/controller/resource/monitoring/prometheus/test/case-2-aws-v16.golden
@@ -29,8 +29,7 @@ spec:
       caFile: /etc/prometheus/secrets/cluster-certificates/ca
       cert: {}
   arbitraryFSAccessThroughSMs: {}
-  enableFeatures:
-  - remote-write-receiver
+  enableRemoteWriteReceiver: true
   evaluationInterval: 60s
   externalLabels:
     cluster_id: alice

diff --git a/service/controller/resource/monitoring/prometheus/test/case-3-aws-v18.golden b/service/controller/resource/monitoring/prometheus/test/case-3-aws-v18.golden
@@ -29,8 +29,7 @@ spec:
       caFile: /etc/prometheus/secrets/cluster-certificates/ca
       cert: {}
   arbitraryFSAccessThroughSMs: {}
-  enableFeatures:
-  - remote-write-receiver
+  enableRemoteWriteReceiver: true
   evaluationInterval: 60s
   externalLabels:
     cluster_id: baz

diff --git a/service/controller/resource/monitoring/prometheus/test/case-4-azure-v18.golden b/service/controller/resource/monitoring/prometheus/test/case-4-azure-v18.golden
@@ -29,8 +29,7 @@ spec:
       caFile: /etc/prometheus/secrets/cluster-certificates/ca
       cert: {}
   arbitraryFSAccessThroughSMs: {}
-  enableFeatures:
-  - remote-write-receiver
+  enableRemoteWriteReceiver: true
   evaluationInterval: 60s
   externalLabels:
     cluster_id: foo

diff --git a/service/controller/resource/monitoring/prometheus/test/case-5-eks-v18.golden b/service/controller/resource/monitoring/prometheus/test/case-5-eks-v18.golden
@@ -29,8 +29,7 @@ spec:
       caFile: /etc/prometheus/secrets/cluster-certificates/ca
       cert: {}
   arbitraryFSAccessThroughSMs: {}
-  enableFeatures:
-  - remote-write-receiver
+  enableRemoteWriteReceiver: true
   evaluationInterval: 60s
   externalLabels:
     cluster_id: eks-sample