merge

kube-tarian · Nov 22, 2023 · 07b5af1 · 07b5af1
1 parent 533ef29
commit 07b5af1
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/capten/agent/internal/crossplane/cluster_claims.go b/capten/agent/internal/crossplane/cluster_claims.go
@@ -151,7 +151,7 @@ func (h *ClusterClaimSyncHandler) Sync() error {
 }
 
 func (h *ClusterClaimSyncHandler) updateManagedClusters(clusterCliams []model.ClusterClaim) error {
-	k8sclient, err := k8s.NewK8SClient(h.log)
+	_, err := k8s.NewK8SClient(h.log)
 	if err != nil {
 		return fmt.Errorf("failed to get k8s client, %v", err)
 	}
@@ -181,18 +181,20 @@ func (h *ClusterClaimSyncHandler) updateManagedClusters(clusterCliams []model.Cl
 			}
 
 			if status.Status != readyStatusValue {
-				secretName := fmt.Sprintf(clusterSecretName, clusterCliam.Spec.Id)
-				resp, err := k8sclient.GetSecretData(clusterCliam.Metadata.Namespace, secretName)
-				if err != nil {
-					h.log.Errorf("failed to get secret %s/%s, %v", clusterCliam.Metadata.Namespace, secretName, err)
-					continue
-				}
+				//secretName := fmt.Sprintf(clusterSecretName, clusterCliam.Spec.Id)
+				// resp, err := k8sclient.GetSecretData(clusterCliam.Metadata.Namespace, secretName)
+				// if err != nil {
+				// 	h.log.Errorf("failed to get secret %s/%s, %v", clusterCliam.Metadata.Namespace, secretName, err)
+				// 	continue
+				// }
+
+				resp := map[string]string{}
 
-				clusterEndpoint := resp.Data[k8sEndpoint]
+				clusterEndpoint := resp[k8sEndpoint]
 				managedCluster.ClusterEndpoint = clusterEndpoint
 				cred := map[string]string{}
-				cred[kubeConfig] = resp.Data[kubeConfig]
-				cred[k8sClusterCA] = resp.Data[k8sClusterCA]
+				cred[kubeConfig] = resp[kubeConfig]
+				cred[k8sClusterCA] = resp[k8sClusterCA]
 				cred[k8sEndpoint] = clusterEndpoint
 
 				err = credential.PutGenericCredential(context.TODO(), managedClusterEntityName, managedCluster.Id, cred)