Corrected Logstash label logstash.k8s.elastic.co/statefulset-name to …

…include the -ls suffix, fixing issues preventing pod recreation during ECK upgrade from version 2.11 to 2.12. (#7788)

Fixes: #7742

pkg/controller/logstash/driver.go

@@ -203,14 +203,14 @@ func ensureSTSNameLabelIsSetOnPods(params Params) error {
 	if err != nil {
 		return err
 	}
-	if _, ok := sts.Spec.Template.Labels[labels.StatefulSetNameLabelName]; ok {
+	if val, ok := sts.Spec.Template.Labels[labels.StatefulSetNameLabelName]; ok && (val == logstashv1alpha1.Name(params.Logstash.Name)) {
 		// label is already in place, great
 		return nil
 	}
 	// add the missing label and update the sts resource
 	if sts.Spec.Template.Labels == nil {
 		sts.Spec.Template.Labels = map[string]string{}
 	}
-	sts.Spec.Template.Labels[labels.StatefulSetNameLabelName] = params.Logstash.Name
+	sts.Spec.Template.Labels[labels.StatefulSetNameLabelName] = logstashv1alpha1.Name(params.Logstash.Name)
 	return params.Client.Update(params.Context, &sts)
 }