Watch tls certs for redis and memcached

By adding the hash of the certificate to the statefulset we react to certificate changes. Let's also take the chance to remove pkg/redis/deployment (unused).
openstack-k8s-operators · Sep 9, 2024 · 968a83a · 968a83a
1 parent 12ffed6
commit 968a83a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 77 deletions.
diff --git a/controllers/memcached/memcached_controller.go b/controllers/memcached/memcached_controller.go
@@ -342,7 +342,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ct
 	instance.Status.Conditions.MarkTrue(condition.ExposeServiceReadyCondition, condition.ExposeServiceReadyMessage)
 
 	// Statefulset for stable names
-	commonstatefulset := commonstatefulset.NewStatefulSet(memcached.StatefulSet(instance), time.Duration(5)*time.Second)
+	commonstatefulset := commonstatefulset.NewStatefulSet(memcached.StatefulSet(instance, hashOfHashes), time.Duration(5)*time.Second)
 	sfres, sferr := commonstatefulset.CreateOrPatch(ctx, helper)
 	if sferr != nil {
 		return sfres, sferr

diff --git a/controllers/redis/redis_controller.go b/controllers/redis/redis_controller.go
@@ -355,7 +355,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ct
 	//
 
 	// Statefulset
-	commonstatefulset := commonstatefulset.NewStatefulSet(redis.StatefulSet(instance), 5)
+	commonstatefulset := commonstatefulset.NewStatefulSet(redis.StatefulSet(instance, hashOfHashes), 5)
 	sfres, sferr := commonstatefulset.CreateOrPatch(ctx, helper)
 	if sferr != nil {
 		return sfres, sferr

diff --git a/pkg/memcached/statefulset.go b/pkg/memcached/statefulset.go
@@ -12,7 +12,10 @@ import (
 )
 
 // StatefulSet returns a Stateful resource for the Memcached CR
-func StatefulSet(m *memcachedv1.Memcached) *appsv1.StatefulSet {
+func StatefulSet(
+	m *memcachedv1.Memcached,
+	configHash string,
+) *appsv1.StatefulSet {
 	matchls := map[string]string{
 		common.AppSelector:   m.Name,
 		"cr":                 m.Name,
@@ -75,6 +78,9 @@ func StatefulSet(m *memcachedv1.Memcached) *appsv1.StatefulSet {
 									FieldPath: "status.podIPs",
 								},
 							},
+						}, {
+							Name:  "CONFIG_HASH",
+							Value: configHash,
 						},
 						},
 						VolumeMounts: getVolumeMounts(m),

diff --git a/pkg/redis/deployment.go b/pkg/redis/deployment.go
diff --git a/pkg/redis/statefulset.go b/pkg/redis/statefulset.go
@@ -13,7 +13,10 @@ import (
 )
 
 // Deployment returns a Deployment resource for the Redis CR
-func StatefulSet(r *redisv1.Redis) *appsv1.StatefulSet {
+func StatefulSet(
+	r *redisv1.Redis,
+	configHash string,
+) *appsv1.StatefulSet {
 	matchls := map[string]string{
 		common.AppSelector:   "redis",
 		common.OwnerSelector: r.Name,
@@ -68,6 +71,9 @@ func StatefulSet(r *redisv1.Redis) *appsv1.StatefulSet {
 		// Headless services only publish dns entries that include cluster domain.
 		// For the time being, assume this is .cluster.local
 		Value: name + "." + r.GetNamespace() + ".svc.cluster.local",
+	}, {
+		Name:  "CONFIG_HASH",
+		Value: configHash,
 	}}
 
 	sts := &appsv1.StatefulSet{