Merge pull request #74 from hyperspike/image-update

Support updating sts images when config changes

Makefile

@@ -146,9 +146,9 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
 
 .PHONY: build-installer
 build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment.
-	mkdir -p dist
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default > dist/install.yaml
+	$Qmkdir -p dist
+	$Qcd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	$Q$(KUSTOMIZE) build config/default > dist/install.yaml
 
 ##@ Deployment
 

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ghcr.io/hyperspike/valkey-operator
-  newTag: v0.0.19
+  newName: localhost:5000/controller
+  newTag: "1"

internal/controller/valkey_controller.go

@@ -1559,6 +1559,29 @@ export VALKEY_CLUSTER_ANNOUNCE_HOSTNAME="${POD_NAME}.%s"
 		}
 		r.Recorder.Event(valkey, "Normal", "Updated", fmt.Sprintf("StatefulSet %s/%s is updated (exporter)", valkey.Namespace, valkey.Name))
 	}
+	if sts.Spec.Template.Spec.Containers[0].Image != image {
+		sts.Spec.Template.Spec.Containers[0].Image = image
+		if valkey.Spec.VolumePermissions {
+			sts.Spec.Template.Spec.InitContainers[0].Image = image
+		}
+		if err := r.Update(ctx, sts); err != nil {
+			logger.Error(err, "failed to update statefulset image", "valkey", valkey.Name, "namespace", valkey.Namespace)
+			return err
+		}
+		r.Recorder.Event(valkey, "Normal", "Updated", fmt.Sprintf("StatefulSet %s/%s is updated (image)", valkey.Namespace, valkey.Name))
+	}
+	exporterImage := r.GlobalConfig.ExporterImage
+	if valkey.Spec.ExporterImage != "" {
+		exporterImage = valkey.Spec.ExporterImage
+	}
+	if valkey.Spec.Prometheus && sts.Spec.Template.Spec.Containers[1].Image != exporterImage {
+		sts.Spec.Template.Spec.Containers[1].Image = exporterImage
+		if err := r.Update(ctx, sts); err != nil {
+			logger.Error(err, "failed to update statefulset exporter image", "valkey", valkey.Name, "namespace", valkey.Namespace)
+			return err
+		}
+		r.Recorder.Event(valkey, "Normal", "Updated", fmt.Sprintf("StatefulSet %s/%s is updated (exporter image)", valkey.Namespace, valkey.Name))
+	}
 
 	return nil
 }