karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get secret from namespace which cluster in 

Signed-off-by: duguhaotian <knowledgehao@163.com>
This commit is contained in:
duguhaotian 2021-10-29 03:05:53 +01:00
parent 7daf975d4d
commit ef8b6fe138
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/clusterdiscovery/clusterapi/clusterapi.go
View File

@ -7,7 +7,6 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
@ -116,7 +115,7 @@ func (d *ClusterDetector) Reconcile(key util.QueueKey) error {
} }
if ok && clusterPhase == string(clusterapiv1alpha4.ClusterPhaseProvisioned) { if ok && clusterPhase == string(clusterapiv1alpha4.ClusterPhaseProvisioned) {
return d.joinClusterAPICluster(clusterWideKey.Name) return d.joinClusterAPICluster(clusterWideKey)
} }
return nil return nil
@ -147,13 +146,13 @@ func (d *ClusterDetector) GetUnstructuredObject(objectKey keys.ClusterWideKey) (
return &unstructured.Unstructured{Object: uncastObj}, nil return &unstructured.Unstructured{Object: uncastObj}, nil
} }
func (d *ClusterDetector) joinClusterAPICluster(clusterName string) error { func (d *ClusterDetector) joinClusterAPICluster(clusterWideKey keys.ClusterWideKey) error {
klog.Infof("Begin to join cluster-api's Cluster(%s) to karmada", clusterName) klog.Infof("Begin to join cluster-api's Cluster(%s) to karmada", clusterWideKey.Name)
secret := &corev1.Secret{} secret := &corev1.Secret{}
secretKey := types.NamespacedName{ secretKey := types.NamespacedName{
Namespace: metav1.NamespaceDefault, Namespace: clusterWideKey.Namespace,
Name: names.GenerateClusterAPISecretName(clusterName), Name: names.GenerateClusterAPISecretName(clusterWideKey.Name),
} }
err := d.ClusterAPIClient.Get(context.TODO(), secretKey, secret) err := d.ClusterAPIClient.Get(context.TODO(), secretKey, secret)
if err != nil { if err != nil {
@ -165,7 +164,7 @@ func (d *ClusterDetector) joinClusterAPICluster(clusterName string) error {
return err return err
} }
kubeconfigPath, err := generateKubeconfigFile(clusterName, secret.Data["value"]) kubeconfigPath, err := generateKubeconfigFile(clusterWideKey.Name, secret.Data["value"])
if err != nil { if err != nil {
return err return err
} }
@ -175,13 +174,13 @@ func (d *ClusterDetector) joinClusterAPICluster(clusterName string) error {
klog.Fatalf("Failed to get cluster-api management cluster rest config. kubeconfig: %s, err: %v", kubeconfigPath, err) klog.Fatalf("Failed to get cluster-api management cluster rest config. kubeconfig: %s, err: %v", kubeconfigPath, err)
} }
err = karmadactl.JoinCluster(d.ControllerPlaneConfig, clusterRestConfig, options.DefaultKarmadaClusterNamespace, clusterName, false) err = karmadactl.JoinCluster(d.ControllerPlaneConfig, clusterRestConfig, options.DefaultKarmadaClusterNamespace, clusterWideKey.Name, false)
if err != nil { if err != nil {
klog.Errorf("Failed to join cluster-api's cluster(%s): %v", clusterName, err) klog.Errorf("Failed to join cluster-api's cluster(%s): %v", clusterWideKey.Name, err)
return err return err
} }
klog.Infof("End to join cluster-api's Cluster(%s) to karmada", clusterName) klog.Infof("End to join cluster-api's Cluster(%s) to karmada", clusterWideKey.Name)
return nil return nil
} }