mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Fix envFrom.prefix not being applied in container's env view (#5434)
This commit is contained in:
1 parent
6ef284560a
commit
bab1b13317
38 files changed
+891
-248
No files matched your search
@@ -22,7 +22,7 @@ export const dockerPod = new Pod({
|
||||
{
|
||||
name: "docker-exporter",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
],
|
||||
serviceAccountName: "dummy",
|
||||
@@ -66,24 +66,24 @@ export const deploymentPod1 = new Pod({
|
||||
{
|
||||
name: "init-node-exporter",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
{
|
||||
name: "init-node-exporter-1",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
],
|
||||
containers: [
|
||||
{
|
||||
name: "node-exporter",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
{
|
||||
name: "node-exporter-1",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
],
|
||||
serviceAccountName: "dummy",
|
||||
@@ -127,24 +127,24 @@ export const deploymentPod2 = new Pod({
|
||||
{
|
||||
name: "init-node-exporter",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
{
|
||||
name: "init-node-exporter-1",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
],
|
||||
containers: [
|
||||
{
|
||||
name: "node-exporter",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
{
|
||||
name: "node-exporter-1",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
],
|
||||
serviceAccountName: "dummy",
|
||||
@@ -188,12 +188,12 @@ export const deploymentPod3 = new Pod({
|
||||
{
|
||||
name: "node-exporter",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
{
|
||||
name: "node-exporter-1",
|
||||
image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
|
||||
imagePullPolicy: "pull",
|
||||
imagePullPolicy: "IfNotPresent",
|
||||
},
|
||||
],
|
||||
serviceAccountName: "dummy",
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import type { PodContainer, Pod } from "../../../../common/k8s-api/endpoints";
|
||||
import type { Container, Pod } from "../../../../common/k8s-api/endpoints";
|
||||
import type { TabId } from "../dock/store";
|
||||
import createLogsTabInjectable from "./create-logs-tab.injectable";
|
||||
|
||||
export interface PodLogsTabData {
|
||||
selectedPod: Pod;
|
||||
selectedContainer: PodContainer;
|
||||
selectedContainer: Container;
|
||||
}
|
||||
|
||||
const createPodLogsTabInjectable = getInjectable({
|
||||
|
||||
@@ -12,7 +12,7 @@ import { Badge } from "../../badge";
|
||||
import type { SelectOption } from "../../select";
|
||||
import { Select } from "../../select";
|
||||
import type { LogTabViewModel } from "./logs-view-model";
|
||||
import type { PodContainer, Pod } from "../../../../common/k8s-api/endpoints";
|
||||
import type { Container, Pod } from "../../../../common/k8s-api/endpoints";
|
||||
import type { SingleValue } from "react-select";
|
||||
|
||||
export interface LogResourceSelectorProps {
|
||||
@@ -40,7 +40,7 @@ export const LogResourceSelector = observer(({ model }: LogResourceSelectorProps
|
||||
}));
|
||||
const allContainers = pod.getAllContainers();
|
||||
const container = allContainers.find(container => container.name === selectedContainer) ?? null;
|
||||
const onContainerChange = (option: SingleValue<SelectOption<PodContainer>>) => {
|
||||
const onContainerChange = (option: SingleValue<SelectOption<Container>>) => {
|
||||
if (!option) {
|
||||
return;
|
||||
}
|
||||
@@ -105,7 +105,7 @@ export const LogResourceSelector = observer(({ model }: LogResourceSelectorProps
|
||||
menuClass="pod-selector-menu"
|
||||
/>
|
||||
<span>Container</span>
|
||||
<Select<PodContainer, SelectOption<PodContainer>, false>
|
||||
<Select<Container, SelectOption<Container>, false>
|
||||
id="container-selector-input"
|
||||
options={containerSelectOptions}
|
||||
value={container}
|
||||
|
||||
Reference in new issue
Block a user