From 83b8fa9d98246f175e778e4b95dca949269f8394 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Mon, 12 Oct 2020 15:58:18 +0300
Subject: [PATCH 1/7] Ability to show previous terminated container logs
 (#1074)

* Show previous terminated container logs

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Fix for parsing error object

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 src/renderer/api/endpoints/pods.api.ts              |  2 ++
 .../components/+workloads-pods/pod-menu.tsx         |  1 +
 src/renderer/components/dock/pod-logs.store.ts      |  8 +++++---
 src/renderer/components/dock/pod-logs.tsx           | 13 ++++++++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/renderer/api/endpoints/pods.api.ts b/src/renderer/api/endpoints/pods.api.ts
index e1545f09c7..e1c91f6e36 100644
--- a/src/renderer/api/endpoints/pods.api.ts
+++ b/src/renderer/api/endpoints/pods.api.ts
@@ -42,12 +42,14 @@ export interface IPodMetrics<T = IMetrics> {
   networkTransmit: T;
 }
 
+// Reference: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#read-log-pod-v1-core
 export interface IPodLogsQuery {
   container?: string;
   tailLines?: number;
   timestamps?: boolean;
   sinceTime?: string; // Date.toISOString()-format
   follow?: boolean;
+  previous?: boolean;
 }
 
 export enum PodStatus {
diff --git a/src/renderer/components/+workloads-pods/pod-menu.tsx b/src/renderer/components/+workloads-pods/pod-menu.tsx
index 64b5d1f5eb..4ec3bb69d0 100644
--- a/src/renderer/components/+workloads-pods/pod-menu.tsx
+++ b/src/renderer/components/+workloads-pods/pod-menu.tsx
@@ -50,6 +50,7 @@ export class PodMenu extends React.Component<Props> {
       initContainers: pod.getInitContainers(),
       selectedContainer: container,
       showTimestamps: false,
+      previous: false,
       tailLines: 1000
     });
   }
diff --git a/src/renderer/components/dock/pod-logs.store.ts b/src/renderer/components/dock/pod-logs.store.ts
index bf2bf9eb5c..fa1da38c68 100644
--- a/src/renderer/components/dock/pod-logs.store.ts
+++ b/src/renderer/components/dock/pod-logs.store.ts
@@ -13,6 +13,7 @@ export interface IPodLogsData {
   initContainers: IPodContainer[]
   showTimestamps: boolean
   tailLines: number
+  previous: boolean
 }
 
 type TabId = string;
@@ -48,7 +49,7 @@ export class PodLogsStore extends DockTabStore<IPodLogsData> {
     }
     const data = this.getData(tabId);
     const { oldLogs, newLogs } = this.logs.get(tabId);
-    const { selectedContainer, tailLines } = data;
+    const { selectedContainer, tailLines, previous } = data;
     const pod = new Pod(data.pod);
     try {
       // if logs already loaded, check the latest timestamp for getting updates only from this point
@@ -64,14 +65,15 @@ export class PodLogsStore extends DockTabStore<IPodLogsData> {
         sinceTime: lastLogDate.toISOString(),
         timestamps: true,  // Always setting timestampt to separate old logs from new ones
         container: selectedContainer.name,
-        tailLines: tailLines,
+        tailLines,
+        previous
       });
       if (!oldLogs) {
         this.logs.set(tabId, { oldLogs: loadedLogs, newLogs });
       } else {
         this.logs.set(tabId, { oldLogs, newLogs: loadedLogs });
       }
