Merge pull request #9759 from johngmyers/remove-tags

Remove unused tags functionality
kubernetes · Aug 15, 2020 · afd3857 · afd3857
2 parents a243cc1 + 2472e75
commit afd3857
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 267 deletions.
diff --git a/upup/pkg/fi/cloudup/BUILD.bazel b/upup/pkg/fi/cloudup/BUILD.bazel
@@ -15,7 +15,6 @@ go_library(
         "populate_instancegroup_spec.go",
         "spec_builder.go",
         "subnets.go",
-        "tagbuilder.go",
         "target.go",
         "template_functions.go",
         "urls.go",
@@ -103,7 +102,6 @@ go_test(
         "populatecluster_test.go",
         "populateinstancegroup_test.go",
         "subnets_test.go",
-        "tagbuilder_test.go",
         "template_functions_test.go",
         "validation_test.go",
     ],

diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go
@@ -456,14 +456,8 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
 		}
 	}
 
-	clusterTags, err := buildCloudupTags(cluster)
-	if err != nil {
-		return err
-	}
-
 	tf := &TemplateFunctions{
 		KopsModelContext: *modelContext,
-		tags:             clusterTags,
 	}
 
 	{

diff --git a/upup/pkg/fi/cloudup/tagbuilder.go b/upup/pkg/fi/cloudup/tagbuilder.go
diff --git a/upup/pkg/fi/cloudup/tagbuilder_test.go b/upup/pkg/fi/cloudup/tagbuilder_test.go
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
@@ -37,7 +37,6 @@ import (
 
 	"github.com/Masterminds/sprig"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog"
 	kopscontrollerconfig "k8s.io/kops/cmd/kops-controller/pkg/config"
 	"k8s.io/kops/pkg/apis/kops"
@@ -55,7 +54,6 @@ import (
 // TemplateFunctions provides a collection of methods used throughout the templates
 type TemplateFunctions struct {
 	model.KopsModelContext
-	tags sets.String
 }
 
 // AddTo defines the available functions we can use in our YAML models.
@@ -82,7 +80,6 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 	dest["contains"] = sprigTxtFuncMap["contains"]
 
 	dest["ClusterName"] = tf.ClusterName
-	dest["HasTag"] = tf.HasTag
 	dest["WithDefaultBool"] = func(v *bool, defaultValue bool) bool {
 		if v != nil {
 			return *v
@@ -204,12 +201,6 @@ func (tf *TemplateFunctions) SharedVPC() bool {
 	return tf.Cluster.SharedVPC()
 }
 
-// HasTag returns true if the specified tag is set
-func (tf *TemplateFunctions) HasTag(tag string) bool {
-	_, found := tf.tags[tag]
-	return found
-}
-
 // GetInstanceGroup returns the instance group with the specified name
 func (tf *TemplateFunctions) GetInstanceGroup(name string) (*kops.InstanceGroup, error) {
 	ig := tf.KopsModelContext.FindInstanceGroup(name)