watch monitor changed

Author: polefishu

Dockerfile

@@ -13,7 +13,7 @@ ARG GIT_SHA=0000000
 
 WORKDIR /src
 
-COPY go.mod ./ go.sum ./
+COPY go.mod go.sum ./
 RUN go mod download
 
 COPY pkg ./ cmd ./ version ./

pkg/apis/redis/v1alpha1/default.go

@@ -12,9 +12,10 @@ import (
 )
 
 const (
-	minMasterSize      = 3
-	minClusterReplicas = 1
-	defaultRedisImage  = "redis:5.0.4-alpine"
+	minMasterSize       = 3
+	minClusterReplicas  = 1
+	defaultRedisImage   = "redis:5.0.4-alpine"
+	defaultMonitorImage = "oliver006/redis_exporter:latest"
 )
 
 func (in *DistributedRedisCluster) DefaultSpec(log logr.Logger) bool {
@@ -41,6 +42,11 @@ func (in *DistributedRedisCluster) DefaultSpec(log logr.Logger) bool {
 
 	mon := in.Spec.Monitor
 	if mon != nil {
+		if mon.Image == "" {
+			mon.Image = defaultMonitorImage
+			update = true
+		}
+
 		if mon.Prometheus == nil {
 			mon.Prometheus = &PrometheusSpec{}
 			update = true

pkg/controller/manager/ensurer.go

@@ -119,7 +119,25 @@ func shouldUpdateRedis(cluster *redisv1alpha1.DistributedRedisCluster, sts *apps
 	if result := expectResource.Limits.Cpu().Cmp(*currentResource.Limits.Cpu()); result != 0 {
 		return true
 	}
-	return false
+	return monitorChanged(cluster, sts)
+}
+
+func monitorChanged(cluster *redisv1alpha1.DistributedRedisCluster, sts *appsv1.StatefulSet) bool {
+	if cluster.Spec.Monitor != nil {
+		for _, container := range sts.Spec.Template.Spec.Containers {
+			if container.Name == statefulsets.ExporterContainerName {
+				return false
+			}
+		}
+		return true
+	} else {
+		for _, container := range sts.Spec.Template.Spec.Containers {
+			if container.Name == statefulsets.ExporterContainerName {
+				return true
+			}
+		}
+		return false
+	}
 }
 
 func (r *realEnsureResource) ensureRedisPDB(cluster *redisv1alpha1.DistributedRedisCluster, name string, labels map[string]string) error {

pkg/resources/statefulsets/statefulset.go

@@ -24,6 +24,7 @@ const (
 	redisRestoreLocalVolumeName = "redis-local"
 	redisServerName             = "redis"
 	hostnameTopologyKey         = "kubernetes.io/hostname"
+	ExporterContainerName       = "exporter"
 
 	graceTime = 30
 
@@ -282,7 +283,7 @@ func redisServerContainer(cluster *redisv1alpha1.DistributedRedisCluster, passwo
 
 func redisExporterContainer(cluster *redisv1alpha1.DistributedRedisCluster, password *corev1.EnvVar) corev1.Container {
 	container := corev1.Container{
-		Name: "exporter",
+		Name: ExporterContainerName,
 		Args: append([]string{
 			fmt.Sprintf("--web.listen-address=:%v", cluster.Spec.Monitor.Prometheus.Port),
 			fmt.Sprintf("--web.telemetry-path=%v", redisv1alpha1.PrometheusExporterTelemetryPath),