Nail/fission-console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: logs — убрать хардкод user-container, взять первый контейнер пода (v1.3.62)

Browse Source
This commit is contained in:
“Naeel”
2026-05-07 20:58:23 +04:00
parent 9b0089e15a
commit af6e7354d6
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
console/deploy/console.yaml
+4 -1
View File
@@ -12,6 +12,9 @@ rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["pods"] resources: ["pods"]
verbs: ["get", "list"] verbs: ["get", "list"]
- apiGroups: [""]
resources: ["pods/log"]
verbs: ["get"]
- apiGroups: ["apps"] - apiGroups: ["apps"]
resources: ["deployments"] resources: ["deployments"]
verbs: ["get", "list", "update", "patch"] verbs: ["get", "list", "update", "patch"]
@@ -52,7 +55,7 @@ spec:
serviceAccountName: fission-console serviceAccountName: fission-console
containers: containers:
- name: console - name: console
image: naeel/fission-console:v1.3.61 image: naeel/fission-console:v1.3.62
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8090 - containerPort: 8090
console/internal/api/handlers.go
+2 -2
View File
@@ -22,10 +22,10 @@ import (
"fission-console/internal/model" "fission-console/internal/model"
"fission-console/internal/runtime" "fission-console/internal/runtime"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
corev1 "k8s.io/api/core/v1"
) )
// validFuncName — RFC 1123 subdomain label: строчные буквы+цифры+дефис, без дефиса в начале/конце. // validFuncName — RFC 1123 subdomain label: строчные буквы+цифры+дефис, без дефиса в начале/конце.
@@ -1651,8 +1651,8 @@ func (s *Server) handleGetFunctionLogs(w http.ResponseWriter, r *http.Request, n
var allLogs strings.Builder var allLogs strings.Builder
tailLines := int64(100) tailLines := int64(100)
for _, pod := range pods.Items { for _, pod := range pods.Items {
// Container не указываем — kubernetes берёт первый (environment container)
req := s.kube.CoreV1().Pods(ns).GetLogs(pod.Name, &corev1.PodLogOptions{ req := s.kube.CoreV1().Pods(ns).GetLogs(pod.Name, &corev1.PodLogOptions{
Container: "user-container",
TailLines: &tailLines, TailLines: &tailLines,
}) })
rc, err := req.Stream(ctx) rc, err := req.Stream(ctx)
console/ui/index.html
+2 -2
View File
@@ -102,7 +102,7 @@
<div class="nubes">NUBES</div> <div class="nubes">NUBES</div>
<div class="product">FISSION CONSOLE</div> <div class="product">FISSION CONSOLE</div>
</div> </div>
<div style="font-size:0.65rem; color:var(--text-secondary); margin-left:10px; align-self:center; opacity:0.7;">v1.3.61</div> <div style="font-size:0.65rem; color:var(--text-secondary); margin-left:10px; align-self:center; opacity:0.7;">v1.3.62</div>
</div> </div>
<div class="row" style="margin:0;"> <div class="row" style="margin:0;">
<button class="btn ghost" onclick="reloadAll()">Refresh</button> <button class="btn ghost" onclick="reloadAll()">Refresh</button>
@@ -474,7 +474,7 @@
</div> </div>
<div class="actions" style="justify-content:space-between; align-items:center;"> <div class="actions" style="justify-content:space-between; align-items:center;">
<span style="font-size:0.75rem; color:var(--text-secondary);">v1.3.61</span> <span style="font-size:0.75rem; color:var(--text-secondary);">v1.3.62</span>
<button class="btn ghost" onclick="closeHelp()">Закрыть</button> <button class="btn ghost" onclick="closeHelp()">Закрыть</button>
</div> </div>
</div> </div>