fix lint

open-telemetry · May 9, 2022 · adf4c3d · adf4c3d
1 parent 6cdd63f
commit adf4c3d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/internal/aws/k8s/k8sclient/endpoint_test.go b/internal/aws/k8s/k8sclient/endpoint_test.go
@@ -47,7 +47,6 @@ var endpointsArray = []runtime.Object{
 			Labels: map[string]string{
 				"app": "guestbook",
 			},
-			ClusterName: "",
 		},
 		Subsets: []v1.EndpointSubset{
 			{
@@ -117,7 +116,6 @@ var endpointsArray = []runtime.Object{
 			CreationTimestamp: metav1.Time{
 				Time: time.Now(),
 			},
-			ClusterName: "",
 		},
 		Subsets: []v1.EndpointSubset{
 			{
@@ -157,7 +155,6 @@ var endpointsArray = []runtime.Object{
 				"app":  "redis",
 				"role": "master",
 			},
-			ClusterName: "",
 		},
 		Subsets: []v1.EndpointSubset{
 			{
@@ -203,7 +200,6 @@ var endpointsArray = []runtime.Object{
 				"app":  "redis",
 				"role": "slave",
 			},
-			ClusterName: "",
 		},
 		Subsets: []v1.EndpointSubset{
 			{
@@ -276,7 +272,6 @@ var endpointsArray = []runtime.Object{
 			Annotations: map[string]string{
 				"control-plane.alpha.kubernetes.io/leader": "{\"holderIdentity\":\"ip-10-0-189-120.eu-west-1.compute.internal_89407f85-57e1-11e9-b6ea-02eb484bead6\",\"leaseDurationSeconds\":15,\"acquireTime\":\"2019-04-05T20:34:54Z\",\"renewTime\":\"2019-05-06T20:04:02Z\",\"leaderTransitions\":1}",
 			},
-			ClusterName: "",
 		},
 	},
 	&v1.Endpoints{
@@ -297,7 +292,6 @@ var endpointsArray = []runtime.Object{
 				"kubernetes.io/cluster-service": "true",
 				"kubernetes.io/name":            "CoreDNS",
 			},
-			ClusterName: "",
 		},
 		Subsets: []v1.EndpointSubset{
 			{
@@ -361,7 +355,6 @@ var endpointsArray = []runtime.Object{
 			Annotations: map[string]string{
 				"control-plane.alpha.kubernetes.io/leader": "{\"holderIdentity\":\"ip-10-0-189-120.eu-west-1.compute.internal_949a4400-57e1-11e9-a7bb-02eb484bead6\",\"leaseDurationSeconds\":15,\"acquireTime\":\"2019-04-05T20:34:57Z\",\"renewTime\":\"2019-05-06T20:04:02Z\",\"leaderTransitions\":1}",
 			},
-			ClusterName: "",
 		},
 	},
 }

diff --git a/internal/aws/k8s/k8sclient/node_test.go b/internal/aws/k8s/k8sclient/node_test.go
@@ -52,7 +52,6 @@ var nodeArray = []interface{}{
 				"node.alpha.kubernetes.io/ttl":                           "0",
 				"volumes.kubernetes.io/controller-managed-attach-detach": "true",
 			},
-			ClusterName: "",
 		},
 		Status: v1.NodeStatus{
 			Conditions: []v1.NodeCondition{
@@ -143,7 +142,6 @@ var nodeArray = []interface{}{
 				"node.alpha.kubernetes.io/ttl":                           "0",
 				"volumes.kubernetes.io/controller-managed-attach-detach": "true",
 			},
-			ClusterName: "",
 		},
 		Status: v1.NodeStatus{
 			Conditions: []v1.NodeCondition{
@@ -234,7 +232,6 @@ var nodeArray = []interface{}{
 				"node.alpha.kubernetes.io/ttl":                           "0",
 				"volumes.kubernetes.io/controller-managed-attach-detach": "true",
 			},
-			ClusterName: "",
 		},
 		Status: v1.NodeStatus{
 			Conditions: []v1.NodeCondition{

diff --git a/processor/k8sattributesprocessor/internal/kube/client_test.go b/processor/k8sattributesprocessor/internal/kube/client_test.go
@@ -409,7 +409,6 @@ func TestExtractionRules(t *testing.T) {
 			UID:               "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
 			Namespace:         "ns1",
 			CreationTimestamp: meta_v1.Now(),
-			ClusterName:       "cluster1",
 			Labels: map[string]string{
 				"label1": "lv1",
 				"label2": "k1=v1 k5=v5 extra!",

diff --git a/receiver/k8sclusterreceiver/mock_resources_test.go b/receiver/k8sclusterreceiver/mock_resources_test.go
@@ -88,9 +88,8 @@ func createClusterQuota(t *testing.T, client *fakeQuota.Clientset, numQuotas int
 	for i := 0; i < numQuotas; i++ {
 		q := &quotav1.ClusterResourceQuota{
 			ObjectMeta: v1.ObjectMeta{
-				Name:        fmt.Sprintf("test-clusterquota-%d", i),
-				UID:         types.UID(fmt.Sprintf("test-clusterquota-%d-uid", i)),
-				ClusterName: "test-openshift-cluster",
+				Name: fmt.Sprintf("test-clusterquota-%d", i),
+				UID:  types.UID(fmt.Sprintf("test-clusterquota-%d-uid", i)),
 			},
 			Status: quotav1.ClusterResourceQuotaStatus{
 				Total: corev1.ResourceQuotaStatus{

diff --git a/receiver/k8seventsreceiver/receiver_test.go b/receiver/k8seventsreceiver/receiver_test.go
@@ -160,7 +160,6 @@ func getEvent() *corev1.Event {
 			UID:               types.UID("289686f9-a5c0"),
 			Name:              "1",
 			Namespace:         "test",
-			ClusterName:       "testCluster",
 			CreationTimestamp: v1.Now(),
 		},
 		Source: corev1.EventSource{