update deploymentID as owner ref UID

Author: salonichf5

internal/mode/static/telemetry/collector.go

@@ -233,11 +233,20 @@ func getReplicas(replicaSet *appsv1.ReplicaSet) (int, error) {
 }
 
 func getDeploymentID(replicaSet *appsv1.ReplicaSet) (string, error) {
-	if replicaSet.GetUID() == "" {
+	replicaOwnerRefs := replicaSet.GetOwnerReferences()
+	if len(replicaOwnerRefs) != 1 {
+		return "", fmt.Errorf("expected one owner reference of the NGF ReplicaSet, got %d", len(replicaOwnerRefs))
+	}
+
+	if replicaOwnerRefs[0].Kind != "Deployment" {
+		return "", fmt.Errorf("expected replicaSet owner reference to be Deployment, got %s", replicaOwnerRefs[0].Kind)
+	}
+
+	if replicaOwnerRefs[0].UID == "" {
 		return "", fmt.Errorf("expected replicaSet to have a UID")
 	}
 
-	return string(replicaSet.GetUID()), nil
+	return string(replicaOwnerRefs[0].UID), nil
 }
 
 // CollectClusterID gets the UID of the kube-system namespace.

internal/mode/static/telemetry/collector_test.go

@@ -103,7 +103,14 @@ var _ = Describe("Collector", Ordered, func() {
 				Replicas: &replicas,
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				UID: "test-pod-owner-uid",
+				Name: "replica",
+				OwnerReferences: []metav1.OwnerReference{
+					{
+						Kind: "Deployment",
+						Name: "Deployment1",
+						UID:  "test-uid-replicaSet",
+					},
+				},
 			},
 		}
 
@@ -129,7 +136,7 @@ var _ = Describe("Collector", Ordered, func() {
 			ClusterID:         string(kubeNamespace.GetUID()),
 			ImageSource:       "local",
 			Arch:              runtime.GOARCH,
-			DeploymentID:      string(ngfPod.OwnerReferences[0].UID),
+			DeploymentID:      string(ngfReplicaSet.ObjectMeta.OwnerReferences[0].UID),
 		}
 
 		k8sClientReader = &eventsfakes.FakeReader{}
@@ -589,26 +596,68 @@ var _ = Describe("Collector", Ordered, func() {
 					_, err := dataCollector.Collect(ctx)
 					Expect(err).To(MatchError(expectedErr))
 				})
-				It("should error if the replicaSet's UID is empty", func() {
-					ngfPod = &v1.Pod{
-						ObjectMeta: metav1.ObjectMeta{
-							Name: "pod1",
-							OwnerReferences: []metav1.OwnerReference{
-								{
-									Kind: "ReplicaSet",
-									Name: "replicaset1",
+			})
+		})
+	})
+
+	Describe("DeploymentID collector", func() {
+		When("collecting deploymentID", func() {
+			When("it encounters an error while collecting data", func() {
+				It("should error if the replicaSet's owner reference is nil", func() {
+					replicas := int32(1)
+					k8sClientReader.GetCalls(mergeGetCallsWithBase(createGetCallsFunc(
+						&appsv1.ReplicaSet{
+							Spec: appsv1.ReplicaSetSpec{
+								Replicas: &replicas,
+							},
+						},
+					)))
+
+					expectedErr := errors.New("expected one owner reference of the NGF ReplicaSet, got 0")
+					_, err := dataCollector.Collect(ctx)
+					Expect(err).To(MatchError(expectedErr))
+				})
+
+				It("should error if the replicaSet's owner reference kind is not deployment", func() {
+					replicas := int32(1)
+					k8sClientReader.GetCalls(mergeGetCallsWithBase(createGetCallsFunc(
+						&appsv1.ReplicaSet{
+							Spec: appsv1.ReplicaSetSpec{
+								Replicas: &replicas,
+							},
+							ObjectMeta: metav1.ObjectMeta{
+								OwnerReferences: []metav1.OwnerReference{
+									{
+										Name: "replica",
+										Kind: "ReplicaSet",
+										UID:  "replica-uid",
+									},
 								},
 							},
 						},
-					}
+					)))
 
+					expectedErr := errors.New("expected replicaSet owner reference to be Deployment, got ReplicaSet")
+					_, err := dataCollector.Collect(ctx)
+					Expect(err).To(MatchError(expectedErr))
+				})
+				It("should error if the replicaSet's owner reference has empty UID", func() {
 					replicas := int32(1)
-					ngfReplicaSet = &appsv1.ReplicaSet{
-						Spec: appsv1.ReplicaSetSpec{
-							Replicas: &replicas,
+					k8sClientReader.GetCalls(mergeGetCallsWithBase(createGetCallsFunc(
+						&appsv1.ReplicaSet{
+							Spec: appsv1.ReplicaSetSpec{
+								Replicas: &replicas,
+							},
+							ObjectMeta: metav1.ObjectMeta{
+								OwnerReferences: []metav1.OwnerReference{
+									{
+										Name: "replica",
+										Kind: "Deployment",
+									},
+								},
+							},
 						},
-					}
-					k8sClientReader.GetCalls(createGetCallsFunc(ngfPod, ngfReplicaSet))
+					)))
 
 					expectedErr := errors.New("expected replicaSet to have a UID")
 					_, err := dataCollector.Collect(ctx)