From cd7113ef7859dcb2bb2dba245550b3a632e4c4a0 Mon Sep 17 00:00:00 2001
From: Kacper Rzetelski <kacper.rzetelski@scylladb.com>
Date: Sat, 24 Jul 2021 13:55:12 +0200
Subject: [PATCH] Remove seed node label

---
 pkg/controller/scyllacluster/resource/resource.go | 9 ---------
 pkg/naming/constants.go                           | 3 ---
 pkg/naming/labels.go                              | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/pkg/controller/scyllacluster/resource/resource.go b/pkg/controller/scyllacluster/resource/resource.go
index 2f08363bab7..caefb6db25f 100644
--- a/pkg/controller/scyllacluster/resource/resource.go
+++ b/pkg/controller/scyllacluster/resource/resource.go
@@ -54,15 +54,6 @@ func MemberService(sc *scyllav1.ScyllaCluster, rackName, name string, oldService
 	labels[naming.DatacenterNameLabel] = sc.Spec.Datacenter.Name
 	labels[naming.RackNameLabel] = rackName
 
-	// TODO: Remove seed label in v1.5. (#704)
-	//       We need to keep this for v1.3 compatibility, so a ScyllaCluster that is rolling out during
-	//       the operator upgrade, has a pod that restarts or gets evicted in the meantime can become ready
-	//       as the label is still used by v1.3 sidecar before the new cluster version rolls out.
-	// If Member is seed, add the appropriate label
-	if strings.HasSuffix(name, "-0") || strings.HasSuffix(name, "-1") {
-		labels[naming.SeedLabel] = ""
-	}
-
 	// Copy the old replace label, if present.
 	var replaceAddr string
 	var hasReplaceLabel bool
diff --git a/pkg/naming/constants.go b/pkg/naming/constants.go
index 8ef1933807b..98860731d96 100644
--- a/pkg/naming/constants.go
+++ b/pkg/naming/constants.go
@@ -9,9 +9,6 @@ package naming
 //
 // See the sidecar design doc for more details.
 const (
-	// SeedLabel determines if a member is a seed or not.
-	SeedLabel = "scylla/seed"
-
 	// DecommissionedLabel expresses the intent to decommission
 	// the specific member. The presence of the label expresses
 	// the intent to decommission. If the value is true, it means
diff --git a/pkg/naming/labels.go b/pkg/naming/labels.go
index ae93e59dd56..63c5508f8fc 100644
--- a/pkg/naming/labels.go
+++ b/pkg/naming/labels.go
@@ -1,8 +1,6 @@
 package naming
 
 import (
-	"fmt"
-
 	scyllav1 "github.com/scylladb/scylla-operator/pkg/api/scylla/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -53,10 +51,6 @@ func RackSelector(r scyllav1.RackSpec, c *scyllav1.ScyllaCluster) labels.Selecto
 	return sel
 }
 
-func SelectorForSeeds(clusterName string) string {
-	return fmt.Sprintf("%s,%s=%s", SeedLabel, ClusterNameLabel, clusterName)
-}
-
 func recommendedLabels() map[string]string {
 
 	return map[string]string{