Use Subresource client for shoots/adminkubeconfig and drop generate…

…d clientset
shafeeqes · Jan 19, 2023 · 9482144 · 9482144
1 parent 4b59d6a
commit 9482144
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 88 deletions.
diff --git a/pkg/apis/core/v1alpha1/types_shoot.go b/pkg/apis/core/v1alpha1/types_shoot.go
@@ -27,7 +27,6 @@ import (
 )
 
 // +genclient
-// +genclient:method=CreateAdminKubeconfigRequest,verb=create,subresource=adminkubeconfig,input=github.com/gardener/gardener/pkg/apis/authentication/v1alpha1.AdminKubeconfigRequest,result=github.com/gardener/gardener/pkg/apis/authentication/v1alpha1.AdminKubeconfigRequest
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Shoot represents a Shoot cluster created and managed by Gardener.

diff --git a/pkg/apis/core/v1beta1/types_shoot.go b/pkg/apis/core/v1beta1/types_shoot.go
@@ -27,7 +27,6 @@ import (
 )
 
 // +genclient
-// +genclient:method=CreateAdminKubeconfigRequest,verb=create,subresource=adminkubeconfig,input=github.com/gardener/gardener/pkg/apis/authentication/v1alpha1.AdminKubeconfigRequest,result=github.com/gardener/gardener/pkg/apis/authentication/v1alpha1.AdminKubeconfigRequest
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Shoot represents a Shoot cluster created and managed by Gardener.

diff --git a/pkg/client/core/clientset/versioned/typed/core/v1alpha1/fake/fake_shoot.go b/pkg/client/core/clientset/versioned/typed/core/v1alpha1/fake/fake_shoot.go
diff --git a/pkg/client/core/clientset/versioned/typed/core/v1alpha1/shoot.go b/pkg/client/core/clientset/versioned/typed/core/v1alpha1/shoot.go
diff --git a/pkg/client/core/clientset/versioned/typed/core/v1beta1/fake/fake_shoot.go b/pkg/client/core/clientset/versioned/typed/core/v1beta1/fake/fake_shoot.go
diff --git a/pkg/client/core/clientset/versioned/typed/core/v1beta1/mock/mocks.go b/pkg/client/core/clientset/versioned/typed/core/v1beta1/mock/mocks.go
diff --git a/pkg/client/core/clientset/versioned/typed/core/v1beta1/shoot.go b/pkg/client/core/clientset/versioned/typed/core/v1beta1/shoot.go
diff --git a/test/utils/shoots/access/adminkubeconfig.go b/test/utils/shoots/access/adminkubeconfig.go
@@ -17,13 +17,11 @@ package access
 import (
 	"context"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	authenticationv1alpha1 "github.com/gardener/gardener/pkg/apis/authentication/v1alpha1"
 	gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
-	gardencoreversionedclientset "github.com/gardener/gardener/pkg/client/core/clientset/versioned"
 	"github.com/gardener/gardener/pkg/client/kubernetes"
 )
 
@@ -43,20 +41,17 @@ func CreateShootClientFromAdminKubeconfig(ctx context.Context, gardenClient kube
 
 // RequestAdminKubeconfigForShoot requests an admin kubeconfig for the given shoot.
 func RequestAdminKubeconfigForShoot(ctx context.Context, gardenClient kubernetes.Interface, shoot *gardencorev1beta1.Shoot, expirationSeconds *int64) ([]byte, error) {
-	versionedClient, err := gardencoreversionedclientset.NewForConfig(gardenClient.RESTConfig())
-	if err != nil {
-		return nil, err
-	}
-
 	adminKubeconfigRequest := &authenticationv1alpha1.AdminKubeconfigRequest{
 		Spec: authenticationv1alpha1.AdminKubeconfigRequestSpec{
 			ExpirationSeconds: expirationSeconds,
 		},
 	}
-	adminKubeconfig, err := versionedClient.CoreV1beta1().Shoots(shoot.GetNamespace()).CreateAdminKubeconfigRequest(ctx, shoot.GetName(), adminKubeconfigRequest, metav1.CreateOptions{})
-	if err != nil {
+	if err := gardenClient.Client().SubResource("adminkubeconfig").Create(ctx, shoot, adminKubeconfigRequest); err != nil {
+		return nil, err
+	}
+	if err := gardenClient.Client().SubResource("adminkubeconfig").Get(ctx, shoot, adminKubeconfigRequest); err != nil {
 		return nil, err
 	}
 
-	return adminKubeconfig.Status.Kubeconfig, nil
+	return adminKubeconfigRequest.Status.Kubeconfig, nil
 }