Merge branch 'main' into feat/log-streaming-for-pods

cyclops-ctrl/internal/controller/sse/proxychan.go

@@ -8,7 +8,6 @@ import (
 )
 
 type ProxyChan struct {
-	update bool
 	input  <-chan watch.Event
 	output chan any
 }
@@ -21,28 +20,20 @@ func NewProxyChan(ctx context.Context, input <-chan watch.Event, interval time.D
 
 	go func() {
 		ticker := time.NewTicker(interval)
-		defer ticker.Stop()
-
-		batcher := time.NewTicker(time.Millisecond * 500)
-		defer batcher.Stop()
+		defer func() {
+			ticker.Stop()
+		}()
 
 		for {
 			select {
 			case _, ok := <-p.input:
 				if !ok {
 					return
 				}
-				p.update = true
+				p.output <- true
 
 			case <-ticker.C:
 				p.output <- true
-				p.update = false
-
-			case <-batcher.C:
-				if p.update {
-					p.output <- true
-				}
-				p.update = false
 
 			case <-ctx.Done():
 				return

cyclops-ctrl/internal/controller/sse/resources.go

@@ -38,7 +38,7 @@ func (s *Server) Resources(ctx *gin.Context) {
 		return
 	}
 
-	p := NewProxyChan(ctx.Request.Context(), watchResource.ResultChan(), time.Second*15)
+	p := NewProxyChan(ctx.Request.Context(), watchResource.ResultChan(), time.Second*10)
 
 	ctx.Stream(func(w io.Writer) bool {
 		for {

cyclops-ctrl/internal/controller/sse/server.go

@@ -3,7 +3,7 @@ package sse
 import (
 	"github.com/gin-gonic/gin"
 
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/cluster/k8sclient"
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/cluster/k8sclient"
 )
 
 type Server struct {
@@ -25,6 +25,7 @@ func HeadersMiddleware() gin.HandlerFunc {
 		c.Writer.Header().Set("Cache-Control", "no-cache")
 		c.Writer.Header().Set("Connection", "keep-alive")
 		c.Writer.Header().Set("Transfer-Encoding", "chunked")
+		c.Writer.Header().Set("X-Accel-Buffering", "no")
 		c.Next()
 	}
 }

cyclops-ctrl/internal/handler/handler.go

@@ -5,7 +5,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"net/http"
 
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/cluster/k8sclient"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/controller"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/prometheus"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/telemetry"

cyclops-ctrl/pkg/cluster/k8sclient/client.go

@@ -7,6 +7,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	networkingv1 "k8s.io/api/networking/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/apimachinery/pkg/watch"
 	"os"
 	"os/exec"
 	"sort"

cyclops-ui/src/components/k8s-resources/common/PodTable/PodTable.tsx

@@ -251,6 +251,31 @@ const PodTable = ({ pods, namespace, updateResourceData }: Props) => {
       <div style={{ width: "400px" }}>
         <h3>{pod.name} actions</h3>
         <Divider style={{ margin: "8px" }} />
+        <Row style={{ margin: 4, gap: 8 }}>
+          <PodLogs pod={{ ...pod, namespace }} />
+          <PodManifest pod={{ ...pod, namespace }} />
+          <Button
+            style={{ color: "red", width: "100%" }}
+            onClick={function () {
+              setError({ message: "", description: "" });
+              setDeletePodRef({
+                on: true,
+                podDetails: {
+                  group: ``,
+                  version: `v1`,
+                  kind: `Pod`,
+                  name: pod.name,
+                  namespace: namespace,
+                },
+              });
+            }}
+          >
+            <h4>
+              <DeleteOutlined style={{ paddingRight: "5px" }} />
+              Delete Pod
+            </h4>
+          </Button>
+        </Row>
         <Button
           style={{ width: "60%", margin: "4px" }}
           onClick={function () {

install/cyclops-install.yaml

@@ -341,7 +341,7 @@ spec:
     spec:
       containers:
         - name: cyclops-ui
-          image: cyclopsui/cyclops-ui:v0.11.0-rc-streaming.2
+          image: cyclopsui/cyclops-ui:v0.11.0
           ports:
             - containerPort: 80
           env:
@@ -406,7 +406,7 @@ spec:
       serviceAccountName: cyclops-ctrl
       containers:
         - name: cyclops-ctrl
-          image: cyclopsui/cyclops-ctrl:v0.11.0-rc-streaming.2
+          image: cyclopsui/cyclops-ctrl:v0.11.0
           ports:
             - containerPort: 8080
           env: