chore: updates chaosresult get client operation (#770)

Signed-off-by: neelanjan00 <neelanjan.manna@harness.io>

Author: Neelanjan Manna

pkg/clients/clientset.go

@@ -8,7 +8,6 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/klog"
@@ -77,9 +76,9 @@ func generateLitmusClientSet(config *rest.Config) (*chaosClient.LitmuschaosV1alp
 
 // buildConfigFromFlags is a helper function that builds configs from a master
 // url or a kubeconfig filepath, if nothing is provided it falls back to inClusterConfig
-func buildConfigFromFlags(masterUrl, kubeconfigPath string) (*restclient.Config, error) {
+func buildConfigFromFlags(masterUrl, kubeconfigPath string) (*rest.Config, error) {
 	if kubeconfigPath == "" && masterUrl == "" {
-		kubeconfig, err := restclient.InClusterConfig()
+		kubeconfig, err := rest.InClusterConfig()
 		if err == nil {
 			return kubeconfig, nil
 		}

pkg/clients/litmus.go

@@ -47,28 +47,26 @@ func (clients *ClientSets) UpdateChaosEngine(chaosDetails *types.ChaosDetails, e
 		})
 }
 
-func (clients *ClientSets) GetChaosResult(chaosDetails *types.ChaosDetails) (*v1alpha1.ChaosResult, error) {
-	var result v1alpha1.ChaosResult
+func (clients *ClientSets) GetChaosResult(chaosDetails *types.ChaosDetails, resultDetails *types.ResultDetails) (*v1alpha1.ChaosResult, error) {
+	var result *v1alpha1.ChaosResult
 
 	if err := retry.
 		Times(uint(chaosDetails.Timeout / chaosDetails.Delay)).
 		Wait(time.Duration(chaosDetails.Delay) * time.Second).
 		Try(func(attempt uint) error {
-			resultList, err := clients.LitmusClient.ChaosResults(chaosDetails.ChaosNamespace).List(context.Background(),
-				v1.ListOptions{LabelSelector: fmt.Sprintf("chaosUID=%s", chaosDetails.ChaosUID)})
-			if err != nil {
-				return err
-			}
-			if len(resultList.Items) == 0 {
-				return nil
+			var err error
+
+			result, err = clients.LitmusClient.ChaosResults(chaosDetails.ChaosNamespace).Get(context.Background(), resultDetails.Name, v1.GetOptions{})
+			if err != nil && !k8serrors.IsNotFound(err) {
+				return cerrors.Error{ErrorCode: cerrors.ErrorTypeChaosResultCRUD, Target: fmt.Sprintf("{name: %s, namespace: %s}", resultDetails.Name, chaosDetails.ChaosNamespace), Reason: err.Error()}
 			}
-			result = resultList.Items[0]
+
 			return nil
 		}); err != nil {
 		return nil, err
 	}
 
-	return &result, nil
+	return result, nil
 }
 
 func (clients *ClientSets) CreateChaosResult(chaosDetails *types.ChaosDetails, result *v1alpha1.ChaosResult) (bool, error) {

pkg/result/chaosresult.go

@@ -31,7 +31,7 @@ func ChaosResult(chaosDetails *types.ChaosDetails, clients clients.ClientSets, r
 	// It tries to get the chaosresult, if available
 	// it will retry until it got chaos result or met the timeout(3 mins)
 	isResultAvailable := false
-	result, err := clients.GetChaosResult(chaosDetails)
+	result, err := clients.GetChaosResult(chaosDetails, resultDetails)
 	if err != nil {
 		return cerrors.Error{ErrorCode: cerrors.ErrorTypeChaosResultCRUD, Target: fmt.Sprintf("{name: %s, namespace: %s}", resultDetails.Name, chaosDetails.ChaosNamespace), Reason: fmt.Sprintf("failed to get result: %s", err.Error())}
 	}
@@ -234,7 +234,7 @@ func PatchChaosResult(clients clients.ClientSets, chaosDetails *types.ChaosDetai
 
 // SetResultUID sets the ResultUID into the ResultDetails structure
 func SetResultUID(resultDetails *types.ResultDetails, clients clients.ClientSets, chaosDetails *types.ChaosDetails) error {
-	result, err := clients.GetChaosResult(chaosDetails)
+	result, err := clients.GetChaosResult(chaosDetails, resultDetails)
 	if err != nil {
 		return cerrors.Error{ErrorCode: cerrors.ErrorTypeChaosResultCRUD, Target: fmt.Sprintf("{name: %s, namespace: %s}", resultDetails.Name, chaosDetails.ChaosNamespace), Reason: err.Error()}
 	}
@@ -304,7 +304,7 @@ func AnnotateChaosResult(resultName, namespace, status, kind, name string) error
 // GetChaosStatus get the chaos status based on annotations in chaosresult
 func GetChaosStatus(resultDetails *types.ResultDetails, chaosDetails *types.ChaosDetails, clients clients.ClientSets) (*v1alpha1.ChaosResult, error) {
 
-	result, err := clients.GetChaosResult(chaosDetails)
+	result, err := clients.GetChaosResult(chaosDetails, resultDetails)
 	if err != nil {
 		return nil, cerrors.Error{ErrorCode: cerrors.ErrorTypeChaosResultCRUD, Target: fmt.Sprintf("{name: %s, namespace: %s}", resultDetails.Name, chaosDetails.ChaosNamespace), Reason: err.Error()}
 	}