-    } catch (error) {
+    } catch ({error}) {
       this.logs.set(tabId, {
         oldLogs: [
           _i18n._(t`Failed to load logs: ${error.message}`),
diff --git a/src/renderer/components/dock/pod-logs.tsx b/src/renderer/components/dock/pod-logs.tsx
index 6f97163bde..06643bc711 100644
--- a/src/renderer/components/dock/pod-logs.tsx
+++ b/src/renderer/components/dock/pod-logs.tsx
@@ -94,6 +94,11 @@ export class PodLogs extends React.Component<Props> {
     this.save({ showTimestamps: !this.tabData.showTimestamps });
   }
 
+  togglePrevious = () => {
+    this.save({ previous: !this.tabData.previous });
+    this.reload();
+  }
+
   onScroll = (evt: React.UIEvent<HTMLDivElement>) => {
     const logsArea = evt.currentTarget;
     const { scrollHeight, clientHeight, scrollTop } = logsArea;
@@ -148,7 +153,7 @@ export class PodLogs extends React.Component<Props> {
 
   renderControls() {
     if (!this.ready) return null;
-    const { selectedContainer, showTimestamps, tailLines } = this.tabData;
+    const { selectedContainer, showTimestamps, tailLines, previous } = this.tabData;
     const timestamps = podLogsStore.getTimestamps(podLogsStore.logs.get(this.tabId).oldLogs);
     return (
       <div className="controls flex gaps align-center">
@@ -181,6 +186,12 @@ export class PodLogs extends React.Component<Props> {
             className={cssNames("timestamps-icon", { active: showTimestamps })}
             tooltip={(showTimestamps ? _i18n._(t`Hide`) : _i18n._(t`Show`)) + " " + _i18n._(t`timestamps`)}
           />
+          <Icon
+            material="undo"
+            onClick={this.togglePrevious}
+            className={cssNames("undo-icon", { active: previous })}
+            tooltip={(previous ? _i18n._(t`Show current logs`) : _i18n._(t`Show previous terminated container logs`))}
+          />
           <Icon
             material="get_app"
             onClick={this.downloadLogs}

From 38796e582beb0a90e7f85426182db3f127ee5f27 Mon Sep 17 00:00:00 2001
From: Lauri Nevala <lauri.nevala@gmail.com>
Date: Wed, 14 Oct 2020 14:26:09 +0300
Subject: [PATCH 2/7] Fix integration test teardown (#1082)

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
---
 integration/helpers/utils.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/integration/helpers/utils.ts b/integration/helpers/utils.ts
index 55395f84e3..92e9ade7af 100644
--- a/integration/helpers/utils.ts
+++ b/integration/helpers/utils.ts
@@ -21,10 +21,11 @@ export function setup(): Application {
 }
 
 export async function tearDown(app: Application) {
-  const pid = app.mainProcess.pid
+  let mpid: any = app.mainProcess.pid
+  let pid = await mpid()
   await app.stop()
   try {
-    process.kill(pid, 0);
+    process.kill(pid, "SIGKILL");
   } catch (e) {
     return
   }

From db9af88d91ee2a9d0299bcfb97d51ad4677a5621 Mon Sep 17 00:00:00 2001
From: steve richards <steve.james.richards@gmail.com>
Date: Wed, 14 Oct 2020 12:34:04 +0100
Subject: [PATCH 3/7] Updated regex for isUrl to allow for an empty string
 (#1049)

Updated regex for isUrl to allow for an empty string aswell as a correct URL.

Signed-off-by: Steve Richards <srichards@mirantis.com>

Co-authored-by: Steve Richards <srichards@mirantis.com>
---
 src/renderer/components/input/input_validators.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/input/input_validators.ts b/src/renderer/components/input/input_validators.ts
index 611394134f..b11dbfa1da 100644
--- a/src/renderer/components/input/input_validators.ts
+++ b/src/renderer/components/input/input_validators.ts
@@ -39,7 +39,7 @@ export const isNumber: Validator = {
 export const isUrl: Validator = {
   condition: ({ type }) => type === "url",
   message: () => _i18n._(t`Wrong url format`),
-  validate: value => !!value.match(/^http(s)?:\/\/\w+(\.\w+)*(:[0-9]+)?\/?(\/[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]*)*$/),
+  validate: value => !!value.match(/^$|^http(s)?:\/\/\w+(\.\w+)*(:[0-9]+)?\/?(\/[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]*)*$/),
 };
 
 export const isPath: Validator = {

From 78f6f8ef54718c23dc409ba287c5e27891ddb458 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Wed, 14 Oct 2020 14:35:33 +0300
Subject: [PATCH 4/7] Fix bundled kubectl path on dev env (#981)

* fix bundled kubectl path on dev env

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* fix specs

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/main/kube-auth-proxy.ts                   |  4 +--
 src/main/kubectl.ts                           | 36 ++++++++++---------
 src/main/kubectl_spec.ts                      |  8 ++---
 src/main/routes/port-forward-route.ts         |  4 +--
 src/main/shell-session.ts                     |  2 +-
 .../+preferences/kubectl-binaries.tsx         |  4 +--
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/main/kube-auth-proxy.ts b/src/main/kube-auth-proxy.ts
index 33521fdcf5..7192425466 100644
--- a/src/main/kube-auth-proxy.ts
+++ b/src/main/kube-auth-proxy.ts
@@ -2,7 +2,7 @@ import { ChildProcess, spawn } from "child_process"
 import { waitUntilUsed } from "tcp-port-used";
 import { broadcastIpc } from "../common/ipc";
 import type { Cluster } from "./cluster"
-import { bundledKubectl, Kubectl } from "./kubectl"
+import { Kubectl } from "./kubectl"
 import logger from "./logger"
 
 export interface KubeAuthProxyLog {
@@ -23,7 +23,7 @@ export class KubeAuthProxy {
     this.env = env
     this.port = port
     this.cluster = cluster
-    this.kubectl = bundledKubectl
+    this.kubectl = Kubectl.bundled()
   }
 
   public async run(): Promise<void> {
diff --git a/src/main/kubectl.ts b/src/main/kubectl.ts
index 672d93cf65..6b2f51476d 100644
--- a/src/main/kubectl.ts
+++ b/src/main/kubectl.ts
@@ -36,15 +36,21 @@ const packageMirrors: Map<string, string> = new Map([
 let bundledPath: string
 const initScriptVersionString = "# lens-initscript v3\n"
 
-if (isDevelopment || isTestEnv) {
-  const platformName = isWindows ? "windows" : process.platform
-  bundledPath = path.join(process.cwd(), "binaries", "client", platformName, process.arch, "kubectl")
-} else {
-  bundledPath = path.join(process.resourcesPath, process.arch, "kubectl")
-}
+export function bundledKubectlPath(): string {
+  if (bundledPath) { return bundledPath }
 
-if (isWindows) {
-  bundledPath = `${bundledPath}.exe`
+  if (isDevelopment || isTestEnv) {
+    const platformName = isWindows ? "windows" : process.platform
+    bundledPath = path.join(process.cwd(), "binaries", "client", platformName, process.arch, "kubectl")
+  } else {
+    bundledPath = path.join(process.resourcesPath, process.arch, "kubectl")
+  }
+
+  if (isWindows) {
+    bundledPath = `${bundledPath}.exe`
+  }
+
+  return bundledPath
 }
 
 export class Kubectl {
@@ -58,7 +64,6 @@ export class Kubectl {
     return path.join((app || remote.app).getPath("userData"), "binaries", "kubectl")
   }
 
-  public static readonly bundledKubectlPath = bundledPath
   public static readonly bundledKubectlVersion: string = bundledVersion
   public static invalidBundle = false
   private static bundledInstance: Kubectl;
@@ -102,7 +107,7 @@ export class Kubectl {
   }
 
   public getBundledPath() {
-    return Kubectl.bundledKubectlPath
+    return bundledKubectlPath()
   }
 
   public getPathFromPreferences() {
@@ -125,19 +130,19 @@ export class Kubectl {
     // return binary name if bundled path is not functional
     if (!await this.checkBinary(this.getBundledPath(), false)) {
       Kubectl.invalidBundle = true
-      return path.basename(bundledPath)
+      return path.basename(this.getBundledPath())
     }
 
     try {
       if (!await this.ensureKubectl()) {
         logger.error("Failed to ensure kubectl, fallback to the bundled version")
-        return Kubectl.bundledKubectlPath
+        return this.getBundledPath()
       }
       return this.path
     } catch (err) {
       logger.error("Failed to ensure kubectl, fallback to the bundled version")
       logger.error(err)
-      return Kubectl.bundledKubectlPath
+      return this.getBundledPath()
     }
   }
 
@@ -183,7 +188,7 @@ export class Kubectl {
       try {
         const exist = await pathExists(this.path)
         if (!exist) {
-          await fs.promises.copyFile(Kubectl.bundledKubectlPath, this.path)
+          await fs.promises.copyFile(this.getBundledPath(), this.path)
           await fs.promises.chmod(this.path, 0o755)
         }
         return true
@@ -332,6 +337,3 @@ export class Kubectl {
     return packageMirrors.get("default") // MacOS packages are only available from default
   }
 }
-
-const bundledKubectl = Kubectl.bundled()
-export { bundledKubectl }
diff --git a/src/main/kubectl_spec.ts b/src/main/kubectl_spec.ts
index 4e5cdbf986..ade999c082 100644
--- a/src/main/kubectl_spec.ts
+++ b/src/main/kubectl_spec.ts
@@ -1,20 +1,20 @@
 import packageInfo from "../../package.json"
 import path from "path"
-import { bundledKubectl, Kubectl } from "../../src/main/kubectl";
+import { Kubectl } from "../../src/main/kubectl";
 import { isWindows } from "../common/vars";
 
 jest.mock("../common/user-store");
 
 describe("kubectlVersion", () => {
   it("returns bundled version if exactly same version used", async () => {
-    const kubectl = new Kubectl(bundledKubectl.kubectlVersion)
-    expect(kubectl.kubectlVersion).toBe(bundledKubectl.kubectlVersion)
+    const kubectl = new Kubectl(Kubectl.bundled().kubectlVersion)
+    expect(kubectl.kubectlVersion).toBe(Kubectl.bundled().kubectlVersion)
   })
 
   it("returns bundled version if same major.minor version is used", async () => {
     const { bundledKubectlVersion } = packageInfo.config;
     const kubectl = new Kubectl(bundledKubectlVersion);
-    expect(kubectl.kubectlVersion).toBe(bundledKubectl.kubectlVersion)
+    expect(kubectl.kubectlVersion).toBe(Kubectl.bundled().kubectlVersion)
   })
 })
 
diff --git a/src/main/routes/port-forward-route.ts b/src/main/routes/port-forward-route.ts
index 3f1a855902..7ed79aa936 100644
--- a/src/main/routes/port-forward-route.ts
+++ b/src/main/routes/port-forward-route.ts
@@ -1,7 +1,7 @@
 import { LensApiRequest } from "../router"
 import { LensApi } from "../lens-api"
 import { spawn, ChildProcessWithoutNullStreams } from "child_process"
-import { bundledKubectl } from "../kubectl"
+import { Kubectl } from "../kubectl"
 import { getFreePort } from "../port"
 import { shell } from "electron"
 import * as tcpPortUsed from "tcp-port-used"
@@ -37,7 +37,7 @@ class PortForward {
 
   public async start() {
     this.localPort = await getFreePort()
-    const kubectlBin = await bundledKubectl.getPath()
+    const kubectlBin = await Kubectl.bundled().getPath()
     const args = [
       "--kubeconfig", this.kubeConfig,
       "port-forward",
diff --git a/src/main/shell-session.ts b/src/main/shell-session.ts
index 962074c803..2367bb63c0 100644
--- a/src/main/shell-session.ts
+++ b/src/main/shell-session.ts
@@ -38,7 +38,7 @@ export class ShellSession extends EventEmitter {
 
   public async open() {
     this.kubectlBinDir = await this.kubectl.binDir()
-    const pathFromPreferences = userStore.preferences.kubectlBinariesPath || Kubectl.bundledKubectlPath
+    const pathFromPreferences = userStore.preferences.kubectlBinariesPath || this.kubectl.getBundledPath()
     this.kubectlPathDir = userStore.preferences.downloadKubectlBinaries ? this.kubectlBinDir : path.dirname(pathFromPreferences)
     this.helmBinDir = helmCli.getBinaryDir()
     const env = await this.getCachedShellEnv()
diff --git a/src/renderer/components/+preferences/kubectl-binaries.tsx b/src/renderer/components/+preferences/kubectl-binaries.tsx
index 06c4f3ec83..002ddfdcc3 100644
--- a/src/renderer/components/+preferences/kubectl-binaries.tsx
+++ b/src/renderer/components/+preferences/kubectl-binaries.tsx
@@ -6,7 +6,7 @@ import { Input } from '../input';
 import { SubTitle } from '../layout/sub-title';
 import { UserPreferences, userStore } from '../../../common/user-store';
 import { observer } from 'mobx-react';
-import { Kubectl } from '../../../main/kubectl';
+import { bundledKubectlPath } from '../../../main/kubectl';
 import { SelectOption, Select } from '../select';
 
 export const KubectlBinaries = observer(({ preferences }: { preferences: UserPreferences }) => {
@@ -58,7 +58,7 @@ export const KubectlBinaries = observer(({ preferences }: { preferences: UserPre
       <SubTitle title="Path to Kubectl binary" />
       <Input
         theme="round-black"
-        placeholder={Kubectl.bundledKubectlPath}
+        placeholder={bundledKubectlPath()}
         value={binariesPath}
         validators={isPath}
         onChange={setBinariesPath}

From 770c6b80f154e3234cbaa6eee121404fbe0d4732 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 14 Oct 2020 07:36:19 -0400
Subject: [PATCH 5/7] move autobind and debouncePromise to common/utils (#1081)

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/{renderer => common}/utils/autobind.ts |  0
 src/common/utils/debouncePromise.ts        |  9 +++++++
 src/common/utils/index.ts                  | 13 ++++++---
 src/renderer/api/api-manager.ts            |  2 +-
 src/renderer/components/dock/terminal.ts   |  2 +-
 src/renderer/theme.store.ts                |  2 +-
 src/renderer/utils/debouncePromise.ts      |  9 -------
 src/renderer/utils/index.ts                | 31 ++++++++++------------
 8 files changed, 36 insertions(+), 32 deletions(-)
 rename src/{renderer => common}/utils/autobind.ts (100%)
 create mode 100755 src/common/utils/debouncePromise.ts
 delete mode 100755 src/renderer/utils/debouncePromise.ts

diff --git a/src/renderer/utils/autobind.ts b/src/common/utils/autobind.ts
similarity index 100%
rename from src/renderer/utils/autobind.ts
rename to src/common/utils/autobind.ts
diff --git a/src/common/utils/debouncePromise.ts b/src/common/utils/debouncePromise.ts
new file mode 100755
index 0000000000..22ffd5217f
--- /dev/null
+++ b/src/common/utils/debouncePromise.ts
@@ -0,0 +1,9 @@
+// Debouncing promise evaluation
+
+export function debouncePromise<T, F extends any[]>(func: (...args: F) => T | Promise<T>, timeout = 0): (...args: F) => Promise<T> {
+  let timer: NodeJS.Timeout;
+  return (...params: any[]) => new Promise((resolve, reject) => {
+    clearTimeout(timer);
+    timer = setTimeout(() => resolve(func.apply(this, params)), timeout);
+  });
+}
diff --git a/src/common/utils/index.ts b/src/common/utils/index.ts
index 580a8f15c2..db46a37d97 100644
--- a/src/common/utils/index.ts
+++ b/src/common/utils/index.ts
@@ -1,7 +1,14 @@
-// Common utils (main/renderer)
+// Common utils (main OR renderer)
 
+export * from "./app-version"
+export * from "./autobind"
 export * from "./base64"
 export * from "./camelCase"
-export * from "./splitArray"
-export * from "./getRandId"
+export * from "./cloneJson"
+export * from "./debouncePromise"
+export * from "./defineGlobal"
+export * from "./getRandId"
+export * from "./splitArray"
+export * from "./saveToAppFiles"
+export * from "./singleton"
 export * from "./cloneJson"
diff --git a/src/renderer/api/api-manager.ts b/src/renderer/api/api-manager.ts
index 22735c3c09..e4a5432965 100644
--- a/src/renderer/api/api-manager.ts
+++ b/src/renderer/api/api-manager.ts
@@ -3,7 +3,7 @@ import type { KubeObjectDetailsProps, KubeObjectListLayoutProps, KubeObjectMenuP
 import type React from "react";
 
 import { observable } from "mobx";
-import { autobind } from "../utils/autobind";
+import { autobind } from "../utils";
 import { KubeApi } from "./kube-api";
 
 export interface ApiComponents {
diff --git a/src/renderer/components/dock/terminal.ts b/src/renderer/components/dock/terminal.ts
index cea1e91292..e508cc22b2 100644
--- a/src/renderer/components/dock/terminal.ts
+++ b/src/renderer/components/dock/terminal.ts
@@ -5,7 +5,7 @@ import { FitAddon } from "xterm-addon-fit";
 import { dockStore, TabId } from "./dock.store";
 import { TerminalApi } from "../../api/terminal-api";
 import { themeStore } from "../../theme.store";
-import { autobind } from "../../utils/autobind";
+import { autobind } from "../../utils";
 
 export class Terminal {
   static spawningPool: HTMLElement;
diff --git a/src/renderer/theme.store.ts b/src/renderer/theme.store.ts
index 5245d2a728..539be6651d 100644
--- a/src/renderer/theme.store.ts
+++ b/src/renderer/theme.store.ts
@@ -1,5 +1,5 @@
 import { computed, observable, reaction } from "mobx";
-import { autobind } from "./utils/autobind";
+import { autobind } from "./utils";
 import { userStore } from "../common/user-store";
 import logger from "../main/logger";
 
diff --git a/src/renderer/utils/debouncePromise.ts b/src/renderer/utils/debouncePromise.ts
deleted file mode 100755
index 4ce949a944..0000000000
--- a/src/renderer/utils/debouncePromise.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Debouncing promise evaluation
-
-export const debouncePromise = function (promisedFunc: Function, timeout = 0) {
-  let timer: number;
-  return (...params: any[]) => new Promise((resolve, reject) => {
-    clearTimeout(timer);
-    timer = window.setTimeout(() => resolve(promisedFunc.apply(this, params)), timeout);
-  });
-};
diff --git a/src/renderer/utils/index.ts b/src/renderer/utils/index.ts
index 578ec5c355..4ae9b068a7 100755
--- a/src/renderer/utils/index.ts
+++ b/src/renderer/utils/index.ts
@@ -3,21 +3,18 @@
 export const noop: any = Function();
 export const isElectron = !!navigator.userAgent.match(/Electron/);
 
-export * from '../../common/utils/camelCase'
-export * from '../../common/utils/base64'
+export * from "../../common/utils"
 
-export * from './autobind'
-export * from './cssVar'
-export * from './cssNames'
-export * from './eventEmitter'
-export * from './downloadFile'
-export * from './prevDefault'
-export * from './createStorage'
-export * from './interval'
-export * from './debouncePromise'
-export * from './copyToClipboard'
-export * from './formatDuration'
-export * from './isReactNode'
-export * from './convertMemory'
-export * from './convertCpu'
-export * from './metricUnitsToNumber'
+export * from "./cssVar"
+export * from "./cssNames"
+export * from "./eventEmitter"
+export * from "./downloadFile"
+export * from "./prevDefault"
+export * from "./createStorage"
+export * from "./interval"
+export * from "./copyToClipboard"
+export * from "./formatDuration"
+export * from "./isReactNode"
+export * from "./convertMemory"
+export * from "./convertCpu"
+export * from "./metricUnitsToNumber"

From 81575b333a49c58dc1b92a2cabec83961c5ce580 Mon Sep 17 00:00:00 2001
From: Lauri Nevala <lauri.nevala@gmail.com>
Date: Wed, 14 Oct 2020 17:10:58 +0300
Subject: [PATCH 6/7] Fix KubeAuthProxy unit tests (#1084)

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
---
 src/main/__test__/kube-auth-proxy.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts
index 48f430b7c5..e7bee67c07 100644
--- a/src/main/__test__/kube-auth-proxy.test.ts
+++ b/src/main/__test__/kube-auth-proxy.test.ts
@@ -32,7 +32,7 @@ import { KubeAuthProxy } from "../kube-auth-proxy"
 import { getFreePort } from "../port"
 import { broadcastIpc } from "../../common/ipc"
 import { ChildProcess, spawn, SpawnOptions } from "child_process"
-import { Kubectl } from "../kubectl"
+import { bundledKubectlPath, Kubectl } from "../kubectl"
 import { mock, MockProxy } from 'jest-mock-extended';
 import { waitUntilUsed } from 'tcp-port-used';
 import { Readable } from "stream"
@@ -81,7 +81,7 @@ describe("kube auth proxy tests", () => {
         return mockedCP.stdout
       })
       mockSpawn.mockImplementationOnce((command: string, args: readonly string[], options: SpawnOptions): ChildProcess => {
-        expect(command).toBe(Kubectl.bundledKubectlPath)
+        expect(command).toBe(bundledKubectlPath())
         return mockedCP
       })
       mockWaitUntilUsed.mockReturnValueOnce(Promise.resolve())

From 087ebf6aecf76974136e95faf3b934c181761fcd Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 14 Oct 2020 12:44:16 -0400
Subject: [PATCH 7/7] extract internationalizations (#1086)

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 locales/en/messages.po | 116 +++++++++++++++++++++++------------------
 locales/fi/messages.po | 116 +++++++++++++++++++++++------------------
 locales/ru/messages.po | 116 +++++++++++++++++++++++------------------
 3 files changed, 192 insertions(+), 156 deletions(-)

diff --git a/locales/en/messages.po b/locales/en/messages.po
index 86f99a841f..2b3980ed5c 100644
--- a/locales/en/messages.po
+++ b/locales/en/messages.po
@@ -87,7 +87,7 @@ msgstr "Account Name"
 msgid "Active"
 msgstr "Active"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:289
+#: src/renderer/components/+add-cluster/add-cluster.tsx:310
 #: src/renderer/components/cluster-manager/clusters-menu.tsx:130
 msgid "Add Cluster"
 msgstr "Add Cluster"
@@ -112,7 +112,7 @@ msgstr "Add bindings to {name}"
 #~ msgid "Add cluster"
 #~ msgstr "Add cluster"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:306
+#: src/renderer/components/+add-cluster/add-cluster.tsx:327
 msgid "Add cluster(s)"
 msgstr "Add cluster(s)"
 
@@ -203,7 +203,7 @@ msgstr "All clusters within workspace will be cleared as well"
 msgid "All groups"
 msgstr "All groups"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57
+#: src/renderer/components/dock/pod-logs.tsx:37
 msgid "All logs"
 msgstr "All logs"
 
@@ -323,7 +323,7 @@ msgstr "Binding targets"
 msgid "Bindings"
 msgstr "Bindings"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:236
+#: src/renderer/components/+add-cluster/add-cluster.tsx:257
 msgid "Browse"
 msgstr "Browse"
 
@@ -404,7 +404,7 @@ msgstr "CPU:"
 
 #: src/renderer/components/+workspaces/workspaces.tsx:133
 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44
-#: src/renderer/components/dock/info-panel.tsx:85
+#: src/renderer/components/dock/info-panel.tsx:86
 #: src/renderer/components/wizard/wizard.tsx:130
 msgid "Cancel"
 msgstr "Cancel"
@@ -473,7 +473,6 @@ msgstr "Claim"
 msgid "Claim Name"
 msgstr "Claim Name"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243
 #: src/renderer/components/dialog/logs-dialog.tsx:39
 #: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93
 msgid "Close"
@@ -566,7 +565,7 @@ msgstr "Configuration"
 msgid "Connection"
 msgstr "Connection"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246
+#: src/renderer/components/dock/pod-logs.tsx:148
 msgid "Container"
 msgstr "Container"
 
@@ -595,8 +594,8 @@ msgid "Container runtime"
 msgstr "Container runtime"
 
 #: src/renderer/components/+workloads-pods/pod-details.tsx:122
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186
 #: src/renderer/components/+workloads-pods/pods.tsx:77
+#: src/renderer/components/dock/pod-logs.tsx:129
 msgid "Containers"
 msgstr "Containers"
 
@@ -691,7 +690,7 @@ msgstr "Create new Secret"
 msgid "Create new Service Account"
 msgstr "Create new Service Account"
 
-#: src/renderer/components/dock/dock.tsx:93
+#: src/renderer/components/dock/dock.tsx:99
 msgid "Create resource"
 msgstr "Create resource"
 
@@ -928,7 +927,8 @@ msgstr "Environment"
 msgid "Error stack"
 msgstr "Error stack"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:109
+#: src/renderer/components/+add-cluster/add-cluster.tsx:89
+#: src/renderer/components/+add-cluster/add-cluster.tsx:130
 msgid "Error while adding cluster(s): {0}"
 msgstr "Error while adding cluster(s): {0}"
 
@@ -948,7 +948,7 @@ msgstr "Everything is fine in the Cluster"
 #~ msgid "Excluded items with \"system:\" prefix"
 #~ msgstr "Excluded items with \"system:\" prefix"
 
-#: src/renderer/components/dock/dock.tsx:98
+#: src/renderer/components/dock/dock.tsx:104
 msgid "Exit full size mode"
 msgstr "Exit full size mode"
 
@@ -964,7 +964,7 @@ msgstr "External IP"
 msgid "External IPs"
 msgstr "External IPs"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106
+#: src/renderer/components/dock/pod-logs.store.ts:65
 msgid "Failed to load logs: {0}"
 msgstr "Failed to load logs: {0}"
 
@@ -989,7 +989,7 @@ msgstr "Finalizers"
 msgid "First seen"
 msgstr "First seen"
 
-#: src/renderer/components/dock/dock.tsx:98
+#: src/renderer/components/dock/dock.tsx:104
 msgid "Fit to window"
 msgstr "Fit to window"
 
@@ -1006,8 +1006,8 @@ msgid "From"
 msgstr "From"
 
 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212
-msgid "From <0>{from}</0> to <1>{to}</1>"
-msgstr "From <0>{from}</0> to <1>{to}</1>"
+#~ msgid "From <0>{from}</0> to <1>{to}</1>"
+#~ msgstr "From <0>{from}</0> to <1>{to}</1>"
 
 #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:125
 msgid "Fs Group"
@@ -1068,7 +1068,7 @@ msgid "Helm branch <0>{0}</0> already in use"
 msgstr "Helm branch <0>{0}</0> already in use"
 
 #: src/renderer/components/+config-secrets/secret-details.tsx:93
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19
 msgid "Hide"
 msgstr "Hide"
@@ -1153,7 +1153,7 @@ msgid "Ingresses"
 msgstr "Ingresses"
 
 #: src/renderer/components/+workloads-pods/pod-details.tsx:118
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192
+#: src/renderer/components/dock/pod-logs.tsx:135
 msgid "Init Containers"
 msgstr "Init Containers"
 
@@ -1314,7 +1314,7 @@ msgstr "Limited to {0}"
 msgid "Limits"
 msgstr "Limits"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248
+#: src/renderer/components/dock/pod-logs.tsx:150
 msgid "Lines"
 msgstr "Lines"
 
@@ -1338,8 +1338,8 @@ msgstr "Load-Balancer Ingress Points"
 msgid "Loading"
 msgstr "Loading"
 
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:90
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:91
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:100
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:101
 msgid "Logs"
 msgstr "Logs"
 
@@ -1445,7 +1445,7 @@ msgstr "Min Available"
 msgid "Min Pods"
 msgstr "Min Pods"
 
-#: src/renderer/components/dock/dock.tsx:99
+#: src/renderer/components/dock/dock.tsx:105
 msgid "Minimize"
 msgstr "Minimize"
 
@@ -1600,11 +1600,11 @@ msgstr "Network File System"
 msgid "Network Policies"
 msgstr "Network Policies"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231
+#: src/renderer/components/dock/pod-logs.tsx:178
 msgid "New logs since opening the dialog"
 msgstr "New logs since opening the dialog"
 
-#: src/renderer/components/dock/dock.tsx:86
+#: src/renderer/components/dock/dock.tsx:92
 msgid "New tab"
 msgstr "New tab"
 
@@ -1642,7 +1642,7 @@ msgstr "No Nodes Available."
 #~ msgid "No contexts available or they already added"
 #~ msgstr "No contexts available or they already added"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:260
+#: src/renderer/components/+add-cluster/add-cluster.tsx:281
 msgid "No contexts available or they have been added already"
 msgstr "No contexts available or they have been added already"
 
@@ -1738,7 +1738,7 @@ msgstr "Ok"
 msgid "Ok, got it!"
 msgstr "Ok, got it!"
 
-#: src/renderer/components/dock/dock.tsx:99
+#: src/renderer/components/dock/dock.tsx:105
 msgid "Open"
 msgstr "Open"
 
@@ -1774,7 +1774,7 @@ msgstr "Parallelism"
 msgid "Parameters"
 msgstr "Parameters"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:230
+#: src/renderer/components/+add-cluster/add-cluster.tsx:251
 msgid "Paste as text"
 msgstr "Paste as text"
 
@@ -1798,7 +1798,7 @@ msgstr "Persistent Volume Claims"
 msgid "Persistent Volumes"
 msgstr "Persistent Volumes"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:72
+#: src/renderer/components/+add-cluster/add-cluster.tsx:75
 msgid "Please select at least one cluster context"
 msgstr "Please select at least one cluster context"
 
@@ -1851,7 +1851,7 @@ msgstr "Pod Selector"
 msgid "Pod Status"
 msgstr "Pod Status"
 
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:67
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:77
 msgid "Pod shell"
 msgstr "Pod shell"
 
@@ -1914,7 +1914,7 @@ msgstr "Privileged"
 #~ msgid "Pro-Tip: paste kubeconfig to collect available contexts"
 #~ msgstr "Pro-Tip: paste kubeconfig to collect available contexts"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:248
+#: src/renderer/components/+add-cluster/add-cluster.tsx:269
 msgid "Pro-Tip: paste kubeconfig to get available contexts"
 msgstr "Pro-Tip: paste kubeconfig to get available contexts"
 
@@ -1922,7 +1922,7 @@ msgstr "Pro-Tip: paste kubeconfig to get available contexts"
 #~ msgid "Pro-Tip: paste kubeconfig to parse available contexts"
 #~ msgstr "Pro-Tip: paste kubeconfig to parse available contexts"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:239
+#: src/renderer/components/+add-cluster/add-cluster.tsx:260
 msgid "Pro-Tip: you can also drag-n-drop kubeconfig file to this area"
 msgstr "Pro-Tip: you can also drag-n-drop kubeconfig file to this area"
 
@@ -1943,7 +1943,7 @@ msgstr "Provisioner"
 msgid "Proxy is used only for non-cluster communication."
 msgstr "Proxy is used only for non-cluster communication."
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:294
+#: src/renderer/components/+add-cluster/add-cluster.tsx:315
 msgid "Proxy settings"
 msgstr "Proxy settings"
 
@@ -1979,7 +1979,7 @@ msgstr "Readiness"
 msgid "Reason"
 msgstr "Reason"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107
+#: src/renderer/components/dock/pod-logs.store.ts:66
 msgid "Reason: {0} ({1})"
 msgstr "Reason: {0} ({1})"
 
@@ -2124,7 +2124,7 @@ msgstr "Required Drop Capabilities"
 msgid "Required field"
 msgstr "Required field"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:235
+#: src/renderer/components/+add-cluster/add-cluster.tsx:256
 #: src/renderer/components/item-object-list/page-filters-list.tsx:31
 msgid "Reset"
 msgstr "Reset"
@@ -2266,9 +2266,9 @@ msgstr "Runtime Class"
 #: src/renderer/components/+apps-releases/release-details.tsx:114
 #: src/renderer/components/+config-maps/config-map-details.tsx:78
 #: src/renderer/components/+config-secrets/secret-details.tsx:97
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216
 #: src/renderer/components/+workspaces/workspaces.tsx:132
 #: src/renderer/components/dock/edit-resource.tsx:87
+#: src/renderer/components/dock/pod-logs.tsx:161
 msgid "Save"
 msgstr "Save"
 
@@ -2360,7 +2360,7 @@ msgstr "Select a quota.."
 #~ msgid "Select context(s)"
 #~ msgstr "Select context(s)"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:257
+#: src/renderer/components/+add-cluster/add-cluster.tsx:278
 msgid "Select contexts"
 msgstr "Select contexts"
 
@@ -2373,8 +2373,8 @@ msgstr "Select contexts"
 #~ msgid "Select custom kube-config file"
 #~ msgstr "Select custom kube-config file"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:62
-#: src/renderer/components/+add-cluster/add-cluster.tsx:62
+#: src/renderer/components/+add-cluster/add-cluster.tsx:63
+#: src/renderer/components/+add-cluster/add-cluster.tsx:63
 msgid "Select custom kubeconfig file"
 msgstr "Select custom kubeconfig file"
 
@@ -2390,7 +2390,7 @@ msgstr "Select custom kubeconfig file"
 #~ msgid "Select kubeconfig"
 #~ msgstr "Select kubeconfig"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:229
+#: src/renderer/components/+add-cluster/add-cluster.tsx:250
 msgid "Select kubeconfig file"
 msgstr "Select kubeconfig file"
 
@@ -2418,7 +2418,7 @@ msgstr "Select service accounts"
 #~ msgid "Selected contexts ({0}): <0>{1}</0>"
 #~ msgstr "Selected contexts ({0}): <0>{1}</0>"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:256
+#: src/renderer/components/+add-cluster/add-cluster.tsx:277
 msgid "Selected contexts: <0>{0}</0>"
 msgstr "Selected contexts: <0>{0}</0>"
 
@@ -2475,13 +2475,13 @@ msgid "Settings"
 msgstr "Settings"
 
 #: src/renderer/components/+nodes/node-menu.tsx:48
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:68
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:78
 msgid "Shell"
 msgstr "Shell"
 
 #: src/renderer/components/+config-secrets/secret-details.tsx:93
 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:101
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19
 msgid "Show"
 msgstr "Show"
@@ -2490,10 +2490,22 @@ msgstr "Show"
 msgid "Show Notes"
 msgstr "Show Notes"
 
+#: src/renderer/components/dock/pod-logs.tsx:160
+msgid "Show current logs"
+msgstr "Show current logs"
+
+#: src/renderer/components/dock/pod-logs.tsx:160
+msgid "Show previous terminated container logs"
+msgstr "Show previous terminated container logs"
+
 #: src/renderer/components/+user-management-service-accounts/service-accounts-secret.tsx:20
 msgid "Show value"
 msgstr "Show value"
 
+#: src/renderer/components/dock/pod-logs.tsx:154
+msgid "Since"
+msgstr "Since"
+
 #: src/renderer/components/+nodes/node-charts.tsx:80
 #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:49
 msgid "Size"
@@ -2588,12 +2600,12 @@ msgstr "Strategy Type"
 msgid "Sub-object"
 msgstr "Sub-object"
 
-#: src/renderer/components/dock/info-panel.tsx:93
+#: src/renderer/components/dock/info-panel.tsx:95
 #: src/renderer/components/wizard/wizard.tsx:131
 msgid "Submit"
 msgstr "Submit"
 
-#: src/renderer/components/dock/info-panel.tsx:94
+#: src/renderer/components/dock/info-panel.tsx:96
 msgid "Submitting.."
 msgstr "Submitting.."
 
@@ -2601,7 +2613,7 @@ msgstr "Submitting.."
 msgid "Subsets"
 msgstr "Subsets"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:102
+#: src/renderer/components/+add-cluster/add-cluster.tsx:122
 msgid "Successfully imported <0>{0}</0> cluster(s)"
 msgstr "Successfully imported <0>{0}</0> cluster(s)"
 
@@ -2635,7 +2647,7 @@ msgstr "Telemetry & usage data is collected to continuously improve the Lens exp
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/renderer/components/dock/dock.tsx:89
+#: src/renderer/components/dock/dock.tsx:95
 msgid "Terminal session"
 msgstr "Terminal session"
 
@@ -2643,7 +2655,7 @@ msgstr "Terminal session"
 msgid "The path to the kubectl binary on the system."
 msgstr "The path to the kubectl binary on the system."
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226
+#: src/renderer/components/dock/pod-logs.tsx:172
 msgid "There are no logs available for container."
 msgstr "There are no logs available for container."
 
@@ -2773,8 +2785,8 @@ msgstr "Upgrade version"
 msgid "Usage"
 msgstr "Usage"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:63
-#: src/renderer/components/+add-cluster/add-cluster.tsx:63
+#: src/renderer/components/+add-cluster/add-cluster.tsx:64
+#: src/renderer/components/+add-cluster/add-cluster.tsx:64
 msgid "Use configuration"
 msgstr "Use configuration"
 
@@ -2961,7 +2973,7 @@ msgstr "sec"
 msgid "singular"
 msgstr "singular"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 msgid "timestamps"
 msgstr "timestamps"
 
@@ -3006,8 +3018,8 @@ msgid "{metricsRemainCount} more..."
 msgstr "{metricsRemainCount} more..."
 
 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240
-msgid "{podName} Logs"
-msgstr "{podName} Logs"
+#~ msgid "{podName} Logs"
+#~ msgstr "{podName} Logs"
 
 #: src/renderer/components/dock/edit-resource.tsx:56
 msgid "{resourceType} <0>{resourceName}</0> updated."
@@ -3017,6 +3029,6 @@ msgstr "{resourceType} <0>{resourceName}</0> updated."
 msgid "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}</1>?</0>} other {<2>Remove <3>{selectedCount}</3> items <4>{selectedNames}</4> {tail}?</2>}}"
 msgstr "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}</1>?</0>} other {<2>Remove <3>{selectedCount}</3> items <4>{selectedNames}</4> {tail}?</2>}}"
 
-#: src/renderer/components/dock/info-panel.tsx:88
+#: src/renderer/components/dock/info-panel.tsx:89
 msgid "{submitLabel} & Close"
 msgstr "{submitLabel} & Close"
diff --git a/locales/fi/messages.po b/locales/fi/messages.po
index 1b53f1bffa..613e68b6fe 100644
--- a/locales/fi/messages.po
+++ b/locales/fi/messages.po
@@ -87,7 +87,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:289
+#: src/renderer/components/+add-cluster/add-cluster.tsx:310
 #: src/renderer/components/cluster-manager/clusters-menu.tsx:130
 msgid "Add Cluster"
 msgstr ""
@@ -112,7 +112,7 @@ msgstr ""
 #~ msgid "Add cluster"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:306
+#: src/renderer/components/+add-cluster/add-cluster.tsx:327
 msgid "Add cluster(s)"
 msgstr ""
 
@@ -203,7 +203,7 @@ msgstr ""
 msgid "All groups"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57
+#: src/renderer/components/dock/pod-logs.tsx:37
 msgid "All logs"
 msgstr ""
 
@@ -323,7 +323,7 @@ msgstr ""
 msgid "Bindings"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:236
+#: src/renderer/components/+add-cluster/add-cluster.tsx:257
 msgid "Browse"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 
 #: src/renderer/components/+workspaces/workspaces.tsx:133
 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44
-#: src/renderer/components/dock/info-panel.tsx:85
+#: src/renderer/components/dock/info-panel.tsx:86
 #: src/renderer/components/wizard/wizard.tsx:130
 msgid "Cancel"
 msgstr ""
@@ -469,7 +469,6 @@ msgstr ""
 msgid "Claim Name"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243
 #: src/renderer/components/dialog/logs-dialog.tsx:39
 #: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93
 msgid "Close"
@@ -562,7 +561,7 @@ msgstr ""
 msgid "Connection"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246
+#: src/renderer/components/dock/pod-logs.tsx:148
 msgid "Container"
 msgstr ""
 
@@ -591,8 +590,8 @@ msgid "Container runtime"
 msgstr ""
 
 #: src/renderer/components/+workloads-pods/pod-details.tsx:122
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186
 #: src/renderer/components/+workloads-pods/pods.tsx:77
+#: src/renderer/components/dock/pod-logs.tsx:129
 msgid "Containers"
 msgstr ""
 
@@ -687,7 +686,7 @@ msgstr ""
 msgid "Create new Service Account"
 msgstr ""
 
-#: src/renderer/components/dock/dock.tsx:93
+#: src/renderer/components/dock/dock.tsx:99
 msgid "Create resource"
 msgstr ""
 
@@ -924,7 +923,8 @@ msgstr ""
 msgid "Error stack"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:109
+#: src/renderer/components/+add-cluster/add-cluster.tsx:89
+#: src/renderer/components/+add-cluster/add-cluster.tsx:130
 msgid "Error while adding cluster(s): {0}"
 msgstr ""
 
@@ -939,7 +939,7 @@ msgstr ""
 msgid "Everything is fine in the Cluster"
 msgstr ""
 
-#: src/renderer/components/dock/dock.tsx:98
+#: src/renderer/components/dock/dock.tsx:104
 msgid "Exit full size mode"
 msgstr ""
 
@@ -955,7 +955,7 @@ msgstr ""
 msgid "External IPs"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106
+#: src/renderer/components/dock/pod-logs.store.ts:65
 msgid "Failed to load logs: {0}"
 msgstr ""
 
@@ -980,7 +980,7 @@ msgstr ""
 msgid "First seen"
 msgstr ""
 
-#: src/renderer/components/dock/dock.tsx:98
+#: src/renderer/components/dock/dock.tsx:104
 msgid "Fit to window"
 msgstr ""
 
@@ -997,8 +997,8 @@ msgid "From"
 msgstr ""
 
 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212
-msgid "From <0>{from}</0> to <1>{to}</1>"
-msgstr ""
+#~ msgid "From <0>{from}</0> to <1>{to}</1>"
+#~ msgstr ""
 
 #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:125
 msgid "Fs Group"
@@ -1059,7 +1059,7 @@ msgid "Helm branch <0>{0}</0> already in use"
 msgstr ""
 
 #: src/renderer/components/+config-secrets/secret-details.tsx:93
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19
 msgid "Hide"
 msgstr ""
@@ -1144,7 +1144,7 @@ msgid "Ingresses"
 msgstr ""
 
 #: src/renderer/components/+workloads-pods/pod-details.tsx:118
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192
+#: src/renderer/components/dock/pod-logs.tsx:135
 msgid "Init Containers"
 msgstr ""
 
@@ -1305,7 +1305,7 @@ msgstr ""
 msgid "Limits"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248
+#: src/renderer/components/dock/pod-logs.tsx:150
 msgid "Lines"
 msgstr ""
 
@@ -1329,8 +1329,8 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:90
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:91
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:100
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:101
 msgid "Logs"
 msgstr ""
 
@@ -1436,7 +1436,7 @@ msgstr ""
 msgid "Min Pods"
 msgstr ""
 
-#: src/renderer/components/dock/dock.tsx:99
+#: src/renderer/components/dock/dock.tsx:105
 msgid "Minimize"
 msgstr ""
 
@@ -1591,11 +1591,11 @@ msgstr ""
 msgid "Network Policies"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231
+#: src/renderer/components/dock/pod-logs.tsx:178
 msgid "New logs since opening the dialog"
 msgstr ""
 
-#: src/renderer/components/dock/dock.tsx:86
+#: src/renderer/components/dock/dock.tsx:92
 msgid "New tab"
 msgstr ""
 
@@ -1625,7 +1625,7 @@ msgstr ""
 #~ msgid "No contexts available or they already added"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:260
+#: src/renderer/components/+add-cluster/add-cluster.tsx:281
 msgid "No contexts available or they have been added already"
 msgstr ""
 
@@ -1721,7 +1721,7 @@ msgstr ""
 msgid "Ok, got it!"
 msgstr ""
 
-#: src/renderer/components/dock/dock.tsx:99
+#: src/renderer/components/dock/dock.tsx:105
 msgid "Open"
 msgstr ""
 
@@ -1757,7 +1757,7 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:230
+#: src/renderer/components/+add-cluster/add-cluster.tsx:251
 msgid "Paste as text"
 msgstr ""
 
@@ -1781,7 +1781,7 @@ msgstr ""
 msgid "Persistent Volumes"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:72
+#: src/renderer/components/+add-cluster/add-cluster.tsx:75
 msgid "Please select at least one cluster context"
 msgstr ""
 
@@ -1834,7 +1834,7 @@ msgstr ""
 msgid "Pod Status"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:67
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:77
 msgid "Pod shell"
 msgstr ""
 
@@ -1897,7 +1897,7 @@ msgstr ""
 #~ msgid "Pro-Tip: paste kubeconfig to collect available contexts"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:248
+#: src/renderer/components/+add-cluster/add-cluster.tsx:269
 msgid "Pro-Tip: paste kubeconfig to get available contexts"
 msgstr ""
 
@@ -1905,7 +1905,7 @@ msgstr ""
 #~ msgid "Pro-Tip: paste kubeconfig to parse available contexts"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:239
+#: src/renderer/components/+add-cluster/add-cluster.tsx:260
 msgid "Pro-Tip: you can also drag-n-drop kubeconfig file to this area"
 msgstr ""
 
@@ -1926,7 +1926,7 @@ msgstr ""
 msgid "Proxy is used only for non-cluster communication."
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:294
+#: src/renderer/components/+add-cluster/add-cluster.tsx:315
 msgid "Proxy settings"
 msgstr ""
 
@@ -1962,7 +1962,7 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107
+#: src/renderer/components/dock/pod-logs.store.ts:66
 msgid "Reason: {0} ({1})"
 msgstr ""
 
@@ -2107,7 +2107,7 @@ msgstr ""
 msgid "Required field"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:235
+#: src/renderer/components/+add-cluster/add-cluster.tsx:256
 #: src/renderer/components/item-object-list/page-filters-list.tsx:31
 msgid "Reset"
 msgstr ""
@@ -2249,9 +2249,9 @@ msgstr ""
 #: src/renderer/components/+apps-releases/release-details.tsx:114
 #: src/renderer/components/+config-maps/config-map-details.tsx:78
 #: src/renderer/components/+config-secrets/secret-details.tsx:97
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216
 #: src/renderer/components/+workspaces/workspaces.tsx:132
 #: src/renderer/components/dock/edit-resource.tsx:87
+#: src/renderer/components/dock/pod-logs.tsx:161
 msgid "Save"
 msgstr ""
 
@@ -2343,7 +2343,7 @@ msgstr ""
 #~ msgid "Select context(s)"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:257
+#: src/renderer/components/+add-cluster/add-cluster.tsx:278
 msgid "Select contexts"
 msgstr ""
 
@@ -2356,8 +2356,8 @@ msgstr ""
 #~ msgid "Select custom kube-config file"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:62
-#: src/renderer/components/+add-cluster/add-cluster.tsx:62
+#: src/renderer/components/+add-cluster/add-cluster.tsx:63
+#: src/renderer/components/+add-cluster/add-cluster.tsx:63
 msgid "Select custom kubeconfig file"
 msgstr ""
 
@@ -2373,7 +2373,7 @@ msgstr ""
 #~ msgid "Select kubeconfig"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:229
+#: src/renderer/components/+add-cluster/add-cluster.tsx:250
 msgid "Select kubeconfig file"
 msgstr ""
 
@@ -2401,7 +2401,7 @@ msgstr ""
 #~ msgid "Selected contexts ({0}): <0>{1}</0>"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:256
+#: src/renderer/components/+add-cluster/add-cluster.tsx:277
 msgid "Selected contexts: <0>{0}</0>"
 msgstr ""
 
@@ -2458,13 +2458,13 @@ msgid "Settings"
 msgstr ""
 
 #: src/renderer/components/+nodes/node-menu.tsx:48
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:68
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:78
 msgid "Shell"
 msgstr ""
 
 #: src/renderer/components/+config-secrets/secret-details.tsx:93
 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:101
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19
 msgid "Show"
 msgstr ""
@@ -2473,10 +2473,22 @@ msgstr ""
 msgid "Show Notes"
 msgstr ""
 
+#: src/renderer/components/dock/pod-logs.tsx:160
+msgid "Show current logs"
+msgstr ""
+
+#: src/renderer/components/dock/pod-logs.tsx:160
+msgid "Show previous terminated container logs"
+msgstr ""
+
 #: src/renderer/components/+user-management-service-accounts/service-accounts-secret.tsx:20
 msgid "Show value"
 msgstr ""
 
+#: src/renderer/components/dock/pod-logs.tsx:154
+msgid "Since"
+msgstr ""
+
 #: src/renderer/components/+nodes/node-charts.tsx:80
 #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:49
 msgid "Size"
@@ -2571,12 +2583,12 @@ msgstr ""
 msgid "Sub-object"
 msgstr ""
 
-#: src/renderer/components/dock/info-panel.tsx:93
+#: src/renderer/components/dock/info-panel.tsx:95
 #: src/renderer/components/wizard/wizard.tsx:131
 msgid "Submit"
 msgstr ""
 
-#: src/renderer/components/dock/info-panel.tsx:94
+#: src/renderer/components/dock/info-panel.tsx:96
 msgid "Submitting.."
 msgstr ""
 
@@ -2584,7 +2596,7 @@ msgstr ""
 msgid "Subsets"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:102
+#: src/renderer/components/+add-cluster/add-cluster.tsx:122
 msgid "Successfully imported <0>{0}</0> cluster(s)"
 msgstr ""
 
@@ -2618,7 +2630,7 @@ msgstr ""
 msgid "Terminal"
 msgstr ""
 
-#: src/renderer/components/dock/dock.tsx:89
+#: src/renderer/components/dock/dock.tsx:95
 msgid "Terminal session"
 msgstr ""
 
@@ -2626,7 +2638,7 @@ msgstr ""
 msgid "The path to the kubectl binary on the system."
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226
+#: src/renderer/components/dock/pod-logs.tsx:172
 msgid "There are no logs available for container."
 msgstr ""
 
@@ -2756,8 +2768,8 @@ msgstr ""
 msgid "Usage"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:63
-#: src/renderer/components/+add-cluster/add-cluster.tsx:63
+#: src/renderer/components/+add-cluster/add-cluster.tsx:64
+#: src/renderer/components/+add-cluster/add-cluster.tsx:64
 msgid "Use configuration"
 msgstr ""
 
@@ -2944,7 +2956,7 @@ msgstr ""
 msgid "singular"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 msgid "timestamps"
 msgstr ""
 
@@ -2989,8 +3001,8 @@ msgid "{metricsRemainCount} more..."
 msgstr ""
 
 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240
-msgid "{podName} Logs"
-msgstr ""
+#~ msgid "{podName} Logs"
+#~ msgstr ""
 
 #: src/renderer/components/dock/edit-resource.tsx:56
 msgid "{resourceType} <0>{resourceName}</0> updated."
@@ -3000,6 +3012,6 @@ msgstr ""
 msgid "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}</1>?</0>} other {<2>Remove <3>{selectedCount}</3> items <4>{selectedNames}</4> {tail}?</2>}}"
 msgstr ""
 
-#: src/renderer/components/dock/info-panel.tsx:88
+#: src/renderer/components/dock/info-panel.tsx:89
 msgid "{submitLabel} & Close"
 msgstr ""
diff --git a/locales/ru/messages.po b/locales/ru/messages.po
index 5cbf7f603e..58d4a545f1 100644
--- a/locales/ru/messages.po
+++ b/locales/ru/messages.po
@@ -88,7 +88,7 @@ msgstr "Название аккаунта"
 msgid "Active"
 msgstr "Активный"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:289
+#: src/renderer/components/+add-cluster/add-cluster.tsx:310
 #: src/renderer/components/cluster-manager/clusters-menu.tsx:130
 msgid "Add Cluster"
 msgstr ""
@@ -113,7 +113,7 @@ msgstr "Добавить привязки к {name}"
 #~ msgid "Add cluster"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:306
+#: src/renderer/components/+add-cluster/add-cluster.tsx:327
 msgid "Add cluster(s)"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "All groups"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57
+#: src/renderer/components/dock/pod-logs.tsx:37
 msgid "All logs"
 msgstr "Все логи"
 
@@ -324,7 +324,7 @@ msgstr "Цели привязки"
 msgid "Bindings"
 msgstr "Привязки"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:236
+#: src/renderer/components/+add-cluster/add-cluster.tsx:257
 msgid "Browse"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgstr "CPU:"
 
 #: src/renderer/components/+workspaces/workspaces.tsx:133
 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44
-#: src/renderer/components/dock/info-panel.tsx:85
+#: src/renderer/components/dock/info-panel.tsx:86
 #: src/renderer/components/wizard/wizard.tsx:130
 msgid "Cancel"
 msgstr "Отмена"
@@ -474,7 +474,6 @@ msgstr "Запрос"
 msgid "Claim Name"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243
 #: src/renderer/components/dialog/logs-dialog.tsx:39
 #: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93
 msgid "Close"
@@ -567,7 +566,7 @@ msgstr "Конфигурация"
 msgid "Connection"
 msgstr "Соединение"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246
+#: src/renderer/components/dock/pod-logs.tsx:148
 msgid "Container"
 msgstr "Контейнер"
 
@@ -596,8 +595,8 @@ msgid "Container runtime"
 msgstr "Среда контейнеров"
 
 #: src/renderer/components/+workloads-pods/pod-details.tsx:122
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186
 #: src/renderer/components/+workloads-pods/pods.tsx:77
+#: src/renderer/components/dock/pod-logs.tsx:129
 msgid "Containers"
 msgstr "Контейнеры"
 
@@ -692,7 +691,7 @@ msgstr "Создать новый секрет"
 msgid "Create new Service Account"
 msgstr "Создать новый Service Account"
 
-#: src/renderer/components/dock/dock.tsx:93
+#: src/renderer/components/dock/dock.tsx:99
 msgid "Create resource"
 msgstr "Создать ресурс"
 
@@ -929,7 +928,8 @@ msgstr "Среда"
 msgid "Error stack"
 msgstr "Стэк ошибки"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:109
+#: src/renderer/components/+add-cluster/add-cluster.tsx:89
+#: src/renderer/components/+add-cluster/add-cluster.tsx:130
 msgid "Error while adding cluster(s): {0}"
 msgstr ""
 
@@ -949,7 +949,7 @@ msgstr "В кластере все в порядке"
 #~ msgid "Excluded items with \"system:\" prefix"
 #~ msgstr "За исключением объектов с префиксом “system:”"
 
-#: src/renderer/components/dock/dock.tsx:98
+#: src/renderer/components/dock/dock.tsx:104
 msgid "Exit full size mode"
 msgstr "Выйти из полного размера"
 
@@ -965,7 +965,7 @@ msgstr "Внешний IP"
 msgid "External IPs"
 msgstr "Внешние IP"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106
+#: src/renderer/components/dock/pod-logs.store.ts:65
 msgid "Failed to load logs: {0}"
 msgstr "Ошибка загрузки логов: {0}"
 
@@ -990,7 +990,7 @@ msgstr "Финализаторы"
 msgid "First seen"
 msgstr "Увиденно впервые"
 
-#: src/renderer/components/dock/dock.tsx:98
+#: src/renderer/components/dock/dock.tsx:104
 msgid "Fit to window"
 msgstr "По размеру окна"
 
@@ -1007,8 +1007,8 @@ msgid "From"
 msgstr "От"
 
 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212
-msgid "From <0>{from}</0> to <1>{to}</1>"
-msgstr "От <0>{from}</0> до <1>{to}</1>"
+#~ msgid "From <0>{from}</0> to <1>{to}</1>"
+#~ msgstr "От <0>{from}</0> до <1>{to}</1>"
 
 #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:125
 msgid "Fs Group"
@@ -1069,7 +1069,7 @@ msgid "Helm branch <0>{0}</0> already in use"
 msgstr ""
 
 #: src/renderer/components/+config-secrets/secret-details.tsx:93
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19
 msgid "Hide"
 msgstr "Скрыть"
@@ -1154,7 +1154,7 @@ msgid "Ingresses"
 msgstr "Ingresses"
 
 #: src/renderer/components/+workloads-pods/pod-details.tsx:118
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192
+#: src/renderer/components/dock/pod-logs.tsx:135
 msgid "Init Containers"
 msgstr "Контейнеры инициализации"
 
@@ -1315,7 +1315,7 @@ msgstr ""
 msgid "Limits"
 msgstr "Лимиты"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248
+#: src/renderer/components/dock/pod-logs.tsx:150
 msgid "Lines"
 msgstr "Строки"
 
@@ -1339,8 +1339,8 @@ msgstr ""
 msgid "Loading"
 msgstr "Загрузка"
 
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:90
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:91
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:100
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:101
 msgid "Logs"
 msgstr "Логи"
 
@@ -1446,7 +1446,7 @@ msgstr ""
 msgid "Min Pods"
 msgstr "Мин. подов"
 
-#: src/renderer/components/dock/dock.tsx:99
+#: src/renderer/components/dock/dock.tsx:105
 msgid "Minimize"
 msgstr "Минимизировать"
 
@@ -1601,11 +1601,11 @@ msgstr "Сетевая файловая система"
 msgid "Network Policies"
 msgstr "Network Policies"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231
+#: src/renderer/components/dock/pod-logs.tsx:178
 msgid "New logs since opening the dialog"
 msgstr "Новые логи с момента открытия диалога"
 
-#: src/renderer/components/dock/dock.tsx:86
+#: src/renderer/components/dock/dock.tsx:92
 msgid "New tab"
 msgstr "Новая вкладка"
 
@@ -1643,7 +1643,7 @@ msgstr "Нет доступных нод."
 #~ msgid "No contexts available or they already added"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:260
+#: src/renderer/components/+add-cluster/add-cluster.tsx:281
 msgid "No contexts available or they have been added already"
 msgstr ""
 
@@ -1739,7 +1739,7 @@ msgstr "Ок"
 msgid "Ok, got it!"
 msgstr ""
 
-#: src/renderer/components/dock/dock.tsx:99
+#: src/renderer/components/dock/dock.tsx:105
 msgid "Open"
 msgstr "Открыть"
 
@@ -1775,7 +1775,7 @@ msgstr "Параллелизм"
 msgid "Parameters"
 msgstr "Параметры"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:230
+#: src/renderer/components/+add-cluster/add-cluster.tsx:251
 msgid "Paste as text"
 msgstr ""
 
@@ -1799,7 +1799,7 @@ msgstr "Persistent Volume Claims"
 msgid "Persistent Volumes"
 msgstr "Persistent Volumes"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:72
+#: src/renderer/components/+add-cluster/add-cluster.tsx:75
 msgid "Please select at least one cluster context"
 msgstr ""
 
@@ -1852,7 +1852,7 @@ msgstr "Селектор подов"
 msgid "Pod Status"
 msgstr "Статус подов"
 
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:67
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:77
 msgid "Pod shell"
 msgstr "Командная строка пода"
 
@@ -1915,7 +1915,7 @@ msgstr ""
 #~ msgid "Pro-Tip: paste kubeconfig to collect available contexts"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:248
+#: src/renderer/components/+add-cluster/add-cluster.tsx:269
 msgid "Pro-Tip: paste kubeconfig to get available contexts"
 msgstr ""
 
@@ -1923,7 +1923,7 @@ msgstr ""
 #~ msgid "Pro-Tip: paste kubeconfig to parse available contexts"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:239
+#: src/renderer/components/+add-cluster/add-cluster.tsx:260
 msgid "Pro-Tip: you can also drag-n-drop kubeconfig file to this area"
 msgstr ""
 
@@ -1944,7 +1944,7 @@ msgstr "Комиссия"
 msgid "Proxy is used only for non-cluster communication."
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:294
+#: src/renderer/components/+add-cluster/add-cluster.tsx:315
 msgid "Proxy settings"
 msgstr ""
 
@@ -1980,7 +1980,7 @@ msgstr "Готовность"
 msgid "Reason"
 msgstr "Причина"
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107
+#: src/renderer/components/dock/pod-logs.store.ts:66
 msgid "Reason: {0} ({1})"
 msgstr "Причина: {0} ({1})"
 
@@ -2125,7 +2125,7 @@ msgstr ""
 msgid "Required field"
 msgstr "Обязательное поле"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:235
+#: src/renderer/components/+add-cluster/add-cluster.tsx:256
 #: src/renderer/components/item-object-list/page-filters-list.tsx:31
 msgid "Reset"
 msgstr "Сбросить"
@@ -2267,9 +2267,9 @@ msgstr ""
 #: src/renderer/components/+apps-releases/release-details.tsx:114
 #: src/renderer/components/+config-maps/config-map-details.tsx:78
 #: src/renderer/components/+config-secrets/secret-details.tsx:97
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216
 #: src/renderer/components/+workspaces/workspaces.tsx:132
 #: src/renderer/components/dock/edit-resource.tsx:87
+#: src/renderer/components/dock/pod-logs.tsx:161
 msgid "Save"
 msgstr "Сохранить"
 
@@ -2361,7 +2361,7 @@ msgstr "Выберите квоту..."
 #~ msgid "Select context(s)"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:257
+#: src/renderer/components/+add-cluster/add-cluster.tsx:278
 msgid "Select contexts"
 msgstr ""
 
@@ -2374,8 +2374,8 @@ msgstr ""
 #~ msgid "Select custom kube-config file"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:62
-#: src/renderer/components/+add-cluster/add-cluster.tsx:62
+#: src/renderer/components/+add-cluster/add-cluster.tsx:63
+#: src/renderer/components/+add-cluster/add-cluster.tsx:63
 msgid "Select custom kubeconfig file"
 msgstr ""
 
@@ -2391,7 +2391,7 @@ msgstr ""
 #~ msgid "Select kubeconfig"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:229
+#: src/renderer/components/+add-cluster/add-cluster.tsx:250
 msgid "Select kubeconfig file"
 msgstr ""
 
@@ -2419,7 +2419,7 @@ msgstr "Выбрать сервисные аккаунты"
 #~ msgid "Selected contexts ({0}): <0>{1}</0>"
 #~ msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:256
+#: src/renderer/components/+add-cluster/add-cluster.tsx:277
 msgid "Selected contexts: <0>{0}</0>"
 msgstr ""
 
@@ -2476,13 +2476,13 @@ msgid "Settings"
 msgstr ""
 
 #: src/renderer/components/+nodes/node-menu.tsx:48
-#: src/renderer/components/+workloads-pods/pod-menu.tsx:68
+#: src/renderer/components/+workloads-pods/pod-menu.tsx:78
 msgid "Shell"
 msgstr "Командная строка"
 
 #: src/renderer/components/+config-secrets/secret-details.tsx:93
 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:101
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19
 msgid "Show"
 msgstr "Показать"
@@ -2491,10 +2491,22 @@ msgstr "Показать"
 msgid "Show Notes"
 msgstr "Показать логи"
 
+#: src/renderer/components/dock/pod-logs.tsx:160
+msgid "Show current logs"
+msgstr ""
+
+#: src/renderer/components/dock/pod-logs.tsx:160
+msgid "Show previous terminated container logs"
+msgstr ""
+
 #: src/renderer/components/+user-management-service-accounts/service-accounts-secret.tsx:20
 msgid "Show value"
 msgstr "Показать значение"
 
+#: src/renderer/components/dock/pod-logs.tsx:154
+msgid "Since"
+msgstr ""
+
 #: src/renderer/components/+nodes/node-charts.tsx:80
 #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:49
 msgid "Size"
@@ -2589,12 +2601,12 @@ msgstr "Тип стратегии"
 msgid "Sub-object"
 msgstr "Суб-объект"
 
-#: src/renderer/components/dock/info-panel.tsx:93
+#: src/renderer/components/dock/info-panel.tsx:95
 #: src/renderer/components/wizard/wizard.tsx:131
 msgid "Submit"
 msgstr "Отправить"
 
-#: src/renderer/components/dock/info-panel.tsx:94
+#: src/renderer/components/dock/info-panel.tsx:96
 msgid "Submitting.."
 msgstr "Применение.."
 
@@ -2602,7 +2614,7 @@ msgstr "Применение.."
 msgid "Subsets"
 msgstr ""
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:102
+#: src/renderer/components/+add-cluster/add-cluster.tsx:122
 msgid "Successfully imported <0>{0}</0> cluster(s)"
 msgstr ""
 
@@ -2636,7 +2648,7 @@ msgstr ""
 msgid "Terminal"
 msgstr "Терминал"
 
-#: src/renderer/components/dock/dock.tsx:89
+#: src/renderer/components/dock/dock.tsx:95
 msgid "Terminal session"
 msgstr "Сессия терминала"
 
@@ -2644,7 +2656,7 @@ msgstr "Сессия терминала"
 msgid "The path to the kubectl binary on the system."
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226
+#: src/renderer/components/dock/pod-logs.tsx:172
 msgid "There are no logs available for container."
 msgstr "Для контейнера нет логов."
 
@@ -2774,8 +2786,8 @@ msgstr "Обновить версию"
 msgid "Usage"
 msgstr "Использование"
 
-#: src/renderer/components/+add-cluster/add-cluster.tsx:63
-#: src/renderer/components/+add-cluster/add-cluster.tsx:63
+#: src/renderer/components/+add-cluster/add-cluster.tsx:64
+#: src/renderer/components/+add-cluster/add-cluster.tsx:64
 msgid "Use configuration"
 msgstr ""
 
@@ -2962,7 +2974,7 @@ msgstr "сек"
 msgid "singular"
 msgstr ""
 
-#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215
+#: src/renderer/components/dock/pod-logs.tsx:159
 msgid "timestamps"
 msgstr "временные метки"
 
@@ -3007,8 +3019,8 @@ msgid "{metricsRemainCount} more..."
 msgstr "{metricsRemainCount} еще…"
 
 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240
-msgid "{podName} Logs"
-msgstr "{podName} логи"
+#~ msgid "{podName} Logs"
+#~ msgstr "{podName} логи"
 
 #: src/renderer/components/dock/edit-resource.tsx:56
 msgid "{resourceType} <0>{resourceName}</0> updated."
@@ -3025,6 +3037,6 @@ msgstr ""
 "other {<2>Удалить <3>{selectedCount}</3> элементов <4>{selectedNames}</4> {tail}?</2>}\n"
 "}"
 
-#: src/renderer/components/dock/info-panel.tsx:88
+#: src/renderer/components/dock/info-panel.tsx:89
 msgid "{submitLabel} & Close"
 msgstr "{submitLabel} и закрыть"