use Pod informer to avoid Pod GETs

GoogleCloudPlatform · Jun 16, 2024 · 0d9d3c7 · 0d9d3c7
1 parent b83e1b7
commit 0d9d3c7
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/cmd/csi_driver/main.go b/cmd/csi_driver/main.go
@@ -73,7 +73,7 @@ func main() {
 		}()
 	}
 
-	clientset, err := clientset.New(*kubeconfigPath)
+	clientset, err := clientset.New(*kubeconfigPath, *nodeID)
 	if err != nil {
 		klog.Fatal("Failed to configure k8s client")
 	}

diff --git a/deploy/base/node/node_setup.yaml b/deploy/base/node/node_setup.yaml
@@ -35,7 +35,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["pods"]
-    verbs: ["get"]
+    verbs: ["get", "watch", "list"]
   - apiGroups: [""]
     resources: ["serviceaccounts"]
     verbs: ["get"]

diff --git a/pkg/cloud_provider/clientset/clientset.go b/pkg/cloud_provider/clientset/clientset.go
@@ -24,14 +24,16 @@ import (
 	authenticationv1 "k8s.io/api/authentication/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
+	listersv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
 )
 
 type Interface interface {
-	GetPod(ctx context.Context, namespace, name string) (*corev1.Pod, error)
+	GetPod(namespace, name string) (*corev1.Pod, error)
 	CreateServiceAccountToken(ctx context.Context, namespace, name string, tokenRequest *authenticationv1.TokenRequest) (*authenticationv1.TokenRequest, error)
 	GetGCPServiceAccountName(ctx context.Context, namespace, name string) (string, error)
 }
@@ -43,9 +45,10 @@ type PodInfo struct {
 
 type Clientset struct {
 	k8sClients kubernetes.Interface
+	podLister  listersv1.PodLister
 }
 
-func New(kubeconfigPath string) (Interface, error) {
+func New(kubeconfigPath, nodeName string) (Interface, error) {
 	var err error
 	var rc *rest.Config
 	if kubeconfigPath != "" {
@@ -64,11 +67,27 @@ func New(kubeconfigPath string) (Interface, error) {
 		klog.Fatal("failed to configure k8s client")
 	}
 
-	return &Clientset{k8sClients: clientset}, nil
+	// Resync period of 0 means no resync
+	informerFactory := informers.NewSharedInformerFactoryWithOptions(
+		clientset,
+		0,
+		informers.WithTweakListOptions(func(options *metav1.ListOptions) {
+			if nodeName != "" {
+				options.FieldSelector = "spec.nodeName=" + nodeName
+			}
+		}),
+	)
+	podLister := informerFactory.Core().V1().Pods().Lister()
+
+	ctx := context.Background()
+	informerFactory.Start(ctx.Done())
+	informerFactory.WaitForCacheSync(ctx.Done())
+
+	return &Clientset{k8sClients: clientset, podLister: podLister}, nil
 }
 
-func (c *Clientset) GetPod(ctx context.Context, namespace, name string) (*corev1.Pod, error) {
-	return c.k8sClients.CoreV1().Pods(namespace).Get(ctx, name, metav1.GetOptions{})
+func (c *Clientset) GetPod(namespace, name string) (*corev1.Pod, error) {
+	return c.podLister.Pods(namespace).Get(name)
 }
 
 func (c *Clientset) CreateServiceAccountToken(ctx context.Context, namespace, name string, tokenRequest *authenticationv1.TokenRequest) (*authenticationv1.TokenRequest, error) {

diff --git a/pkg/cloud_provider/clientset/fake.go b/pkg/cloud_provider/clientset/fake.go
@@ -28,7 +28,7 @@ import (
 
 type FakeClientset struct{}
 
-func (c *FakeClientset) GetPod(_ context.Context, namespace, name string) (*corev1.Pod, error) {
+func (c *FakeClientset) GetPod(namespace, name string) (*corev1.Pod, error) {
 	config := webhook.FakeConfig()
 	pod := &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{

diff --git a/pkg/csi_driver/node.go b/pkg/csi_driver/node.go
@@ -166,7 +166,7 @@ func (s *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublish
 	}
 
 	// Check if the sidecar container was injected into the Pod
-	pod, err := s.k8sClients.GetPod(ctx, vc[VolumeContextKeyPodNamespace], vc[VolumeContextKeyPodName])
+	pod, err := s.k8sClients.GetPod(vc[VolumeContextKeyPodNamespace], vc[VolumeContextKeyPodName])
 	if err != nil {
 		return nil, status.Errorf(codes.NotFound, "failed to get pod: %v", err)
 	}

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -57,7 +57,7 @@ var _ = func() bool {
 	flag.Parse()
 	framework.AfterReadingAllFlags(&framework.TestContext)
 
-	c, err = clientset.New(framework.TestContext.KubeConfig)
+	c, err = clientset.New(framework.TestContext.KubeConfig, "")
 	if err != nil {
 		klog.Fatalf("Failed to configure k8s client: %v", err)
 	}