Merge pull request kosmos-io#245 from OrangeBao/main

kosmos-robot · web-flow · commit 09e394ea2b08 · 2023-11-15T09:07:34.000+08:00
fix: sync ca from root cluster
diff --git a/pkg/clustertree/cluster-manager/controllers/pod/root_pod_controller.go b/pkg/clustertree/cluster-manager/controllers/pod/root_pod_controller.go
@@ -445,7 +445,7 @@ func (r *RootPodReconciler) createCAInLeafCluster(ctx context.Context, lr *leafU
 		Name:      utils.RooTCAConfigMapName,
 	}
 
-	err = lr.Client.Get(ctx, rootCAConfigmapKey, ca)
+	err = r.Client.Get(ctx, rootCAConfigmapKey, ca)
 	if err != nil {
 		return nil, fmt.Errorf("could not find configmap %s in master cluster: %v", ca, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ func (r RootPodReconciler) createCAInLeafCluster(ctx context.Context, lr leafU`
`445`	`445`	`Name: utils.RooTCAConfigMapName,`
`446`	`446`	`}`
`447`	`447`
`448`		`- err = lr.Client.Get(ctx, rootCAConfigmapKey, ca)`
	`448`	`+ err = r.Client.Get(ctx, rootCAConfigmapKey, ca)`
`449`	`449`	`if err != nil {`
`450`	`450`	`return nil, fmt.Errorf("could not find configmap %s in master cluster: %v", ca, err)`
`451`	`451`	`}`