[CLD-9197]: Removing Argocd cluster deregistration to be able to dele… (#1111)

* [CLD-9197]: Removing Argocd cluster deregistration to be able to delete kops clusters.

* [CLD-9197]: Removing Argocd cluster deregistration.

* [CLD-9197]: Removing unused function

Author: andrleite

internal/provisioner/cluster_register.go

@@ -122,38 +122,3 @@ func (cr *ClusterRegister) getClusterCreds(s3StateStore string) (*k8s.Kubeconfig
 	}
 	return clusterCreds, nil
 }
-
-func (cr *ClusterRegister) deregisterClusterFromArgocd() error {
-	logger := cr.logger.WithField("cluster", cr.cluster.ID)
-
-	// Git pull to get the latest state before deleting the cluster
-	err := cr.gitClient.Pull(logger)
-	if err != nil {
-		return errors.Wrap(err, "failed to pull from argocd repo")
-	}
-
-	clusteFile, err := os.ReadFile(cr.clusterFilePath)
-	if err != nil {
-		return errors.Wrap(err, "failed to read cluster file")
-	}
-
-	argoK8sFile, err := argocd.ReadArgoK8sRegistrationFile(clusteFile)
-	if err != nil {
-		return errors.Wrap(err, "failed to load cluster registration file into argo struct")
-	}
-
-	if err = argocd.DeleteK8sClusterFromRegistrationFile(argoK8sFile, cr.clusterName, cr.clusterFilePath); err != nil {
-		return errors.Wrap(err, "failed to remove cluster from registration file")
-	}
-
-	commitMsg := "Removing cluster: " + cr.cluster.ID
-	if err = cr.gitClient.Commit(cr.clusterFile, commitMsg, logger); err != nil {
-		return errors.Wrap(err, "failed to commit to repo")
-	}
-
-	if err = cr.gitClient.Push(logger); err != nil {
-		return errors.Wrap(err, "failed to push to repo")
-	}
-
-	return nil
-}

internal/provisioner/kops_provisioner.go

@@ -885,30 +885,6 @@ func (provisioner *KopsProvisioner) cleanupCluster(cluster *model.Cluster, tempD
 		return errors.Wrap(err, "failed to destroy all services in the utility group")
 	}
 
-	// Remove utility and cluster from argocd
-	if cluster.UtilityMetadata.ManagedByArgocd {
-		err = ugh.RemoveUtilityFromArgocd(gitClient)
-		if err != nil {
-			return errors.Wrap(err, "failed to remove utility from argocd")
-		}
-
-		appName := fmt.Sprintf("%s-%s", "gitops-sre", provisioner.awsClient.GetCloudEnvironmentName())
-		err = argocdClient.WaitForAppHealthy(appName)
-		if err != nil {
-			return errors.Wrap(err, "failed to wait for app to be healthy")
-		}
-
-		var cr *ClusterRegister
-		cr, err = NewClusterRegisterHandle(cluster, gitClient, provisioner.awsClient.GetCloudEnvironmentName(), tempDir, logger)
-		if err != nil {
-			return errors.Wrap(err, "Failed to create new cluster register handle")
-		}
-
-		if err = cr.deregisterClusterFromArgocd(); err != nil {
-			return errors.Wrap(err, "failed to remove cluster from Argocd")
-		}
-	}
-
 	iamRole := fmt.Sprintf("nodes.%s", kopsMetadata.Name)
 	err = provisioner.awsClient.DetachPolicyFromRole(iamRole, aws.CustomNodePolicyName, logger)
 	if err != nil {