Remove some unused labels. (#1190)

- remove the "app: kudo-manager" from CRDs, since it is not really used by anything, and will be hard to convince controller-gen to generate it when we switch to it - remove the controller-tools.k8s.io label, (which is not even used by controller-tools upstream any more) from EVERYWHERE
kudobuilder · Dec 19, 2019 · 59f9ec9 · 59f9ec9
1 parent 23b777c
commit 59f9ec9
Show file tree

Hide file tree

Showing 25 changed files with 16 additions and 141 deletions.
diff --git a/config/crds/kudo_v1beta1_instance.yaml b/config/crds/kudo_v1beta1_instance.yaml
@@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: instances.kudo.dev
 spec:
   group: kudo.dev

diff --git a/config/crds/kudo_v1beta1_operator.yaml b/config/crds/kudo_v1beta1_operator.yaml
@@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operators.kudo.dev
 spec:
   group: kudo.dev

diff --git a/config/crds/kudo_v1beta1_operatorversion.yaml b/config/crds/kudo_v1beta1_operatorversion.yaml
@@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operatorversions.kudo.dev
 spec:
   group: kudo.dev

diff --git a/pkg/kudoctl/cmd/get/get_test.go b/pkg/kudoctl/cmd/get/get_test.go
@@ -43,8 +43,7 @@ func TestGetInstances(t *testing.T) {
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: map[string]string{
-				"controller-tools.k8s.io": "1.0",
-				"operator":                "test",
+				"operator": "test",
 			},
 			Name: "test",
 		},

diff --git a/pkg/kudoctl/cmd/plan/plan_status_test.go b/pkg/kudoctl/cmd/plan/plan_status_test.go
@@ -20,9 +20,6 @@ func TestStatus(t *testing.T) {
 			Kind:       "OperatorVersion",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Labels: map[string]string{
-				"controller-tools.k8s.io": "1.0",
-			},
 			Name: "test-1.0",
 		},
 		Spec: v1beta1.OperatorVersionSpec{

diff --git a/pkg/kudoctl/cmd/testdata/deploy-kudo-ns.yaml.golden b/pkg/kudoctl/cmd/testdata/deploy-kudo-ns.yaml.golden
@@ -3,9 +3,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operators.kudo.dev
 spec:
   group: kudo.dev
@@ -59,9 +56,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operatorversions.kudo.dev
 spec:
   group: kudo.dev
@@ -165,9 +159,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: instances.kudo.dev
 spec:
   group: kudo.dev
@@ -245,7 +236,6 @@ metadata:
   labels:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-controller-manager-service
   namespace: foo
 spec:
@@ -256,7 +246,6 @@ spec:
   selector:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
 status:
   loadBalancer: {}
 
@@ -268,23 +257,20 @@ metadata:
   labels:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-controller-manager
   namespace: foo
 spec:
   selector:
     matchLabels:
       app: kudo-manager
       control-plane: controller-manager
-      controller-tools.k8s.io: "1.0"
   serviceName: kudo-controller-manager-service
   template:
     metadata:
       creationTimestamp: null
       labels:
         app: kudo-manager
         control-plane: controller-manager
-        controller-tools.k8s.io: "1.0"
     spec:
       containers:
       - command:

diff --git a/pkg/kudoctl/cmd/testdata/deploy-kudo-sa.yaml.golden b/pkg/kudoctl/cmd/testdata/deploy-kudo-sa.yaml.golden
@@ -3,9 +3,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operators.kudo.dev
 spec:
   group: kudo.dev
@@ -59,9 +56,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operatorversions.kudo.dev
 spec:
   group: kudo.dev
@@ -165,9 +159,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: instances.kudo.dev
 spec:
   group: kudo.dev
@@ -220,7 +211,6 @@ metadata:
   labels:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-controller-manager-service
   namespace: foo
 spec:
@@ -231,7 +221,6 @@ spec:
   selector:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
 status:
   loadBalancer: {}
 
@@ -243,23 +232,20 @@ metadata:
   labels:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-controller-manager
   namespace: foo
 spec:
   selector:
     matchLabels:
       app: kudo-manager
       control-plane: controller-manager
-      controller-tools.k8s.io: "1.0"
   serviceName: kudo-controller-manager-service
   template:
     metadata:
       creationTimestamp: null
       labels:
         app: kudo-manager
         control-plane: controller-manager
-        controller-tools.k8s.io: "1.0"
     spec:
       containers:
       - command:

diff --git a/pkg/kudoctl/cmd/testdata/deploy-kudo-webhook.yaml.golden b/pkg/kudoctl/cmd/testdata/deploy-kudo-webhook.yaml.golden
@@ -3,9 +3,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operators.kudo.dev
 spec:
   group: kudo.dev
@@ -59,9 +56,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operatorversions.kudo.dev
 spec:
   group: kudo.dev
@@ -165,9 +159,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: instances.kudo.dev
 spec:
   group: kudo.dev
@@ -219,7 +210,6 @@ metadata:
   creationTimestamp: null
   labels:
     app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-system
 spec: {}
 status: {}
@@ -311,7 +301,6 @@ metadata:
   labels:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-controller-manager-service
   namespace: kudo-system
 spec:
@@ -322,7 +311,6 @@ spec:
   selector:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
 status:
   loadBalancer: {}
 
@@ -334,23 +322,20 @@ metadata:
   labels:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-controller-manager
   namespace: kudo-system
 spec:
   selector:
     matchLabels:
       app: kudo-manager
       control-plane: controller-manager
-      controller-tools.k8s.io: "1.0"
   serviceName: kudo-controller-manager-service
   template:
     metadata:
       creationTimestamp: null
       labels:
         app: kudo-manager
         control-plane: controller-manager
-        controller-tools.k8s.io: "1.0"
     spec:
       containers:
       - command:

diff --git a/pkg/kudoctl/cmd/testdata/deploy-kudo.yaml.golden b/pkg/kudoctl/cmd/testdata/deploy-kudo.yaml.golden
@@ -3,9 +3,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operators.kudo.dev
 spec:
   group: kudo.dev
@@ -59,9 +56,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: operatorversions.kudo.dev
 spec:
   group: kudo.dev
@@ -165,9 +159,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: instances.kudo.dev
 spec:
   group: kudo.dev
@@ -219,7 +210,6 @@ metadata:
   creationTimestamp: null
   labels:
     app: kudo-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-system
 spec: {}
 status: {}
@@ -257,7 +247,6 @@ metadata:
   labels:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-controller-manager-service
   namespace: kudo-system
 spec:
@@ -268,7 +257,6 @@ spec:
   selector:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
 status:
   loadBalancer: {}
 
@@ -280,23 +268,20 @@ metadata:
   labels:
     app: kudo-manager
     control-plane: controller-manager
-    controller-tools.k8s.io: "1.0"
   name: kudo-controller-manager
   namespace: kudo-system
 spec:
   selector:
     matchLabels:
       app: kudo-manager
       control-plane: controller-manager
-      controller-tools.k8s.io: "1.0"
   serviceName: kudo-controller-manager-service
   template:
     metadata:
       creationTimestamp: null
       labels:
         app: kudo-manager
         control-plane: controller-manager
-        controller-tools.k8s.io: "1.0"
     spec:
       containers:
       - command:

diff --git a/pkg/kudoctl/cmd/uninstall_test.go b/pkg/kudoctl/cmd/uninstall_test.go
@@ -25,8 +25,7 @@ func TestUninstall(t *testing.T) {
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: map[string]string{
-				"controller-tools.k8s.io": "1.0",
-				util.OperatorLabel:        "test",
+				util.OperatorLabel: "test",
 			},
 			Name: "test",
 		},

diff --git a/pkg/kudoctl/cmd/update_test.go b/pkg/kudoctl/cmd/update_test.go
@@ -47,8 +47,7 @@ func TestUpdate(t *testing.T) {
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: map[string]string{
-				"controller-tools.k8s.io": "1.0",
-				util.OperatorLabel:        "test",
+				util.OperatorLabel: "test",
 			},
 			Name: "test",
 		},

diff --git a/pkg/kudoctl/kudoinit/crd/crds.go b/pkg/kudoctl/kudoinit/crd/crds.go
@@ -249,11 +249,9 @@ func generateCrd(kind string, plural string) *apiextv1beta1.CustomResourceDefini
 	plural = strings.ToLower(plural)
 	name := plural + "." + group
 
-	labels := kudoinit.GenerateLabels(map[string]string{"controller-tools.k8s.io": "1.0"})
 	crd := &apiextv1beta1.CustomResourceDefinition{
 		ObjectMeta: v1.ObjectMeta{
-			Name:   name,
-			Labels: labels,
+			Name: name,
 		},
 		Spec: apiextv1beta1.CustomResourceDefinitionSpec{
 			Group:   group,

diff --git a/pkg/kudoctl/kudoinit/manager/manager.go b/pkg/kudoctl/kudoinit/manager/manager.go
@@ -101,7 +101,7 @@ func (m Initializer) AsYamlManifests() ([]string, error) {
 
 // GenerateLabels returns the labels used by deployment and service
 func GenerateLabels() labels.Set {
-	return kudoinit.GenerateLabels(map[string]string{"control-plane": "controller-manager", "controller-tools.k8s.io": "1.0"})
+	return kudoinit.GenerateLabels(map[string]string{"control-plane": "controller-manager"})
 }
 
 func generateDeployment(opts kudoinit.Options) *appsv1.StatefulSet {

diff --git a/pkg/kudoctl/kudoinit/prereq/namespace.go b/pkg/kudoctl/kudoinit/prereq/namespace.go
@@ -62,7 +62,7 @@ func (o kudoNamespace) AsRuntimeObjs() []runtime.Object {
 
 // generateSysNamespace builds the system namespace
 func generateSysNamespace(namespace string) *v1.Namespace {
-	labels := kudoinit.GenerateLabels(map[string]string{"controller-tools.k8s.io": "1.0"})
+	labels := kudoinit.GenerateLabels(map[string]string{})
 	return &v1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: labels,