Merge pull request #5616 from mohamedawnallah/dependOnClientSetInterface

operator+pkg: depend on `clientset.Interface` instead of `*clientset.Clientset`
karmada-io · Sep 29, 2024 · 59e3025 · 59e3025
2 parents 58612d3 + a640f09
commit 59e3025
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/operator/pkg/util/kubeconfig.go b/operator/pkg/util/kubeconfig.go
@@ -67,7 +67,7 @@ func IsInCluster(hostCluster *operatorv1alpha1.HostCluster) bool {
 }
 
 // BuildClientFromSecretRef builds a clientset from the secret reference.
-func BuildClientFromSecretRef(client *clientset.Clientset, ref *operatorv1alpha1.LocalSecretReference) (*clientset.Clientset, error) {
+func BuildClientFromSecretRef(client clientset.Interface, ref *operatorv1alpha1.LocalSecretReference) (clientset.Interface, error) {
  secret, err := client.CoreV1().Secrets(ref.Namespace).Get(context.TODO(), ref.Name, metav1.GetOptions{})
  if err != nil {
  return nil, err
@@ -81,7 +81,7 @@ func BuildClientFromSecretRef(client *clientset.Clientset, ref *operatorv1alpha1
  return newClientSetForConfig(kubeconfigBytes)
 }
 
-func newClientSetForConfig(kubeconfig []byte) (*clientset.Clientset, error) {
+func newClientSetForConfig(kubeconfig []byte) (clientset.Interface, error) {
  clientConfig, err := clientcmd.NewClientConfigFromBytes(kubeconfig)
  if err != nil {
  return nil, err

diff --git a/pkg/controllers/status/cluster_status_controller.go b/pkg/controllers/status/cluster_status_controller.go
@@ -451,9 +451,9 @@ func getClusterHealthStatus(clusterClient *util.ClusterClient) (online, healthy
  return true, true
 }
 
-func healthEndpointCheck(client *clientset.Clientset, path string) (int, error) {
+func healthEndpointCheck(client clientset.Interface, path string) (int, error) {
  var healthStatus int
- resp := client.DiscoveryClient.RESTClient().Get().AbsPath(path).Do(context.TODO()).StatusCode(&healthStatus)
+ resp := client.Discovery().RESTClient().Get().AbsPath(path).Do(context.TODO()).StatusCode(&healthStatus)
  return healthStatus, resp.Error()
 }
 

diff --git a/pkg/karmadactl/cmdinit/karmada/deploy.go b/pkg/karmadactl/cmdinit/karmada/deploy.go
@@ -221,7 +221,7 @@ func crdPatchesResources(filename, caBundle string) ([]byte, error) {
 }
 
 // createCRDs create crd resource
-func createCRDs(crdClient *clientset.Clientset, filename string) error {
+func createCRDs(crdClient clientset.Interface, filename string) error {
  obj := apiextensionsv1.CustomResourceDefinition{}
  data, err := os.ReadFile(filename)
  if err != nil {
@@ -252,7 +252,7 @@ func createCRDs(crdClient *clientset.Clientset, filename string) error {
 }
 
 // patchCRDs patch crd resource
-func patchCRDs(crdClient *clientset.Clientset, caBundle, filename string) error {
+func patchCRDs(crdClient clientset.Interface, caBundle, filename string) error {
  data, err := crdPatchesResources(filename, caBundle)
  if err != nil {
  return err

diff --git a/pkg/karmadactl/util/apiclient/apiclient.go b/pkg/karmadactl/util/apiclient/apiclient.go
@@ -98,7 +98,7 @@ func NewClientSet(c *rest.Config) (*kubernetes.Clientset, error) {
 }
 
 // NewCRDsClient is to create a clientset ClientSet
-func NewCRDsClient(c *rest.Config) (*clientset.Clientset, error) {
+func NewCRDsClient(c *rest.Config) (clientset.Interface, error) {
  return clientset.NewForConfig(c)
 }