From 9d6396cb82b22b6c56eb901cfe47908ba1565e29 Mon Sep 17 00:00:00 2001
From: Samuel Vijaykumar M <mad.vijay@gmail.com>
Date: Mon, 5 Sep 2022 10:25:33 +0530
Subject: [PATCH] setting the right env for the sentinel exporter
---
operator/redisfailover/service/generator.go | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/operator/redisfailover/service/generator.go b/operator/redisfailover/service/generator.go
index 4ad5fab6d..4d7ec6dee 100644
--- a/operator/redisfailover/service/generator.go
+++ b/operator/redisfailover/service/generator.go
@@ -670,7 +670,21 @@ func createSentinelExporterContainer(rf *redisfailoverv1.RedisFailover) corev1.C
ImagePullPolicy: pullPolicy(rf.Spec.Sentinel.Exporter.ImagePullPolicy),
SecurityContext: getContainerSecurityContext(rf.Spec.Sentinel.Exporter.ContainerSecurityContext),
Args: rf.Spec.Sentinel.Exporter.Args,
- Env: rf.Spec.Sentinel.Exporter.Env,
+ Env: append(rf.Spec.Redis.Exporter.Env, corev1.EnvVar{
+ Name: "REDIS_ALIAS",
+ ValueFrom: &corev1.EnvVarSource{
+ FieldRef: &corev1.ObjectFieldSelector{
+ FieldPath: "metadata.name",
+ },
+ },
+ }, corev1.EnvVar{
+ Name: "REDIS_EXPORTER_WEB_LIST_ADDRESS",
+ Value: fmt.Sprintf("0.0.0.0:%[1]v", sentinelExporterPort),
+ }, corev1.EnvVar{
+ Name: "REDIS_ADDR",
+ Value: "redis://localhost:26379",
+ },
+ ),
Ports: []corev1.ContainerPort{
{
Name: "metrics",
@@ -680,6 +694,11 @@ func createSentinelExporterContainer(rf *redisfailoverv1.RedisFailover) corev1.C
},
Resources: resources,
}
+
+ if rf.Spec.Sentinel.Exporter.Env != nil {
+ container.Env = append(container.Env, rf.Spec.Redis.Exporter.Env...)
+ }
+
return container
}
--
GitLab