fix: exporter ports enabled even when exporters disabled (OT-CONTAINE…

…R-KIT#484) * fix: exporter ports enabled even when exporters disabled Signed-off-by: sadath-12 <[email protected]> * fix: dependency issues Signed-off-by: sadath-12 <[email protected]> --------- Signed-off-by: sadath-12 <[email protected]> Signed-off-by: guozhi.li <[email protected]>
jiuker · Jul 20, 2023 · abce2b1 · abce2b1
1 parent f43e584
commit abce2b1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/k8sutils/redis-cluster.go b/k8sutils/redis-cluster.go
@@ -187,6 +187,8 @@ func (service RedisClusterService) CreateRedisClusterService(cr *redisv1beta1.Re
 	annotations := generateServiceAnots(cr.ObjectMeta, nil)
 	if cr.Spec.RedisExporter != nil && cr.Spec.RedisExporter.Enabled {
 		enableMetrics = true
+	} else {
+		enableMetrics = false
 	}
 	additionalServiceAnnotations := map[string]string{}
 	if cr.Spec.KubernetesConfig.Service != nil {

diff --git a/k8sutils/redis-replication.go b/k8sutils/redis-replication.go
@@ -11,6 +11,8 @@ func CreateReplicationService(cr *redisv1beta1.RedisReplication) error {
 	annotations := generateServiceAnots(cr.ObjectMeta, nil)
 	if cr.Spec.RedisExporter != nil && cr.Spec.RedisExporter.Enabled {
 		enableMetrics = true
+	} else {
+		enableMetrics = false
 	}
 	additionalServiceAnnotations := map[string]string{}
 	if cr.Spec.KubernetesConfig.Service != nil {

diff --git a/k8sutils/redis-sentinel.go b/k8sutils/redis-sentinel.go
@@ -166,6 +166,8 @@ func (service RedisSentinelService) CreateRedisSentinelService(cr *redisv1beta1.
 
 	if cr.Spec.RedisExporter != nil && cr.Spec.RedisExporter.Enabled {
 		enableMetrics = true
+	} else {
+		enableMetrics = false
 	}
 	additionalServiceAnnotations := map[string]string{}
 	if cr.Spec.KubernetesConfig.Service != nil {

diff --git a/k8sutils/redis-standalone.go b/k8sutils/redis-standalone.go
@@ -15,6 +15,8 @@ func CreateStandaloneService(cr *redisv1beta1.Redis) error {
 	annotations := generateServiceAnots(cr.ObjectMeta, nil)
 	if cr.Spec.RedisExporter != nil && cr.Spec.RedisExporter.Enabled {
 		enableMetrics = true
+	} else {
+		enableMetrics = false
 	}
 	additionalServiceAnnotations := map[string]string{}
 	if cr.Spec.KubernetesConfig.Service != nil {