From b07f82bc04eea8a0a8529f99cd6cdac5bb934400 Mon Sep 17 00:00:00 2001 From: Jeff Rose Date: Mon, 27 Jan 2025 22:03:10 -0800 Subject: [PATCH] fix: set proper type for cluster api kubeconfig secret --- controllers/vcluster_controller.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/controllers/vcluster_controller.go b/controllers/vcluster_controller.go index 9d607454..90092ec0 100644 --- a/controllers/vcluster_controller.go +++ b/controllers/vcluster_controller.go @@ -56,8 +56,7 @@ type ClientConfigGetter interface { NewForConfig(restConfig *rest.Config) (kubernetes.Interface, error) } -type clientConfigGetter struct { -} +type clientConfigGetter struct{} func (c *clientConfigGetter) NewForConfig(restConfig *rest.Config) (kubernetes.Interface, error) { return kubernetes.NewForConfig(restConfig) @@ -71,8 +70,7 @@ type HTTPClientGetter interface { ClientFor(r http.RoundTripper, timeout time.Duration) *http.Client } -type httpClientGetter struct { -} +type httpClientGetter struct{} func (h *httpClientGetter) ClientFor(r http.RoundTripper, timeout time.Duration) *http.Client { return &http.Client{ @@ -414,12 +412,11 @@ func (r *VClusterReconciler) syncVClusterKubeconfig(ctx context.Context, vCluste }, }, Type: clusterv1beta1.ClusterSecretType, + Data: map[string][]byte{ + KubeconfigDataName: outKubeConfig, + }, } _, err = controllerutil.CreateOrPatch(ctx, r.Client, kubeSecret, func() error { - if kubeSecret.Data == nil { - kubeSecret.Data = make(map[string][]byte) - } - kubeSecret.Data[KubeconfigDataName] = outKubeConfig return nil }) if err != nil {