Add label Blacklisting

momiecloudoneguys · Dec 2, 2019 · e6bbae5 · e6bbae5
1 parent 2659077
commit e6bbae5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/api/redisfailover/v1/types.go b/api/redisfailover/v1/types.go
@@ -20,6 +20,7 @@ type RedisFailoverSpec struct {
 	Redis    RedisSettings    `json:"redis,omitempty"`
 	Sentinel SentinelSettings `json:"sentinel,omitempty"`
 	Auth     AuthSettings     `json:"auth,omitempty"`
+	LabelBlacklist []string   `json:"labelBlacklist,omitempty"`
 }
 
 // RedisSettings defines the specification of the redis cluster

diff --git a/api/redisfailover/v1/zz_generated.deepcopy.go b/api/redisfailover/v1/zz_generated.deepcopy.go
diff --git a/operator/redisfailover/handler.go b/operator/redisfailover/handler.go
@@ -102,7 +102,16 @@ func (r *RedisFailoverHandler) getLabels(rf *redisfailoverv1.RedisFailover) map[
 	dynLabels := map[string]string{
 		rfLabelNameKey: rf.Name,
 	}
-	return util.MergeLabels(defaultLabels, dynLabels, rf.Labels)
+
+	filteredCustomLabels := rf.Labels
+	for _, label := range rf.Spec.LabelBlacklist {
+		if _, ok := filteredCustomLabels[label]; ok {
+			delete(filteredCustomLabels, label);
+			r.logger.Debugf("Removing %s from labels as it is blacklisted", label)
+		}
+	}
+
+	return util.MergeLabels(defaultLabels, dynLabels, filteredCustomLabels)
 }
 
 func (w *RedisFailoverHandler) createOwnerReferences(rf *redisfailoverv1.RedisFailover) []metav1.OwnerReference {