Add ability to also get pod logs

Signed-off-by: Juan Antonio Osorio <ozz@stacklok.com>

Author: JAORMX

pkg/k8s/client.go

@@ -10,15 +10,21 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/homedir"
 )
 
+// PodLogsFunc is a function type for getting pod logs
+type PodLogsFunc func(ctx context.Context, namespace, name string) (*unstructured.Unstructured, error)
+
 // Client represents a Kubernetes client with discovery and dynamic capabilities
 type Client struct {
 	discoveryClient discovery.DiscoveryInterface
 	dynamicClient   dynamic.Interface
+	clientset       kubernetes.Interface
+	getPodLogs      PodLogsFunc
 }
 
 // NewClient creates a new Kubernetes client
@@ -40,10 +46,22 @@ func NewClient(kubeconfigPath string) (*Client, error) {
 		return nil, fmt.Errorf("failed to create dynamic client: %w", err)
 	}
 
-	return &Client{
+	// Create clientset for typed API access
+	clientset, err := kubernetes.NewForConfig(config)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create clientset: %w", err)
+	}
+
+	client := &Client{
 		discoveryClient: discoveryClient,
 		dynamicClient:   dynamicClient,
-	}, nil
+		clientset:       clientset,
+	}
+	
+	// Set the default implementation for getPodLogs
+	client.getPodLogs = client.defaultGetPodLogs
+	
+	return client, nil
 }
 
 // getConfig returns a Kubernetes client configuration
@@ -139,7 +157,13 @@ func (c *Client) SetDiscoveryClient(discoveryClient discovery.DiscoveryInterface
 	c.discoveryClient = discoveryClient
 }
 
+// SetClientset sets the clientset (for testing purposes)
+func (c *Client) SetClientset(clientset kubernetes.Interface) {
+	// Store the interface directly, we'll use it through the interface methods
+	c.clientset = clientset
+}
+
 // IsReady returns true if the client is ready to use
 func (c *Client) IsReady() bool {
-	return c.discoveryClient != nil && c.dynamicClient != nil
+	return c.discoveryClient != nil && c.dynamicClient != nil && c.clientset != nil
 }

pkg/k8s/client_test.go

@@ -11,7 +11,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	discoveryfake "k8s.io/client-go/discovery/fake"
-	"k8s.io/client-go/dynamic/fake"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	kubefake "k8s.io/client-go/kubernetes/fake"
 	ktesting "k8s.io/client-go/testing"
 )
 
@@ -24,7 +25,7 @@ func TestListClusteredResources(t *testing.T) {
 		{Group: "rbac.authorization.k8s.io", Version: "v1", Resource: "clusterroles"}: "ClusterRoleList",
 	}
 
