diff --git a/console/deploy/console.yaml b/console/deploy/console.yaml index d233fa6..3fa1c79 100644 --- a/console/deploy/console.yaml +++ b/console/deploy/console.yaml @@ -12,6 +12,9 @@ rules: - apiGroups: [""] resources: ["pods"] verbs: ["get", "list"] + - apiGroups: [""] + resources: ["pods/log"] + verbs: ["get"] - apiGroups: ["apps"] resources: ["deployments"] verbs: ["get", "list", "update", "patch"] @@ -52,7 +55,7 @@ spec: serviceAccountName: fission-console containers: - name: console - image: naeel/fission-console:v1.3.61 + image: naeel/fission-console:v1.3.62 imagePullPolicy: Always ports: - containerPort: 8090 diff --git a/console/internal/api/handlers.go b/console/internal/api/handlers.go index 2c38d0b..401b089 100644 --- a/console/internal/api/handlers.go +++ b/console/internal/api/handlers.go @@ -22,10 +22,10 @@ import ( "fission-console/internal/model" "fission-console/internal/runtime" + corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - corev1 "k8s.io/api/core/v1" ) // validFuncName — RFC 1123 subdomain label: строчные буквы+цифры+дефис, без дефиса в начале/конце. @@ -1651,8 +1651,8 @@ func (s *Server) handleGetFunctionLogs(w http.ResponseWriter, r *http.Request, n var allLogs strings.Builder tailLines := int64(100) for _, pod := range pods.Items { + // Container не указываем — kubernetes берёт первый (environment container) req := s.kube.CoreV1().Pods(ns).GetLogs(pod.Name, &corev1.PodLogOptions{ - Container: "user-container", TailLines: &tailLines, }) rc, err := req.Stream(ctx) diff --git a/console/ui/index.html b/console/ui/index.html index b068ed0..9b43379 100644 --- a/console/ui/index.html +++ b/console/ui/index.html @@ -102,7 +102,7 @@
NUBES
FISSION CONSOLE
-
v1.3.61
+
v1.3.62
@@ -474,7 +474,7 @@
- v1.3.61 + v1.3.62