From acfd1828ebf3010ad8e9c0e7f1d891f218b5d5d7 Mon Sep 17 00:00:00 2001 From: Daniil Kolesnik Date: Wed, 12 Aug 2020 09:14:37 +0300 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Change=20kind=20to=20?= =?UTF-8?q?"Enpoints"=20in=20renderer=20(#672)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ Closes: #646 Signed-off-by: Daniil Kolesnik --- src/renderer/api/endpoints/endpoint.api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/api/endpoints/endpoint.api.ts b/src/renderer/api/endpoints/endpoint.api.ts index 6f0c400969..80a0e1679f 100644 --- a/src/renderer/api/endpoints/endpoint.api.ts +++ b/src/renderer/api/endpoints/endpoint.api.ts @@ -98,7 +98,7 @@ export class EndpointSubset implements IEndpointSubset { @autobind() export class Endpoint extends KubeObject { - static kind = "Endpoint" + static kind = "Endpoints" subsets: IEndpointSubset[] From e24976956238dd99ca399e24c1071639fdffcb1c Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 12 Aug 2020 09:08:40 -0400 Subject: [PATCH 2/5] Add support for customreasourcedefinitions under the v1 API (#658) * Add support for customreasourcedefinitions under the v1 API * moving store and views to use v1 Signed-off-by: Sebastian Malton Co-authored-by: Sebastian Malton --- src/renderer/api/endpoints/crd.api.ts | 9 ++++- .../components/+custom-resources/crd.store.ts | 39 ++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/renderer/api/endpoints/crd.api.ts b/src/renderer/api/endpoints/crd.api.ts index 39a4e50f8c..829719a3cb 100644 --- a/src/renderer/api/endpoints/crd.api.ts +++ b/src/renderer/api/endpoints/crd.api.ts @@ -130,9 +130,16 @@ export class CustomResourceDefinition extends KubeObject { } } -export const crdApi = new KubeApi({ +export const crdBetaApi = new KubeApi({ kind: CustomResourceDefinition.kind, apiBase: "/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions", isNamespaced: false, objectConstructor: CustomResourceDefinition, }); + +export const crdApi = new KubeApi({ + kind: CustomResourceDefinition.kind, + apiBase: "/apis/apiextensions.k8s.io/v1/customresourcedefinitions", + isNamespaced: false, + objectConstructor: CustomResourceDefinition, +}); diff --git a/src/renderer/components/+custom-resources/crd.store.ts b/src/renderer/components/+custom-resources/crd.store.ts index fbcd2a4ee6..fadb1222e2 100644 --- a/src/renderer/components/+custom-resources/crd.store.ts +++ b/src/renderer/components/+custom-resources/crd.store.ts @@ -7,6 +7,17 @@ import { KubeApi } from "../../api/kube-api"; import { CRDResourceStore } from "./crd-resource.store"; import { KubeObject } from "../../api/kube-object"; +function initStore(crd: CustomResourceDefinition) { + const apiBase = crd.getResourceApiBase(); + const kind = crd.getResourceKind(); + const isNamespaced = crd.isNamespaced(); + const api = apiManager.getApi(apiBase) || new KubeApi({ apiBase, kind, isNamespaced }); + + if (!apiManager.getStore(api)) { + apiManager.registerStore(api, new CRDResourceStore(api)); + } +} + @autobind() export class CRDStore extends KubeObjectStore { api = crdApi @@ -15,9 +26,7 @@ export class CRDStore extends KubeObjectStore { super(); // auto-init stores for crd-s - reaction(() => this.items.toJS(), items => { - items.forEach(this.initStore); - }) + reaction(() => this.items.toJS(), items => items.forEach(initStore)) } protected sortItems(items: CustomResourceDefinition[]) { @@ -27,23 +36,6 @@ export class CRDStore extends KubeObjectStore { ]) } - protected initStore(crd: CustomResourceDefinition) { - const apiBase = crd.getResourceApiBase(); - let api = apiManager.getApi(apiBase); - if (!api) { - api = new KubeApi({ - apiBase: apiBase, - kind: crd.getResourceKind(), - isNamespaced: crd.isNamespaced(), - }); - } - let store = apiManager.getStore(api); - if (!store) { - store = new CRDResourceStore(api); - apiManager.registerStore(api, store); - } - } - @computed get groups() { const groups: Record = {}; return this.items.reduce((groups, crd) => { @@ -63,9 +55,10 @@ export class CRDStore extends KubeObjectStore { getByObject(obj: KubeObject) { if (!obj) return null const { kind, apiVersion } = obj; - return this.items.find(crd => { - return kind === crd.getResourceKind() && apiVersion === `${crd.getGroup()}/${crd.getVersion()}` - }) + + return this.items.find(crd => ( + kind === crd.getResourceKind() && apiVersion === `${crd.getGroup()}/${crd.getVersion()}` + )) } } From 30c14eb6da4e824f48c1746ca8971bf5aaf58a83 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Fri, 14 Aug 2020 14:39:28 +0300 Subject: [PATCH 3/5] Fixing role binding details view without subjects (#688) Signed-off-by: alexfront --- .../role-binding-details.tsx | 53 ++++++++++--------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx b/src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx index bc1957961b..2839c99dc2 100644 --- a/src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx +++ b/src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx @@ -64,6 +64,7 @@ export class RoleBindingDetails extends React.Component { } const name = roleBinding.getName(); const { roleRef } = roleBinding; + const subjects = roleBinding.getSubjects(); return (
@@ -83,31 +84,33 @@ export class RoleBindingDetails extends React.Component { Bindings}/> - - - - Binding - Type - Namespace - - { - roleBinding.getSubjects().map((subject, i) => { - const { kind, name, namespace } = subject; - const isSelected = selectedSubjects.includes(subject); - return ( - this.selectSubject(subject))} - > - - {name} - {kind} - {namespace || "-"} - - ) - }) - } -
+ {subjects.length > 0 && ( + + + + Binding + Type + Namespace + + { + subjects.map((subject, i) => { + const { kind, name, namespace } = subject; + const isSelected = selectedSubjects.includes(subject); + return ( + this.selectSubject(subject))} + > + + {name} + {kind} + {namespace || "-"} + + ) + }) + } +
+ )} From 81796af508b5f8519925752de82d6c96e2077c4d Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Fri, 14 Aug 2020 16:05:57 +0300 Subject: [PATCH 4/5] Update copyright, eula and contact details (#690) Signed-off-by: Jari Kolehmainen --- LICENSE | 2 +- package.json | 6 +++--- src/common/tracker.ts | 2 +- src/main/menu.ts | 4 ++-- src/renderer/themes/kontena-dark.json | 4 ++-- src/renderer/themes/kontena-light.json | 4 ++-- webpack.renderer.ts | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index a399a8372e..841736290b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Lakend Labs, Inc. +Copyright (c) 2020 Mirantis, Inc. All rights reserved. diff --git a/package.json b/package.json index cceecd8989..23cd13f145 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,11 @@ "description": "Lens - The Kubernetes IDE", "version": "3.6.0-dev", "main": "out/main.js", - "copyright": "© 2020, Lakend Labs, Inc.", + "copyright": "© 2020, Mirantis, Inc.", "license": "MIT", "author": { - "name": "Lakend Labs, Inc.", - "email": "info@lakendlabs.com" + "name": "Mirantis, Inc.", + "email": "info@k8slens.dev" }, "scripts": { "dev": "concurrently -k \"yarn dev-run -C\" \"yarn dev:main\" \"yarn dev:renderer\"", diff --git a/src/common/tracker.ts b/src/common/tracker.ts index 2476c47dbd..5b222c5bab 100644 --- a/src/common/tracker.ts +++ b/src/common/tracker.ts @@ -18,7 +18,7 @@ export class Tracker { } catch (error) { this.visitor = ua(GA_ID) } - this.visitor.set("dl", "https://lensapptelemetry.lakendlabs.com") + this.visitor.set("dl", "https://telemetry.k8slens.dev") } public async event(eventCategory: string, eventAction: string) { diff --git a/src/main/menu.ts b/src/main/menu.ts index 82aef3d5fe..52a6628998 100644 --- a/src/main/menu.ts +++ b/src/main/menu.ts @@ -21,7 +21,7 @@ function showAbout(_menuitem: MenuItem, browserWindow: BrowserWindow) { const appDetails = [ `Version: ${app.getVersion()}`, ] - appDetails.push(`Copyright 2020 Lakend Labs, Inc.`) + appDetails.push(`Copyright 2020 Mirantis, Inc.`) let title = "Lens" if (isWindows) { title = ` ${title}` @@ -169,7 +169,7 @@ export default function initMenu(opts: MenuOptions, promiseIpc: any) { { label: 'License', click: async () => { - shell.openExternal('https://lakendlabs.com/licenses/lens-eula.md'); + shell.openExternal('https://k8slens.dev/licenses/eula.md'); }, }, { diff --git a/src/renderer/themes/kontena-dark.json b/src/renderer/themes/kontena-dark.json index 7066b1670a..a227abd968 100644 --- a/src/renderer/themes/kontena-dark.json +++ b/src/renderer/themes/kontena-dark.json @@ -1,7 +1,7 @@ { "name": "Lens Dark Theme", "type": "dark", - "author": "Lakend Labs", + "author": "Mirantis", "colors": { "blue": "#3d90ce", "magenta": "#c93dce", @@ -102,4 +102,4 @@ "radioActiveBackground": "#36393e", "menuActiveBackground": "#36393e" } -} \ No newline at end of file +} diff --git a/src/renderer/themes/kontena-light.json b/src/renderer/themes/kontena-light.json index b485676924..2e3813524f 100644 --- a/src/renderer/themes/kontena-light.json +++ b/src/renderer/themes/kontena-light.json @@ -1,7 +1,7 @@ { "name": "Lens Light Theme", "type": "light", - "author": "Lakend Labs", + "author": "Mirantis", "colors": { "blue": "#3d90ce", "magenta": "#c93dce", @@ -103,4 +103,4 @@ "radioActiveBackground": "#f1f1f1", "menuActiveBackground": "#e8e8e8" } -} \ No newline at end of file +} diff --git a/webpack.renderer.ts b/webpack.renderer.ts index 26ee62faed..91611b84d1 100755 --- a/webpack.renderer.ts +++ b/webpack.renderer.ts @@ -45,7 +45,7 @@ export function webpackConfigReact(): webpack.Configuration { extractComments: { condition: "some", banner: [ - `Lens - The Kubernetes IDE. Copyright ${new Date().getFullYear()} by Lakend Labs, Inc. All rights reserved.` + `Lens - The Kubernetes IDE. Copyright ${new Date().getFullYear()} by Mirantis, Inc. All rights reserved.` ].join("\n") } }) From 0a5626fdb797298d3b9de845fcfe931c943a9714 Mon Sep 17 00:00:00 2001 From: Jim Ehrismann <40840436+jim-docker@users.noreply.github.com> Date: Fri, 14 Aug 2020 11:04:39 -0400 Subject: [PATCH 5/5] Added load-balancer hostname/IP to ingress details (#675) * Added load-balancer hostname/IP to ingress details Signed-off-by: Jim Ehrismann * lint fixes Signed-off-by: Jim Ehrismann --- locales/en/messages.po | 176 +++++++++--------- locales/fi/messages.po | 176 +++++++++--------- locales/ru/messages.po | 176 +++++++++--------- src/renderer/api/endpoints/ingress.api.ts | 6 +- .../+network-ingresses/ingress-details.tsx | 30 ++- 5 files changed, 312 insertions(+), 252 deletions(-) diff --git a/locales/en/messages.po b/locales/en/messages.po index 6f2abc511f..ae725e7dc7 100644 --- a/locales/en/messages.po +++ b/locales/en/messages.po @@ -33,6 +33,10 @@ msgstr "<0>Your browser does not support all Lens features. Please consider msgid "<0>{0} successfully created" msgstr "<0>{0} successfully created" +#: src/renderer/components/input/input.validators.ts:40 +msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." +msgstr "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." + #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:80 msgid "API Group" msgstr "API Group" @@ -125,7 +129,7 @@ msgstr "All groups" msgid "All logs" msgstr "All logs" -#: src/renderer/components/+namespaces/namespace-select.tsx:96 +#: src/renderer/components/+namespaces/namespace-select.tsx:95 msgid "All namespaces" msgstr "All namespaces" @@ -195,7 +199,7 @@ msgstr "Apps" msgid "Are you sure you want to drain <0>{nodeName}?" msgstr "Are you sure you want to drain <0>{nodeName}?" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:86 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:84 msgid "Arguments" msgstr "Arguments" @@ -229,32 +233,32 @@ msgstr "Bindings" msgid "Build version" msgstr "Build version" -#: src/renderer/components/+workloads-pods/container-charts.tsx:72 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:98 +#: src/renderer/components/+workloads-pods/container-charts.tsx:74 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:100 msgid "Bytes consumed on this filesystem" msgstr "Bytes consumed on this filesystem" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:81 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:83 msgid "Bytes received by all containers" msgstr "Bytes received by all containers" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:31 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:33 msgid "Bytes sent by Ingress controller with error status" msgstr "Bytes sent by Ingress controller with error status" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:24 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:26 msgid "Bytes sent by Ingress controller with successful status" msgstr "Bytes sent by Ingress controller with successful status" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:23 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:25 msgid "Bytes sent, status 2xx" msgstr "Bytes sent, status 2xx" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:30 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:32 msgid "Bytes sent, status 5xx" msgstr "Bytes sent, status 5xx" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:88 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:90 msgid "Bytes transmitted from all containers" msgstr "Bytes transmitted from all containers" @@ -270,7 +274,7 @@ msgstr "CA Bundle" #: src/renderer/components/+nodes/node-details.tsx:79 #: src/renderer/components/+nodes/nodes.tsx:113 #: src/renderer/components/+workloads-pods/pod-charts.tsx:11 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:25 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:26 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:53 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:95 #: src/renderer/components/resource-metrics/resource-metrics-text.tsx:13 @@ -282,17 +286,17 @@ msgid "CPU capacity" msgstr "CPU capacity" #: src/renderer/components/+nodes/node-charts.tsx:26 -#: src/renderer/components/+workloads-pods/container-charts.tsx:24 +#: src/renderer/components/+workloads-pods/container-charts.tsx:26 msgid "CPU cores usage" msgstr "CPU cores usage" -#: src/renderer/components/+workloads-pods/container-charts.tsx:38 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:47 +#: src/renderer/components/+workloads-pods/container-charts.tsx:40 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:49 msgid "CPU limits" msgstr "CPU limits" #: src/renderer/components/+nodes/node-charts.tsx:33 -#: src/renderer/components/+workloads-pods/container-charts.tsx:31 +#: src/renderer/components/+workloads-pods/container-charts.tsx:33 msgid "CPU requests" msgstr "CPU requests" @@ -368,7 +372,7 @@ msgstr "Close (Ctrl+W)" msgid "Cloud API Token Secret" msgstr "Cloud API Token Secret" -#: src/renderer/components/+namespaces/namespace-select.tsx:44 +#: src/renderer/components/+namespaces/namespace-select.tsx:43 #: src/renderer/components/layout/sidebar.tsx:79 msgid "Cluster" msgstr "Cluster" @@ -382,7 +386,7 @@ msgstr "Cluster IP" msgid "Cluster Issuers" msgstr "Cluster Issuers" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:81 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:79 msgid "Command" msgstr "Command" @@ -447,23 +451,23 @@ msgstr "Connection" msgid "Container" msgstr "Container" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:33 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:35 msgid "Container CPU cores usage" msgstr "Container CPU cores usage" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:40 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:42 msgid "Container CPU requests" msgstr "Container CPU requests" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:71 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:73 msgid "Container memory limits" msgstr "Container memory limits" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:64 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:66 msgid "Container memory requests" msgstr "Container memory requests" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:57 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:59 msgid "Container memory usage" msgstr "Container memory usage" @@ -694,7 +698,7 @@ msgid "Driver" msgstr "Driver" #: src/renderer/components/+custom-resources/certmanager.k8s.io/certificate-details.tsx:59 -#: src/renderer/components/+network-ingresses/ingress-details.tsx:67 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:87 msgid "Duration" msgstr "Duration" @@ -720,7 +724,7 @@ msgstr "Effect" msgid "Egress" msgstr "Egress" -#: src/renderer/components/+network-services/service-details.tsx:66 +#: src/renderer/components/+network-services/service-details.tsx:68 msgid "Endpoint" msgstr "Endpoint" @@ -784,7 +788,7 @@ msgid "Field Path" msgstr "Field Path" #: src/renderer/components/+workloads-pods/pod-charts.tsx:14 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:27 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:28 msgid "Filesystem" msgstr "Filesystem" @@ -891,6 +895,7 @@ msgstr "Host: {0}" #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:33 #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:64 #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:76 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:64 msgid "Hostname" msgstr "Hostname" @@ -898,15 +903,19 @@ msgstr "Hostname" msgid "Http01" msgstr "Http01" +#: src/renderer/components/+network-ingresses/ingress-details.tsx:65 +msgid "IP" +msgstr "IP" + #: src/renderer/components/+custom-resources/certmanager.k8s.io/certificate-details.tsx:53 msgid "IP addresses" msgstr "IP addresses" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:44 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:45 msgid "Image" msgstr "Image" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:48 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:49 msgid "ImagePullPolicy" msgstr "ImagePullPolicy" @@ -948,7 +957,7 @@ msgstr "Installation complete!" msgid "Installing..." msgstr "Installing..." -#: src/renderer/components/input/input.validators.ts:43 +#: src/renderer/components/input/input.validators.ts:44 msgid "Invalid account ID" msgstr "Invalid account ID" @@ -1070,10 +1079,10 @@ msgstr "Limited to {0}" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:72 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:115 -#: src/renderer/components/+workloads-pods/container-charts.tsx:37 -#: src/renderer/components/+workloads-pods/container-charts.tsx:61 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:46 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:70 +#: src/renderer/components/+workloads-pods/container-charts.tsx:39 +#: src/renderer/components/+workloads-pods/container-charts.tsx:63 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:48 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:72 msgid "Limits" msgstr "Limits" @@ -1085,14 +1094,18 @@ msgstr "Lines" msgid "Link" msgstr "Link" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:73 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:71 msgid "Liveness" msgstr "Liveness" -#: src/renderer/components/+network-services/service-details.tsx:63 +#: src/renderer/components/+network-services/service-details.tsx:65 msgid "Load Balancer IP" msgstr "Load Balancer IP" +#: src/renderer/components/+network-ingresses/ingress-details.tsx:108 +msgid "Load-Balancer Ingress Points" +msgstr "Load-Balancer Ingress Points" + #: src/renderer/components/app-init/app-init.tsx:43 msgid "Loading" msgstr "Loading" @@ -1142,7 +1155,7 @@ msgstr "Medium" #: src/renderer/components/+nodes/node-details.tsx:80 #: src/renderer/components/+nodes/nodes.tsx:114 #: src/renderer/components/+workloads-pods/pod-charts.tsx:12 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:26 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:27 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:63 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:96 #: src/renderer/components/resource-metrics/resource-metrics-text.tsx:18 @@ -1153,17 +1166,17 @@ msgstr "Memory" msgid "Memory capacity" msgstr "Memory capacity" -#: src/renderer/components/+workloads-pods/container-charts.tsx:62 +#: src/renderer/components/+workloads-pods/container-charts.tsx:64 msgid "Memory limits" msgstr "Memory limits" #: src/renderer/components/+nodes/node-charts.tsx:57 -#: src/renderer/components/+workloads-pods/container-charts.tsx:55 +#: src/renderer/components/+workloads-pods/container-charts.tsx:57 msgid "Memory requests" msgstr "Memory requests" #: src/renderer/components/+nodes/node-charts.tsx:50 -#: src/renderer/components/+workloads-pods/container-charts.tsx:48 +#: src/renderer/components/+workloads-pods/container-charts.tsx:50 msgid "Memory usage" msgstr "Memory usage" @@ -1211,7 +1224,7 @@ msgstr "Mount Options" msgid "Mountable secrets" msgstr "Mountable secrets" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:63 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:61 msgid "Mounts" msgstr "Mounts" @@ -1310,21 +1323,20 @@ msgstr "Names" msgid "Namespace" msgstr "Namespace" -#: src/renderer/components/+namespaces/namespace-select.tsx:98 +#: src/renderer/components/+namespaces/namespace-select.tsx:97 msgid "Namespace: {0}" msgstr "Namespace: {0}" #: src/renderer/components/+namespaces/namespaces.tsx:30 -#: src/renderer/components/app.tsx:36 #: src/renderer/components/layout/sidebar.tsx:85 msgid "Namespaces" msgstr "Namespaces" -#: src/renderer/components/+namespaces/namespace-select.tsx:100 +#: src/renderer/components/+namespaces/namespace-select.tsx:99 msgid "Namespaces: {0}" msgstr "Namespaces: {0}" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:66 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:86 #: src/renderer/components/+workloads-pods/pod-charts.tsx:13 #: src/renderer/components/layout/sidebar.tsx:83 msgid "Network" @@ -1468,11 +1480,12 @@ msgstr "Ok" msgid "Open" msgstr "Open" -#: src/renderer/components/+network-services/service-ports.tsx:49 +#: src/renderer/components/+network-services/service-port-component.tsx:49 +#: src/renderer/components/+workloads-pods/pod-container-port.tsx:51 msgid "Open in a browser" msgstr "Open in a browser" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:63 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:60 #: src/renderer/components/+storage-volume-claims/volume-claim-details.tsx:78 #: src/renderer/components/+workloads-pods/pod-details-tolerations.tsx:17 msgid "Operator" @@ -1573,12 +1586,12 @@ msgid "Port" msgstr "Port" #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:83 -#: src/renderer/components/+network-ingresses/ingress-details.tsx:74 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:94 #: src/renderer/components/+network-policies/network-policy-details.tsx:96 #: src/renderer/components/+network-policies/network-policy-details.tsx:109 #: src/renderer/components/+network-services/service-details.tsx:59 #: src/renderer/components/+network-services/services.tsx:48 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:52 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:53 msgid "Ports" msgstr "Ports" @@ -1608,7 +1621,7 @@ msgstr "QoS" msgid "QoS Class" msgstr "QoS Class" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:55 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:52 msgid "Quotas" msgstr "Quotas" @@ -1624,7 +1637,7 @@ msgstr "Read-only" msgid "Read-only Root Filesystem" msgstr "Read-only Root Filesystem" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:77 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:75 msgid "Readiness" msgstr "Readiness" @@ -1636,7 +1649,7 @@ msgstr "Reason" msgid "Reason: {0} ({1})" msgstr "Reason: {0} ({1})" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:80 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:82 msgid "Receive" msgstr "Receive" @@ -1727,11 +1740,11 @@ msgstr "Repo/Name" msgid "Repository" msgstr "Repository" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:40 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:42 msgid "Request" msgstr "Request" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:41 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:43 msgid "Request duration in seconds" msgstr "Request duration in seconds" @@ -1739,10 +1752,10 @@ msgstr "Request duration in seconds" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:114 #: src/renderer/components/+nodes/node-charts.tsx:32 #: src/renderer/components/+nodes/node-charts.tsx:56 -#: src/renderer/components/+workloads-pods/container-charts.tsx:30 -#: src/renderer/components/+workloads-pods/container-charts.tsx:54 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:39 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:63 +#: src/renderer/components/+workloads-pods/container-charts.tsx:32 +#: src/renderer/components/+workloads-pods/container-charts.tsx:56 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:41 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:65 msgid "Requests" msgstr "Requests" @@ -1798,11 +1811,11 @@ msgstr "ResourceQuota name" msgid "Resources" msgstr "Resources" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:47 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:49 msgid "Response" msgstr "Response" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:48 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:50 msgid "Response duration in seconds" msgstr "Response duration in seconds" @@ -1862,7 +1875,7 @@ msgstr "Rollback <0>{releaseName}" msgid "Rule" msgstr "Rule" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:85 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:105 #: src/renderer/components/+network-ingresses/ingresses.tsx:34 #: src/renderer/components/+user-management-roles/role-details.tsx:25 msgid "Rules" @@ -1908,11 +1921,11 @@ msgstr "Schedule" msgid "Scope" msgstr "Scope" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:60 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:57 msgid "Scope Selector" msgstr "Scope Selector" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:64 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:61 msgid "Scope name" msgstr "Scope name" @@ -1985,7 +1998,7 @@ msgstr "Selector" msgid "Server" msgstr "Server" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:82 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:102 msgid "Service" msgstr "Service" @@ -2003,7 +2016,7 @@ msgstr "Services" msgid "Session Affinity" msgstr "Session Affinity" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:43 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:40 msgid "Set" msgstr "Set" @@ -2017,7 +2030,7 @@ msgid "Shell" msgstr "Shell" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-container-env.tsx:97 +#: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" @@ -2079,7 +2092,7 @@ msgstr "StatefulSets" #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:52 #: src/renderer/components/+storage-volumes/volume-details.tsx:46 #: src/renderer/components/+storage-volumes/volumes.tsx:45 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:38 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:39 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:97 #: src/renderer/components/+workloads-pods/pod-details.tsx:82 #: src/renderer/components/+workloads-pods/pods.tsx:81 @@ -2148,7 +2161,7 @@ msgstr "Supplemental Groups" msgid "Suspend" msgstr "Suspend" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:78 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:98 msgid "TLS" msgstr "TLS" @@ -2177,10 +2190,6 @@ msgstr "There are no logs available." msgid "This field is required" msgstr "This field is required" -#: src/renderer/components/input/input.validators.ts:39 -msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." -msgstr "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." - #: src/renderer/components/+network-policies/network-policy-details.tsx:59 msgid "To" msgstr "To" @@ -2197,7 +2206,7 @@ msgstr "Tokens" msgid "Tolerations" msgstr "Tolerations" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:87 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:89 msgid "Transmit" msgstr "Transmit" @@ -2258,17 +2267,18 @@ msgstr "Upgrade version" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:70 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:113 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:134 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:40 #: src/renderer/components/+nodes/node-charts.tsx:25 #: src/renderer/components/+nodes/node-charts.tsx:49 #: src/renderer/components/+nodes/node-charts.tsx:73 #: src/renderer/components/+nodes/node-charts.tsx:90 #: src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx:24 -#: src/renderer/components/+workloads-pods/container-charts.tsx:23 -#: src/renderer/components/+workloads-pods/container-charts.tsx:47 -#: src/renderer/components/+workloads-pods/container-charts.tsx:71 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:32 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:56 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:97 +#: src/renderer/components/+workloads-pods/container-charts.tsx:25 +#: src/renderer/components/+workloads-pods/container-charts.tsx:49 +#: src/renderer/components/+workloads-pods/container-charts.tsx:73 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:34 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:58 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:99 msgid "Usage" msgstr "Usage" @@ -2277,8 +2287,8 @@ msgid "Use same name for RoleBinding" msgstr "Use same name for RoleBinding" #: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:43 -msgid "Used" -msgstr "Used" +#~ msgid "Used" +#~ msgstr "Used" #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:155 msgid "User" @@ -2296,7 +2306,7 @@ msgstr "Value" #: src/renderer/components/+apps-releases/release-details.tsx:111 #: src/renderer/components/+config-resource-quotas/add-quota-dialog.tsx:132 -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:65 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:62 #: src/renderer/components/+storage-volume-claims/volume-claim-details.tsx:79 msgid "Values" msgstr "Values" @@ -2396,7 +2406,7 @@ msgstr "and <0>{tailCount} more" msgid "cores:" msgstr "cores:" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:41 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:42 msgid "exit code" msgstr "exit code" @@ -2417,11 +2427,11 @@ msgstr "never" msgid "plural" msgstr "plural" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:40 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:41 msgid "ready" msgstr "ready" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:67 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:69 msgid "sec" msgstr "sec" diff --git a/locales/fi/messages.po b/locales/fi/messages.po index 5cfa28d784..e4768400cc 100644 --- a/locales/fi/messages.po +++ b/locales/fi/messages.po @@ -33,6 +33,10 @@ msgstr "" msgid "<0>{0} successfully created" msgstr "" +#: src/renderer/components/input/input.validators.ts:40 +msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." +msgstr "" + #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:80 msgid "API Group" msgstr "" @@ -125,7 +129,7 @@ msgstr "" msgid "All logs" msgstr "" -#: src/renderer/components/+namespaces/namespace-select.tsx:96 +#: src/renderer/components/+namespaces/namespace-select.tsx:95 msgid "All namespaces" msgstr "" @@ -195,7 +199,7 @@ msgstr "" msgid "Are you sure you want to drain <0>{nodeName}?" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:86 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:84 msgid "Arguments" msgstr "" @@ -229,32 +233,32 @@ msgstr "" msgid "Build version" msgstr "" -#: src/renderer/components/+workloads-pods/container-charts.tsx:72 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:98 +#: src/renderer/components/+workloads-pods/container-charts.tsx:74 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:100 msgid "Bytes consumed on this filesystem" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:81 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:83 msgid "Bytes received by all containers" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:31 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:33 msgid "Bytes sent by Ingress controller with error status" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:24 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:26 msgid "Bytes sent by Ingress controller with successful status" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:23 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:25 msgid "Bytes sent, status 2xx" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:30 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:32 msgid "Bytes sent, status 5xx" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:88 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:90 msgid "Bytes transmitted from all containers" msgstr "" @@ -270,7 +274,7 @@ msgstr "" #: src/renderer/components/+nodes/node-details.tsx:79 #: src/renderer/components/+nodes/nodes.tsx:113 #: src/renderer/components/+workloads-pods/pod-charts.tsx:11 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:25 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:26 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:53 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:95 #: src/renderer/components/resource-metrics/resource-metrics-text.tsx:13 @@ -282,17 +286,17 @@ msgid "CPU capacity" msgstr "" #: src/renderer/components/+nodes/node-charts.tsx:26 -#: src/renderer/components/+workloads-pods/container-charts.tsx:24 +#: src/renderer/components/+workloads-pods/container-charts.tsx:26 msgid "CPU cores usage" msgstr "" -#: src/renderer/components/+workloads-pods/container-charts.tsx:38 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:47 +#: src/renderer/components/+workloads-pods/container-charts.tsx:40 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:49 msgid "CPU limits" msgstr "" #: src/renderer/components/+nodes/node-charts.tsx:33 -#: src/renderer/components/+workloads-pods/container-charts.tsx:31 +#: src/renderer/components/+workloads-pods/container-charts.tsx:33 msgid "CPU requests" msgstr "" @@ -364,7 +368,7 @@ msgstr "" msgid "Cloud API Token Secret" msgstr "" -#: src/renderer/components/+namespaces/namespace-select.tsx:44 +#: src/renderer/components/+namespaces/namespace-select.tsx:43 #: src/renderer/components/layout/sidebar.tsx:79 msgid "Cluster" msgstr "" @@ -378,7 +382,7 @@ msgstr "" msgid "Cluster Issuers" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:81 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:79 msgid "Command" msgstr "" @@ -443,23 +447,23 @@ msgstr "" msgid "Container" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:33 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:35 msgid "Container CPU cores usage" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:40 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:42 msgid "Container CPU requests" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:71 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:73 msgid "Container memory limits" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:64 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:66 msgid "Container memory requests" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:57 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:59 msgid "Container memory usage" msgstr "" @@ -690,7 +694,7 @@ msgid "Driver" msgstr "" #: src/renderer/components/+custom-resources/certmanager.k8s.io/certificate-details.tsx:59 -#: src/renderer/components/+network-ingresses/ingress-details.tsx:67 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:87 msgid "Duration" msgstr "" @@ -716,7 +720,7 @@ msgstr "" msgid "Egress" msgstr "" -#: src/renderer/components/+network-services/service-details.tsx:66 +#: src/renderer/components/+network-services/service-details.tsx:68 msgid "Endpoint" msgstr "" @@ -775,7 +779,7 @@ msgid "Field Path" msgstr "" #: src/renderer/components/+workloads-pods/pod-charts.tsx:14 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:27 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:28 msgid "Filesystem" msgstr "" @@ -882,6 +886,7 @@ msgstr "" #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:33 #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:64 #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:76 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:64 msgid "Hostname" msgstr "" @@ -889,15 +894,19 @@ msgstr "" msgid "Http01" msgstr "" +#: src/renderer/components/+network-ingresses/ingress-details.tsx:65 +msgid "IP" +msgstr "" + #: src/renderer/components/+custom-resources/certmanager.k8s.io/certificate-details.tsx:53 msgid "IP addresses" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:44 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:45 msgid "Image" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:48 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:49 msgid "ImagePullPolicy" msgstr "" @@ -939,7 +948,7 @@ msgstr "" msgid "Installing..." msgstr "" -#: src/renderer/components/input/input.validators.ts:43 +#: src/renderer/components/input/input.validators.ts:44 msgid "Invalid account ID" msgstr "" @@ -1061,10 +1070,10 @@ msgstr "" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:72 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:115 -#: src/renderer/components/+workloads-pods/container-charts.tsx:37 -#: src/renderer/components/+workloads-pods/container-charts.tsx:61 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:46 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:70 +#: src/renderer/components/+workloads-pods/container-charts.tsx:39 +#: src/renderer/components/+workloads-pods/container-charts.tsx:63 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:48 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:72 msgid "Limits" msgstr "" @@ -1076,14 +1085,18 @@ msgstr "" msgid "Link" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:73 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:71 msgid "Liveness" msgstr "" -#: src/renderer/components/+network-services/service-details.tsx:63 +#: src/renderer/components/+network-services/service-details.tsx:65 msgid "Load Balancer IP" msgstr "" +#: src/renderer/components/+network-ingresses/ingress-details.tsx:108 +msgid "Load-Balancer Ingress Points" +msgstr "" + #: src/renderer/components/app-init/app-init.tsx:43 msgid "Loading" msgstr "" @@ -1133,7 +1146,7 @@ msgstr "" #: src/renderer/components/+nodes/node-details.tsx:80 #: src/renderer/components/+nodes/nodes.tsx:114 #: src/renderer/components/+workloads-pods/pod-charts.tsx:12 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:26 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:27 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:63 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:96 #: src/renderer/components/resource-metrics/resource-metrics-text.tsx:18 @@ -1144,17 +1157,17 @@ msgstr "" msgid "Memory capacity" msgstr "" -#: src/renderer/components/+workloads-pods/container-charts.tsx:62 +#: src/renderer/components/+workloads-pods/container-charts.tsx:64 msgid "Memory limits" msgstr "" #: src/renderer/components/+nodes/node-charts.tsx:57 -#: src/renderer/components/+workloads-pods/container-charts.tsx:55 +#: src/renderer/components/+workloads-pods/container-charts.tsx:57 msgid "Memory requests" msgstr "" #: src/renderer/components/+nodes/node-charts.tsx:50 -#: src/renderer/components/+workloads-pods/container-charts.tsx:48 +#: src/renderer/components/+workloads-pods/container-charts.tsx:50 msgid "Memory usage" msgstr "" @@ -1202,7 +1215,7 @@ msgstr "" msgid "Mountable secrets" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:63 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:61 msgid "Mounts" msgstr "" @@ -1301,21 +1314,20 @@ msgstr "" msgid "Namespace" msgstr "" -#: src/renderer/components/+namespaces/namespace-select.tsx:98 +#: src/renderer/components/+namespaces/namespace-select.tsx:97 msgid "Namespace: {0}" msgstr "" #: src/renderer/components/+namespaces/namespaces.tsx:30 -#: src/renderer/components/app.tsx:36 #: src/renderer/components/layout/sidebar.tsx:85 msgid "Namespaces" msgstr "" -#: src/renderer/components/+namespaces/namespace-select.tsx:100 +#: src/renderer/components/+namespaces/namespace-select.tsx:99 msgid "Namespaces: {0}" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:66 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:86 #: src/renderer/components/+workloads-pods/pod-charts.tsx:13 #: src/renderer/components/layout/sidebar.tsx:83 msgid "Network" @@ -1451,11 +1463,12 @@ msgstr "" msgid "Open" msgstr "" -#: src/renderer/components/+network-services/service-ports.tsx:49 +#: src/renderer/components/+network-services/service-port-component.tsx:49 +#: src/renderer/components/+workloads-pods/pod-container-port.tsx:51 msgid "Open in a browser" msgstr "" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:63 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:60 #: src/renderer/components/+storage-volume-claims/volume-claim-details.tsx:78 #: src/renderer/components/+workloads-pods/pod-details-tolerations.tsx:17 msgid "Operator" @@ -1556,12 +1569,12 @@ msgid "Port" msgstr "" #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:83 -#: src/renderer/components/+network-ingresses/ingress-details.tsx:74 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:94 #: src/renderer/components/+network-policies/network-policy-details.tsx:96 #: src/renderer/components/+network-policies/network-policy-details.tsx:109 #: src/renderer/components/+network-services/service-details.tsx:59 #: src/renderer/components/+network-services/services.tsx:48 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:52 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:53 msgid "Ports" msgstr "" @@ -1591,7 +1604,7 @@ msgstr "" msgid "QoS Class" msgstr "" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:55 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:52 msgid "Quotas" msgstr "" @@ -1607,7 +1620,7 @@ msgstr "" msgid "Read-only Root Filesystem" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:77 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:75 msgid "Readiness" msgstr "" @@ -1619,7 +1632,7 @@ msgstr "" msgid "Reason: {0} ({1})" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:80 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:82 msgid "Receive" msgstr "" @@ -1710,11 +1723,11 @@ msgstr "" msgid "Repository" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:40 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:42 msgid "Request" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:41 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:43 msgid "Request duration in seconds" msgstr "" @@ -1722,10 +1735,10 @@ msgstr "" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:114 #: src/renderer/components/+nodes/node-charts.tsx:32 #: src/renderer/components/+nodes/node-charts.tsx:56 -#: src/renderer/components/+workloads-pods/container-charts.tsx:30 -#: src/renderer/components/+workloads-pods/container-charts.tsx:54 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:39 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:63 +#: src/renderer/components/+workloads-pods/container-charts.tsx:32 +#: src/renderer/components/+workloads-pods/container-charts.tsx:56 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:41 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:65 msgid "Requests" msgstr "" @@ -1781,11 +1794,11 @@ msgstr "" msgid "Resources" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:47 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:49 msgid "Response" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:48 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:50 msgid "Response duration in seconds" msgstr "" @@ -1845,7 +1858,7 @@ msgstr "" msgid "Rule" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:85 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:105 #: src/renderer/components/+network-ingresses/ingresses.tsx:34 #: src/renderer/components/+user-management-roles/role-details.tsx:25 msgid "Rules" @@ -1891,11 +1904,11 @@ msgstr "" msgid "Scope" msgstr "" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:60 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:57 msgid "Scope Selector" msgstr "" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:64 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:61 msgid "Scope name" msgstr "" @@ -1968,7 +1981,7 @@ msgstr "" msgid "Server" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:82 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:102 msgid "Service" msgstr "" @@ -1986,7 +1999,7 @@ msgstr "" msgid "Session Affinity" msgstr "" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:43 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:40 msgid "Set" msgstr "" @@ -2000,7 +2013,7 @@ msgid "Shell" msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-container-env.tsx:97 +#: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" @@ -2062,7 +2075,7 @@ msgstr "" #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:52 #: src/renderer/components/+storage-volumes/volume-details.tsx:46 #: src/renderer/components/+storage-volumes/volumes.tsx:45 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:38 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:39 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:97 #: src/renderer/components/+workloads-pods/pod-details.tsx:82 #: src/renderer/components/+workloads-pods/pods.tsx:81 @@ -2131,7 +2144,7 @@ msgstr "" msgid "Suspend" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:78 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:98 msgid "TLS" msgstr "" @@ -2160,10 +2173,6 @@ msgstr "" msgid "This field is required" msgstr "" -#: src/renderer/components/input/input.validators.ts:39 -msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." -msgstr "" - #: src/renderer/components/+network-policies/network-policy-details.tsx:59 msgid "To" msgstr "" @@ -2180,7 +2189,7 @@ msgstr "" msgid "Tolerations" msgstr "" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:87 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:89 msgid "Transmit" msgstr "" @@ -2241,17 +2250,18 @@ msgstr "" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:70 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:113 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:134 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:40 #: src/renderer/components/+nodes/node-charts.tsx:25 #: src/renderer/components/+nodes/node-charts.tsx:49 #: src/renderer/components/+nodes/node-charts.tsx:73 #: src/renderer/components/+nodes/node-charts.tsx:90 #: src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx:24 -#: src/renderer/components/+workloads-pods/container-charts.tsx:23 -#: src/renderer/components/+workloads-pods/container-charts.tsx:47 -#: src/renderer/components/+workloads-pods/container-charts.tsx:71 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:32 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:56 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:97 +#: src/renderer/components/+workloads-pods/container-charts.tsx:25 +#: src/renderer/components/+workloads-pods/container-charts.tsx:49 +#: src/renderer/components/+workloads-pods/container-charts.tsx:73 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:34 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:58 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:99 msgid "Usage" msgstr "" @@ -2260,8 +2270,8 @@ msgid "Use same name for RoleBinding" msgstr "" #: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:43 -msgid "Used" -msgstr "" +#~ msgid "Used" +#~ msgstr "" #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:155 msgid "User" @@ -2279,7 +2289,7 @@ msgstr "" #: src/renderer/components/+apps-releases/release-details.tsx:111 #: src/renderer/components/+config-resource-quotas/add-quota-dialog.tsx:132 -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:65 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:62 #: src/renderer/components/+storage-volume-claims/volume-claim-details.tsx:79 msgid "Values" msgstr "" @@ -2379,7 +2389,7 @@ msgstr "" msgid "cores:" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:41 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:42 msgid "exit code" msgstr "" @@ -2400,11 +2410,11 @@ msgstr "" msgid "plural" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:40 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:41 msgid "ready" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:67 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:69 msgid "sec" msgstr "" diff --git a/locales/ru/messages.po b/locales/ru/messages.po index d67fcd9ab1..4480209094 100644 --- a/locales/ru/messages.po +++ b/locales/ru/messages.po @@ -34,6 +34,10 @@ msgstr "<0>Ваш браузер не поддерживает все возмо msgid "<0>{0} successfully created" msgstr "" +#: src/renderer/components/input/input.validators.ts:40 +msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." +msgstr "Это поле может содержать только латинские буквы в нижнем регистре, номера и дефис." + #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:80 msgid "API Group" msgstr "" @@ -126,7 +130,7 @@ msgstr "" msgid "All logs" msgstr "Все логи" -#: src/renderer/components/+namespaces/namespace-select.tsx:96 +#: src/renderer/components/+namespaces/namespace-select.tsx:95 msgid "All namespaces" msgstr "" @@ -196,7 +200,7 @@ msgstr "Приложения" msgid "Are you sure you want to drain <0>{nodeName}?" msgstr "Выполнить команду drain для ноды <0>{nodeName}?" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:86 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:84 msgid "Arguments" msgstr "Аргументы" @@ -230,32 +234,32 @@ msgstr "Привязки" msgid "Build version" msgstr "Версия билда" -#: src/renderer/components/+workloads-pods/container-charts.tsx:72 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:98 +#: src/renderer/components/+workloads-pods/container-charts.tsx:74 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:100 msgid "Bytes consumed on this filesystem" msgstr "Байты, потребляемые в файловой системе" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:81 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:83 msgid "Bytes received by all containers" msgstr "Байты, полученные всеми контейнерами" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:31 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:33 msgid "Bytes sent by Ingress controller with error status" msgstr "Байты, отправленные контроллером доступа (Ingress) со статусом ошибки" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:24 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:26 msgid "Bytes sent by Ingress controller with successful status" msgstr "Байты, отправленные контроллером доступа (Ingress) с успешным статусом" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:23 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:25 msgid "Bytes sent, status 2xx" msgstr "Байты отправлены, статус 2xx" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:30 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:32 msgid "Bytes sent, status 5xx" msgstr "Байты отправлены, статус 5xx" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:88 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:90 msgid "Bytes transmitted from all containers" msgstr "Байты, отправленные всеми контейнерами" @@ -271,7 +275,7 @@ msgstr "CA Bundle" #: src/renderer/components/+nodes/node-details.tsx:79 #: src/renderer/components/+nodes/nodes.tsx:113 #: src/renderer/components/+workloads-pods/pod-charts.tsx:11 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:25 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:26 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:53 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:95 #: src/renderer/components/resource-metrics/resource-metrics-text.tsx:13 @@ -283,17 +287,17 @@ msgid "CPU capacity" msgstr "Мощность процессора" #: src/renderer/components/+nodes/node-charts.tsx:26 -#: src/renderer/components/+workloads-pods/container-charts.tsx:24 +#: src/renderer/components/+workloads-pods/container-charts.tsx:26 msgid "CPU cores usage" msgstr "Использование ядер процессора" -#: src/renderer/components/+workloads-pods/container-charts.tsx:38 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:47 +#: src/renderer/components/+workloads-pods/container-charts.tsx:40 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:49 msgid "CPU limits" msgstr "Лимиты процессора" #: src/renderer/components/+nodes/node-charts.tsx:33 -#: src/renderer/components/+workloads-pods/container-charts.tsx:31 +#: src/renderer/components/+workloads-pods/container-charts.tsx:33 msgid "CPU requests" msgstr "Запросы к процессору" @@ -369,7 +373,7 @@ msgstr "Закрыть (Ctrl+W)" msgid "Cloud API Token Secret" msgstr "Cloud API Token Secret" -#: src/renderer/components/+namespaces/namespace-select.tsx:44 +#: src/renderer/components/+namespaces/namespace-select.tsx:43 #: src/renderer/components/layout/sidebar.tsx:79 msgid "Cluster" msgstr "Кластер" @@ -383,7 +387,7 @@ msgstr "IP-адрес кластера" msgid "Cluster Issuers" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:81 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:79 msgid "Command" msgstr "Команда" @@ -448,23 +452,23 @@ msgstr "Соединение" msgid "Container" msgstr "Контейнер" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:33 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:35 msgid "Container CPU cores usage" msgstr "Использование ядер процессора" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:40 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:42 msgid "Container CPU requests" msgstr "Запросы CPU от контейнеров" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:71 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:73 msgid "Container memory limits" msgstr "Лимиты памяти" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:64 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:66 msgid "Container memory requests" msgstr "Запросы памяти от контейнеров" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:57 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:59 msgid "Container memory usage" msgstr "Использование памяти" @@ -695,7 +699,7 @@ msgid "Driver" msgstr "Драйвер" #: src/renderer/components/+custom-resources/certmanager.k8s.io/certificate-details.tsx:59 -#: src/renderer/components/+network-ingresses/ingress-details.tsx:67 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:87 msgid "Duration" msgstr "Продолжительность" @@ -721,7 +725,7 @@ msgstr "Эффект" msgid "Egress" msgstr "Egress" -#: src/renderer/components/+network-services/service-details.tsx:66 +#: src/renderer/components/+network-services/service-details.tsx:68 msgid "Endpoint" msgstr "" @@ -785,7 +789,7 @@ msgid "Field Path" msgstr "" #: src/renderer/components/+workloads-pods/pod-charts.tsx:14 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:27 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:28 msgid "Filesystem" msgstr "Файловая система" @@ -892,6 +896,7 @@ msgstr "Хост: {0}" #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:33 #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:64 #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:76 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:64 msgid "Hostname" msgstr "" @@ -899,15 +904,19 @@ msgstr "" msgid "Http01" msgstr "Http01" +#: src/renderer/components/+network-ingresses/ingress-details.tsx:65 +msgid "IP" +msgstr "" + #: src/renderer/components/+custom-resources/certmanager.k8s.io/certificate-details.tsx:53 msgid "IP addresses" msgstr "IP-адреса" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:44 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:45 msgid "Image" msgstr "Изображение" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:48 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:49 msgid "ImagePullPolicy" msgstr "ImagePullPolicy" @@ -949,7 +958,7 @@ msgstr "Установка завершена!" msgid "Installing..." msgstr "Установка.." -#: src/renderer/components/input/input.validators.ts:43 +#: src/renderer/components/input/input.validators.ts:44 msgid "Invalid account ID" msgstr "Неверный ID аккаунта" @@ -1071,10 +1080,10 @@ msgstr "" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:72 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:115 -#: src/renderer/components/+workloads-pods/container-charts.tsx:37 -#: src/renderer/components/+workloads-pods/container-charts.tsx:61 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:46 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:70 +#: src/renderer/components/+workloads-pods/container-charts.tsx:39 +#: src/renderer/components/+workloads-pods/container-charts.tsx:63 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:48 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:72 msgid "Limits" msgstr "Лимиты" @@ -1086,14 +1095,18 @@ msgstr "Строки" msgid "Link" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:73 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:71 msgid "Liveness" msgstr "Живучесть" -#: src/renderer/components/+network-services/service-details.tsx:63 +#: src/renderer/components/+network-services/service-details.tsx:65 msgid "Load Balancer IP" msgstr "IP балансировщика нагрузки" +#: src/renderer/components/+network-ingresses/ingress-details.tsx:108 +msgid "Load-Balancer Ingress Points" +msgstr "" + #: src/renderer/components/app-init/app-init.tsx:43 msgid "Loading" msgstr "Загрузка" @@ -1143,7 +1156,7 @@ msgstr "" #: src/renderer/components/+nodes/node-details.tsx:80 #: src/renderer/components/+nodes/nodes.tsx:114 #: src/renderer/components/+workloads-pods/pod-charts.tsx:12 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:26 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:27 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:63 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:96 #: src/renderer/components/resource-metrics/resource-metrics-text.tsx:18 @@ -1154,17 +1167,17 @@ msgstr "Память" msgid "Memory capacity" msgstr "Объем памяти" -#: src/renderer/components/+workloads-pods/container-charts.tsx:62 +#: src/renderer/components/+workloads-pods/container-charts.tsx:64 msgid "Memory limits" msgstr "Лимиты памяти" #: src/renderer/components/+nodes/node-charts.tsx:57 -#: src/renderer/components/+workloads-pods/container-charts.tsx:55 +#: src/renderer/components/+workloads-pods/container-charts.tsx:57 msgid "Memory requests" msgstr "Запросы к памяти" #: src/renderer/components/+nodes/node-charts.tsx:50 -#: src/renderer/components/+workloads-pods/container-charts.tsx:48 +#: src/renderer/components/+workloads-pods/container-charts.tsx:50 msgid "Memory usage" msgstr "Использование памяти" @@ -1212,7 +1225,7 @@ msgstr "Опции монтирования" msgid "Mountable secrets" msgstr "Монтируемые секреты" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:63 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:61 msgid "Mounts" msgstr "Установки" @@ -1311,21 +1324,20 @@ msgstr "" msgid "Namespace" msgstr "Namespace" -#: src/renderer/components/+namespaces/namespace-select.tsx:98 +#: src/renderer/components/+namespaces/namespace-select.tsx:97 msgid "Namespace: {0}" msgstr "Namespace: {0}" #: src/renderer/components/+namespaces/namespaces.tsx:30 -#: src/renderer/components/app.tsx:36 #: src/renderer/components/layout/sidebar.tsx:85 msgid "Namespaces" msgstr "Namespaces" -#: src/renderer/components/+namespaces/namespace-select.tsx:100 +#: src/renderer/components/+namespaces/namespace-select.tsx:99 msgid "Namespaces: {0}" msgstr "Namespaces: {0}" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:66 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:86 #: src/renderer/components/+workloads-pods/pod-charts.tsx:13 #: src/renderer/components/layout/sidebar.tsx:83 msgid "Network" @@ -1469,11 +1481,12 @@ msgstr "Ок" msgid "Open" msgstr "Открыть" -#: src/renderer/components/+network-services/service-ports.tsx:49 +#: src/renderer/components/+network-services/service-port-component.tsx:49 +#: src/renderer/components/+workloads-pods/pod-container-port.tsx:51 msgid "Open in a browser" msgstr "" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:63 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:60 #: src/renderer/components/+storage-volume-claims/volume-claim-details.tsx:78 #: src/renderer/components/+workloads-pods/pod-details-tolerations.tsx:17 msgid "Operator" @@ -1574,12 +1587,12 @@ msgid "Port" msgstr "" #: src/renderer/components/+network-endpoints/endpoint-subset-list.tsx:83 -#: src/renderer/components/+network-ingresses/ingress-details.tsx:74 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:94 #: src/renderer/components/+network-policies/network-policy-details.tsx:96 #: src/renderer/components/+network-policies/network-policy-details.tsx:109 #: src/renderer/components/+network-services/service-details.tsx:59 #: src/renderer/components/+network-services/services.tsx:48 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:52 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:53 msgid "Ports" msgstr "Порты" @@ -1609,7 +1622,7 @@ msgstr "QoS" msgid "QoS Class" msgstr "QoS класс" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:55 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:52 msgid "Quotas" msgstr "Квоты" @@ -1625,7 +1638,7 @@ msgstr "" msgid "Read-only Root Filesystem" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:77 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:75 msgid "Readiness" msgstr "Готовность" @@ -1637,7 +1650,7 @@ msgstr "Причина" msgid "Reason: {0} ({1})" msgstr "Причина: {0} ({1})" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:80 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:82 msgid "Receive" msgstr "Получение" @@ -1728,11 +1741,11 @@ msgstr "Репозиторий/Имя" msgid "Repository" msgstr "Репозиторий" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:40 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:42 msgid "Request" msgstr "Запрос" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:41 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:43 msgid "Request duration in seconds" msgstr "Продолжительность запроса в секундах" @@ -1740,10 +1753,10 @@ msgstr "Продолжительность запроса в секундах" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:114 #: src/renderer/components/+nodes/node-charts.tsx:32 #: src/renderer/components/+nodes/node-charts.tsx:56 -#: src/renderer/components/+workloads-pods/container-charts.tsx:30 -#: src/renderer/components/+workloads-pods/container-charts.tsx:54 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:39 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:63 +#: src/renderer/components/+workloads-pods/container-charts.tsx:32 +#: src/renderer/components/+workloads-pods/container-charts.tsx:56 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:41 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:65 msgid "Requests" msgstr "Запросы" @@ -1799,11 +1812,11 @@ msgstr "Имя квоты ресурса" msgid "Resources" msgstr "Ресурсы" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:47 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:49 msgid "Response" msgstr "Ответ" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:48 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:50 msgid "Response duration in seconds" msgstr "Продолжительность ответа в секундах" @@ -1863,7 +1876,7 @@ msgstr "Откатить <0>{releaseName}" msgid "Rule" msgstr "" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:85 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:105 #: src/renderer/components/+network-ingresses/ingresses.tsx:34 #: src/renderer/components/+user-management-roles/role-details.tsx:25 msgid "Rules" @@ -1909,11 +1922,11 @@ msgstr "Расписание" msgid "Scope" msgstr "" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:60 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:57 msgid "Scope Selector" msgstr "Селектор области" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:64 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:61 msgid "Scope name" msgstr "Имя области" @@ -1986,7 +1999,7 @@ msgstr "Селектор" msgid "Server" msgstr "Сервер" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:82 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:102 msgid "Service" msgstr "Service" @@ -2004,7 +2017,7 @@ msgstr "Services" msgid "Session Affinity" msgstr "Направление сессии" -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:43 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:40 msgid "Set" msgstr "Установлено" @@ -2018,7 +2031,7 @@ msgid "Shell" msgstr "Командная строка" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-container-env.tsx:97 +#: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" @@ -2080,7 +2093,7 @@ msgstr "StatefulSets" #: src/renderer/components/+storage-volume-claims/volume-claims.tsx:52 #: src/renderer/components/+storage-volumes/volume-details.tsx:46 #: src/renderer/components/+storage-volumes/volumes.tsx:45 -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:38 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:39 #: src/renderer/components/+workloads-pods/pod-details-list.tsx:97 #: src/renderer/components/+workloads-pods/pod-details.tsx:82 #: src/renderer/components/+workloads-pods/pods.tsx:81 @@ -2149,7 +2162,7 @@ msgstr "" msgid "Suspend" msgstr "Заморозка" -#: src/renderer/components/+network-ingresses/ingress-details.tsx:78 +#: src/renderer/components/+network-ingresses/ingress-details.tsx:98 msgid "TLS" msgstr "TLS" @@ -2178,10 +2191,6 @@ msgstr "Логи отсутствуют." msgid "This field is required" msgstr "Это обязательное поле" -#: src/renderer/components/input/input.validators.ts:39 -msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." -msgstr "Это поле может содержать только латинские буквы в нижнем регистре, номера и дефис." - #: src/renderer/components/+network-policies/network-policy-details.tsx:59 msgid "To" msgstr "Из" @@ -2198,7 +2207,7 @@ msgstr "Токены" msgid "Tolerations" msgstr "Толерантности" -#: src/renderer/components/+workloads-pods/pod-charts.tsx:87 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:89 msgid "Transmit" msgstr "Транзит" @@ -2259,17 +2268,18 @@ msgstr "Обновить версию" #: src/renderer/components/+cluster/cluster-pie-charts.tsx:70 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:113 #: src/renderer/components/+cluster/cluster-pie-charts.tsx:134 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:40 #: src/renderer/components/+nodes/node-charts.tsx:25 #: src/renderer/components/+nodes/node-charts.tsx:49 #: src/renderer/components/+nodes/node-charts.tsx:73 #: src/renderer/components/+nodes/node-charts.tsx:90 #: src/renderer/components/+storage-volume-claims/volume-claim-disk-chart.tsx:24 -#: src/renderer/components/+workloads-pods/container-charts.tsx:23 -#: src/renderer/components/+workloads-pods/container-charts.tsx:47 -#: src/renderer/components/+workloads-pods/container-charts.tsx:71 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:32 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:56 -#: src/renderer/components/+workloads-pods/pod-charts.tsx:97 +#: src/renderer/components/+workloads-pods/container-charts.tsx:25 +#: src/renderer/components/+workloads-pods/container-charts.tsx:49 +#: src/renderer/components/+workloads-pods/container-charts.tsx:73 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:34 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:58 +#: src/renderer/components/+workloads-pods/pod-charts.tsx:99 msgid "Usage" msgstr "Использование" @@ -2278,8 +2288,8 @@ msgid "Use same name for RoleBinding" msgstr "Использовать тоже имя для привязки ролей" #: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:43 -msgid "Used" -msgstr "Использовано" +#~ msgid "Used" +#~ msgstr "Использовано" #: src/renderer/components/+pod-security-policies/pod-security-policy-details.tsx:155 msgid "User" @@ -2297,7 +2307,7 @@ msgstr "Значение" #: src/renderer/components/+apps-releases/release-details.tsx:111 #: src/renderer/components/+config-resource-quotas/add-quota-dialog.tsx:132 -#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:65 +#: src/renderer/components/+config-resource-quotas/resource-quota-details.tsx:62 #: src/renderer/components/+storage-volume-claims/volume-claim-details.tsx:79 msgid "Values" msgstr "Конфигурация" @@ -2397,7 +2407,7 @@ msgstr "и <0>{tailCount} ещё" msgid "cores:" msgstr "ядер:" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:41 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:42 msgid "exit code" msgstr "код выхода" @@ -2418,11 +2428,11 @@ msgstr "" msgid "plural" msgstr "" -#: src/renderer/components/+workloads-pods/pod-details-container.tsx:40 +#: src/renderer/components/+workloads-pods/pod-details-container.tsx:41 msgid "ready" msgstr "готово" -#: src/renderer/components/+network-ingresses/ingress-charts.tsx:67 +#: src/renderer/components/+network-ingresses/ingress-charts.tsx:69 msgid "sec" msgstr "сек" diff --git a/src/renderer/api/endpoints/ingress.api.ts b/src/renderer/api/endpoints/ingress.api.ts index dc277af04b..f361c24fd7 100644 --- a/src/renderer/api/endpoints/ingress.api.ts +++ b/src/renderer/api/endpoints/ingress.api.ts @@ -25,6 +25,10 @@ export interface IIngressMetrics { responseDurationSeconds: T; } +export interface ILoadBalancerIngress { + hostname?: string; + ip?: string; +} @autobind() export class Ingress extends KubeObject { static kind = "Ingress" @@ -52,7 +56,7 @@ export class Ingress extends KubeObject { } status: { loadBalancer: { - ingress: any[]; + ingress: ILoadBalancerIngress[]; }; } diff --git a/src/renderer/components/+network-ingresses/ingress-details.tsx b/src/renderer/components/+network-ingresses/ingress-details.tsx index 2477ac0a3f..b7fd0d01d0 100644 --- a/src/renderer/components/+network-ingresses/ingress-details.tsx +++ b/src/renderer/components/+network-ingresses/ingress-details.tsx @@ -5,7 +5,7 @@ import { disposeOnUnmount, observer } from "mobx-react"; import { reaction } from "mobx"; import { Trans } from "@lingui/macro"; import { DrawerItem, DrawerTitle } from "../drawer"; -import { Ingress, ingressApi } from "../../api/endpoints"; +import { Ingress, ILoadBalancerIngress, ingressApi } from "../../api/endpoints"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { KubeEventDetails } from "../+events/kube-event-details"; import { ingressStore } from "./ingress.store"; @@ -66,12 +66,35 @@ export class IngressDetails extends React.Component { }) } + renderIngressPoints(ingressPoints: ILoadBalancerIngress[]) { + if (ingressPoints.length === 0) return null + return ( +
+ + + Hostname + IP + + {ingressPoints.map(({hostname, ip}, index) => { + return ( + + {hostname ? hostname : "-"} + {ip ? ip : "-"} + + )}) + }) +
+
+ ) + } + render() { const { object: ingress } = this.props; if (!ingress) { return null; } - const { spec } = ingress; + const { spec, status } = ingress; + const ingressPoints = status?.loadBalancer?.ingress const { metrics } = ingressStore; const metricTabs = [ Network, @@ -102,6 +125,9 @@ export class IngressDetails extends React.Component { Rules}/> {this.renderPaths(ingress)} + Load-Balancer Ingress Points}/> + {this.renderIngressPoints(ingressPoints)} +
)