-	client := fake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds)
+	client := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds)
 
 	// Create a test client with the fake dynamic client
 	testClient := &Client{
@@ -84,7 +85,7 @@ func TestListNamespacedResources(t *testing.T) {
 		{Group: "", Version: "v1", Resource: "services"}: "ServiceList",
 	}
 
-	client := fake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds)
+	client := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds)
 
 	// Create a test client with the fake dynamic client
 	testClient := &Client{
@@ -140,7 +141,7 @@ func TestListNamespacedResources(t *testing.T) {
 func TestApplyClusteredResource(t *testing.T) {
 	// Create a fake dynamic client
 	scheme := runtime.NewScheme()
-	client := fake.NewSimpleDynamicClient(scheme)
+	client := dynamicfake.NewSimpleDynamicClient(scheme)
 
 	// Create a test client with the fake dynamic client
 	testClient := &Client{
@@ -196,7 +197,7 @@ func TestApplyClusteredResource(t *testing.T) {
 func TestApplyNamespacedResource(t *testing.T) {
 	// Create a fake dynamic client
 	scheme := runtime.NewScheme()
-	client := fake.NewSimpleDynamicClient(scheme)
+	client := dynamicfake.NewSimpleDynamicClient(scheme)
 
 	// Create a test client with the fake dynamic client
 	testClient := &Client{
@@ -254,7 +255,7 @@ func TestApplyNamespacedResource(t *testing.T) {
 func TestGetClusteredResource(t *testing.T) {
 	// Create a fake dynamic client
 	scheme := runtime.NewScheme()
-	client := fake.NewSimpleDynamicClient(scheme)
+	client := dynamicfake.NewSimpleDynamicClient(scheme)
 
 	// Create a test client with the fake dynamic client
 	testClient := &Client{
@@ -307,7 +308,7 @@ func TestGetClusteredResource(t *testing.T) {
 func TestGetNamespacedResource(t *testing.T) {
 	// Create a fake dynamic client
 	scheme := runtime.NewScheme()
-	client := fake.NewSimpleDynamicClient(scheme)
+	client := dynamicfake.NewSimpleDynamicClient(scheme)
 
 	// Create a test client with the fake dynamic client
 	testClient := &Client{
@@ -365,7 +366,7 @@ func TestSetDynamicClient(t *testing.T) {
 
 	// Create a fake dynamic client
 	scheme := runtime.NewScheme()
-	fakeDynamicClient := fake.NewSimpleDynamicClient(scheme)
+	fakeDynamicClient := dynamicfake.NewSimpleDynamicClient(scheme)
 
 	// Set the dynamic client
 	testClient.SetDynamicClient(fakeDynamicClient)
@@ -389,28 +390,35 @@ func TestSetDiscoveryClient(t *testing.T) {
 }
 
 func TestIsReady(t *testing.T) {
-	// Test with both clients nil
+	// Test with all clients nil
 	testClient := &Client{}
-	assert.False(t, testClient.IsReady(), "Expected IsReady to return false when both clients are nil")
+	assert.False(t, testClient.IsReady(), "Expected IsReady to return false when all clients are nil")
 
 	// Test with only dynamic client set
 	testClient = &Client{}
 	scheme := runtime.NewScheme()
-	fakeDynamicClient := fake.NewSimpleDynamicClient(scheme)
+	fakeDynamicClient := dynamicfake.NewSimpleDynamicClient(scheme)
 	testClient.SetDynamicClient(fakeDynamicClient)
-	assert.False(t, testClient.IsReady(), "Expected IsReady to return false when discovery client is nil")
+	assert.False(t, testClient.IsReady(), "Expected IsReady to return false when some clients are nil")
 
 	// Test with only discovery client set
 	testClient = &Client{}
 	fakeDiscoveryClient := &discoveryfake.FakeDiscovery{Fake: &ktesting.Fake{}}
 	testClient.SetDiscoveryClient(fakeDiscoveryClient)
-	assert.False(t, testClient.IsReady(), "Expected IsReady to return false when dynamic client is nil")
+	assert.False(t, testClient.IsReady(), "Expected IsReady to return false when some clients are nil")
 
-	// Test with both clients set
+	// Test with only clientset set
+	testClient = &Client{}
+	fakeClientset := kubefake.NewSimpleClientset()
+	testClient.SetClientset(fakeClientset)
+	assert.False(t, testClient.IsReady(), "Expected IsReady to return false when some clients are nil")
+	
+	// Test with all clients set
 	testClient = &Client{}
 	testClient.SetDynamicClient(fakeDynamicClient)
 	testClient.SetDiscoveryClient(fakeDiscoveryClient)
-	assert.True(t, testClient.IsReady(), "Expected IsReady to return true when both clients are set")
+	testClient.SetClientset(fakeClientset)
+	assert.True(t, testClient.IsReady(), "Expected IsReady to return true when all clients are set")
 }
 
 func TestListAPIResources(t *testing.T) {

pkg/k8s/subresource.go

@@ -1,9 +1,12 @@
 package k8s
 
 import (
+	"bytes"
 	"context"
 	"fmt"
+	"io"
 
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -19,6 +22,11 @@ func (c *Client) GetResource(ctx context.Context, gvr schema.GroupVersionResourc
 	var result *unstructured.Unstructured
 	var err error
 
+	// Special handling for pod logs
+	if gvr.Resource == "pods" && subresource == "logs" {
+		return c.getPodLogs(ctx, namespace, name)
+	}
+
 	if namespace == "" {
 		// Clustered resource
 		if subresource == "" {
@@ -43,5 +51,48 @@ func (c *Client) GetResource(ctx context.Context, gvr schema.GroupVersionResourc
 		return nil, fmt.Errorf("failed to get resource: %w", err)
 	}
 
+	return result, nil
+}
+
+// defaultGetPodLogs retrieves logs from a pod and returns them as an unstructured object
+func (c *Client) defaultGetPodLogs(ctx context.Context, namespace, name string) (*unstructured.Unstructured, error) {
+	// We need to use the CoreV1 client for logs, as the dynamic client doesn't handle logs properly
+	podLogOpts := corev1.PodLogOptions{}
+	
+	// Get the REST client for pods
+	req := c.clientset.CoreV1().Pods(namespace).GetLogs(name, &podLogOpts)
+	
+	// Execute the request
+	podLogs, err := req.Stream(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get pod logs: %w", err)
+	}
+	defer func() {
+		if closeErr := podLogs.Close(); closeErr != nil {
+			// Just log the error, we can't return it at this point
+			fmt.Printf("Error closing pod logs stream: %v\n", closeErr)
+		}
+	}()
+
+	// Read the logs
+	buf := new(bytes.Buffer)
+	_, err = io.Copy(buf, podLogs)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read pod logs: %w", err)
+	}
+
+	// Create an unstructured object with the logs
+	result := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Pod",
+			"metadata": map[string]interface{}{
+				"name":      name,
+				"namespace": namespace,
+			},
+			"logs": buf.String(),
+		},
+	}
+
 	return result, nil
 }