Merge pull request #314 from openshift-cherrypick-robot/cherry-pick-3…

…11-to-18.0-fr1 [18.0-fr1] Fix memcached selector and labels
openstack-k8s-operators · Nov 20, 2024 · 335e32b · 335e32b
2 parents 10d13cf + d082d0e
commit 335e32b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/memcached/service.go b/pkg/memcached/service.go
@@ -11,6 +11,7 @@ import (
 // HeadlessService exposes all memcached repliscas for a memcached CR
 func HeadlessService(m *memcachedv1.Memcached) *corev1.Service {
 	labels := labels.GetLabels(m, "memcached", map[string]string{
+		"app":                m.GetName(),
 		common.OwnerSelector: "infra-operator",
 		"cr":                 m.GetName(),
 		common.AppSelector:   m.GetName(),
@@ -21,6 +22,7 @@ func HeadlessService(m *memcachedv1.Memcached) *corev1.Service {
 		Labels:    labels,
 		Selector: map[string]string{
 			common.AppSelector: m.GetName(),
+			"app":              m.GetName(),
 		},
 		Ports: []corev1.ServicePort{
 			{Name: "memcached", Protocol: "TCP", Port: MemcachedPort},

diff --git a/pkg/memcached/statefulset.go b/pkg/memcached/statefulset.go
@@ -17,6 +17,7 @@ func StatefulSet(
 	configHash string,
 ) *appsv1.StatefulSet {
 	matchls := map[string]string{
+		"app":                m.Name,
 		common.AppSelector:   m.Name,
 		"cr":                 m.Name,
 		common.OwnerSelector: "infra-operator",