hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix envFrom.prefix not being applied

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-05-20 15:21:44 -04:00
parent 9110f9b114
commit 7c04615c10
9 changed files with 113 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/k8s-api/__tests__/pods.test.ts
View File

@ -4,7 +4,7 @@
*/ */
import assert from "assert"; import assert from "assert";
import type { PodContainer, PodContainerStatus } from "../endpoints"; import type { Container, PodContainerStatus } from "../endpoints";
import { Pod } from "../endpoints"; import { Pod } from "../endpoints";
interface GetDummyPodOptions { interface GetDummyPodOptions {
@ -22,8 +22,8 @@ function getDummyPod(rawOpts: GetDummyPodOptions = {}): Pod {
initRunning = 0, initRunning = 0,
} = rawOpts; } = rawOpts;
const containers: PodContainer[] = []; const containers: Container[] = [];
const initContainers: PodContainer[] = []; const initContainers: Container[] = [];
const containerStatuses: PodContainerStatus[] = []; const containerStatuses: PodContainerStatus[] = [];
const initContainerStatuses: PodContainerStatus[] = []; const initContainerStatuses: PodContainerStatus[] = [];
const pod = new Pod({ const pod = new Pod({
@ -58,7 +58,7 @@ function getDummyPod(rawOpts: GetDummyPodOptions = {}): Pod {
containers.push({ containers.push({
image: "dummy", image: "dummy",
imagePullPolicy: "dummy", imagePullPolicy: "Always",
name, name,
}); });
containerStatuses.push({ containerStatuses.push({
@ -80,7 +80,7 @@ function getDummyPod(rawOpts: GetDummyPodOptions = {}): Pod {
containers.push({ containers.push({
image: "dummy", image: "dummy",
imagePullPolicy: "dummy", imagePullPolicy: "Always",
name, name,
}); });
containerStatuses.push({ containerStatuses.push({
@ -105,7 +105,7 @@ function getDummyPod(rawOpts: GetDummyPodOptions = {}): Pod {
initContainers.push({ initContainers.push({
image: "dummy", image: "dummy",
imagePullPolicy: "dummy", imagePullPolicy: "Always",
name, name,
}); });
initContainerStatuses.push({ initContainerStatuses.push({
@ -127,7 +127,7 @@ function getDummyPod(rawOpts: GetDummyPodOptions = {}): Pod {
initContainers.push({ initContainers.push({
image: "dummy", image: "dummy",
imagePullPolicy: "dummy", imagePullPolicy: "Always",
name, name,
}); });
initContainerStatuses.push({ initContainerStatuses.push({
@ -169,7 +169,7 @@ describe("Pods", () => {
function getNamedContainer(name: string) { function getNamedContainer(name: string) {
return { return {
image: "dummy", image: "dummy",
imagePullPolicy: "dummy", imagePullPolicy: "Always",
name, name,
}; };
} }

12
src/common/k8s-api/endpoints/pod.api.ts
View File

@ -16,6 +16,7 @@ import { isDefined } from "../../utils";
import type { PodSecurityContext } from "./types/pod-security-context"; import type { PodSecurityContext } from "./types/pod-security-context";
import type { Probe } from "./types/probe"; import type { Probe } from "./types/probe";
import type { Container } from "./types/container"; import type { Container } from "./types/container";
import type { ObjectFieldSelector, ResourceFieldSelector } from "./types";
export class PodApi extends KubeApi<Pod> { export class PodApi extends KubeApi<Pod> {
constructor(opts: DerivedKubeApiOptions & IgnoredKubeApiOptions = {}) { constructor(opts: DerivedKubeApiOptions & IgnoredKubeApiOptions = {}) {
@ -375,17 +376,6 @@ export interface ConfigMapProjection {
optional?: boolean; optional?: boolean;
} }
export interface ObjectFieldSelector {
fieldPath: string;
apiVersion?: string;
}
export interface ResourceFieldSelector {
resource: string;
containerName?: string;
divisor?: string;
}
export interface DownwardAPIVolumeFile { export interface DownwardAPIVolumeFile {
path: string; path: string;
fieldRef?: ObjectFieldSelector; fieldRef?: ObjectFieldSelector;

2
src/common/k8s-api/endpoints/types/container.ts
View File

@ -98,7 +98,7 @@ export interface Container {
readinessProbe?: Probe; readinessProbe?: Probe;
resources?: ResourceRequirements; resources?: ResourceRequirements;
securityContext: SecurityContext; securityContext?: SecurityContext;
startupProbe?: Probe; startupProbe?: Probe;
/** /**

1
src/common/k8s-api/endpoints/types/index.ts
View File

@ -6,6 +6,7 @@
export * from "./aggregation-rule"; export * from "./aggregation-rule";
export * from "./capabilities"; export * from "./capabilities";
export * from "./container"; export * from "./container";
export * from "./container-port";
export * from "./env-from-source"; export * from "./env-from-source";
export * from "./env-source"; export * from "./env-source";
export * from "./env-var-key-selector"; export * from "./env-var-key-selector";

4
src/renderer/components/+workloads-deployments/scale/dialog.test.tsx
View File

@ -47,8 +47,8 @@ const dummyDeployment = new Deployment({
}, },
}, },
terminationMessagePath: "dummy", terminationMessagePath: "dummy",
terminationMessagePolicy: "dummy", terminationMessagePolicy: "File",
imagePullPolicy: "dummy", imagePullPolicy: "Always",
}], }],
restartPolicy: "dummy", restartPolicy: "dummy",
terminationGracePeriodSeconds: 10, terminationGracePeriodSeconds: 10,

146
src/renderer/components/+workloads-pods/pod-container-env.tsx
View File

@ -7,26 +7,39 @@ import "./pod-container-env.scss";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import type { PodContainer, Secret } from "../../../common/k8s-api/endpoints"; import type { Container, EnvVarKeySelector, Secret } from "../../../common/k8s-api/endpoints";
import { DrawerItem } from "../drawer"; import { DrawerItem } from "../drawer";
import { autorun } from "mobx"; import { autorun } from "mobx";
import { secretStore } from "../+config-secrets/legacy-store";
import { configMapStore } from "../+config-maps/legacy-store";
import { Icon } from "../icon"; import { Icon } from "../icon";
import { base64, cssNames, iter } from "../../utils"; import { base64, cssNames, object } from "../../utils";
import _ from "lodash"; import _ from "lodash";
import { withInjectables } from "@ogre-tools/injectable-react";
import type { ConfigMapStore } from "../+config-maps/store";
import type { SecretStore } from "../+config-secrets/store";
import configMapStoreInjectable from "../+config-maps/store.injectable";
import secretStoreInjectable from "../+config-secrets/store.injectable";
export interface ContainerEnvironmentProps { export interface ContainerEnvironmentProps {
container: PodContainer; container: Container;
namespace: string; namespace: string;
} }
export const ContainerEnvironment = observer((props: ContainerEnvironmentProps) => { interface Dependencies {
const { container: { env, envFrom = [] }, namespace } = props; configMapStore: ConfigMapStore;
secretStore: SecretStore;
}
const NonInjectedContainerEnvironment = observer((props: Dependencies & ContainerEnvironmentProps) => {
const {
container: { env, envFrom = [] },
namespace,
configMapStore,
secretStore,
} = props;
useEffect( () => autorun(() => { useEffect( () => autorun(() => {
for (const { valueFrom } of env ?? []) { for (const { valueFrom } of env ?? []) {
if (valueFrom?.configMapKeyRef) { if (valueFrom?.configMapKeyRef?.name) {
configMapStore.load({ name: valueFrom.configMapKeyRef.name, namespace }); configMapStore.load({ name: valueFrom.configMapKeyRef.name, namespace });
} }
} }
@ -51,27 +64,22 @@ export const ContainerEnvironment = observer((props: ContainerEnvironmentProps)
if (value) { if (value) {
secretValue = value; secretValue = value;
} } else if (valueFrom) {
if (valueFrom) {
const { fieldRef, secretKeyRef, configMapKeyRef } = valueFrom; const { fieldRef, secretKeyRef, configMapKeyRef } = valueFrom;
if (fieldRef) { if (fieldRef) {
const { apiVersion, fieldPath } = fieldRef; const { apiVersion, fieldPath } = fieldRef;
secretValue = `fieldRef(${apiVersion}:${fieldPath})`; secretValue = `fieldRef(${apiVersion}:${fieldPath})`;
} } else if (secretKeyRef?.name) {
if (secretKeyRef) {
secretValue = ( secretValue = (
<SecretKey <SecretKey
reference={secretKeyRef} reference={secretKeyRef}
namespace={namespace} namespace={namespace}
secretStore={secretStore}
/> />
); );
} } else if (configMapKeyRef?.name) {
if (configMapKeyRef) {
const { name, key } = configMapKeyRef; const { name, key } = configMapKeyRef;
const configMap = configMapStore.getByName(name, namespace); const configMap = configMapStore.getByName(name, namespace);
@ -91,60 +99,61 @@ export const ContainerEnvironment = observer((props: ContainerEnvironmentProps)
}); });
}; };
const renderEnvFrom = () => { const renderEnvFrom = () => (
return Array.from(iter.filterFlatMap(envFrom, vars => { envFrom
if (vars.configMapRef?.name) { .flatMap(({ configMapRef, secretRef, prefix }) => {
return renderEnvFromConfigMap(vars.configMapRef.name); if (configMapRef?.name) {
} return renderEnvFromConfigMap(configMapRef.name, prefix);
}
if (vars.secretRef?.name) { if (secretRef?.name) {
return renderEnvFromSecret(vars.secretRef.name); return renderEnvFromSecret(secretRef.name, prefix);
} }
return null; return null;
})); })
}; );
const renderEnvFromConfigMap = (configMapName: string) => { const renderEnvFromConfigMap = (configMapName: string, prefix: string | undefined) => {
const configMap = configMapStore.getByName(configMapName, namespace); const configMap = configMapStore.getByName(configMapName, namespace);
if (!configMap) return null; if (!configMap) return null;
return Object.entries(configMap.data).map(([name, value]) => ( return object.entries(configMap.data)
<div className="variable" key={name}> .map(([name, value]) => (
<span className="var-name">{name}</span> <div className="variable" key={name}>
: <span className="var-name">
{value} {prefix}
</div> {name}
)); </span>
:
{value}
</div>
));
}; };
const renderEnvFromSecret = (secretName: string) => { const renderEnvFromSecret = (secretName: string, prefix: string | undefined) => {
const secret = secretStore.getByName(secretName, namespace); const secret = secretStore.getByName(secretName, namespace);
if (!secret) return null; if (!secret) return null;
return Object.keys(secret.data).map(key => { return Object.keys(secret.data)
const secretKeyRef = { .map(key => (
name: secret.getName(),
key,
};
const value = (
<SecretKey
reference={secretKeyRef}
namespace={namespace}
/>
);
return (
<div className="variable" key={key}> <div className="variable" key={key}>
<span className="var-name">{key}</span> <span className="var-name">
{prefix}
{key}
</span>
: :
{value} <SecretKey
reference={{
name: secret.getName(),
key,
}}
namespace={namespace}
secretStore={secretStore} />
</div> </div>
); ));
});
}; };
return ( return (
@ -155,19 +164,34 @@ export const ContainerEnvironment = observer((props: ContainerEnvironmentProps)
); );
}); });
export interface SecretKeyProps { export const ContainerEnvironment = withInjectables<Dependencies, ContainerEnvironmentProps>(NonInjectedContainerEnvironment, {
reference: { getProps: (di, props) => ({
name: string; ...props,
key: string; configMapStore: di.inject(configMapStoreInjectable),
}; secretStore: di.inject(secretStoreInjectable),
}),
});
interface SecretKeyProps {
reference: EnvVarKeySelector;
namespace: string; namespace: string;
secretStore: SecretStore;
} }
const SecretKey = (props: SecretKeyProps) => { const SecretKey = (props: SecretKeyProps) => {
const { reference: { name, key }, namespace } = props; const {
reference: { name, key },
namespace,
secretStore,
} = props;
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [secret, setSecret] = useState<Secret>(); const [secret, setSecret] = useState<Secret>();
if (!name) {
return null;
}
const showKey = async (evt: React.MouseEvent) => { const showKey = async (evt: React.MouseEvent) => {
evt.preventDefault(); evt.preventDefault();
setLoading(true); setLoading(true);

4
src/renderer/components/+workloads-replicasets/scale-dialog/dialog.test.tsx
View File

@ -43,12 +43,12 @@ const dummyReplicaSet = new ReplicaSet({
containers: [{ containers: [{
name: "dummy", name: "dummy",
image: "dummy", image: "dummy",
imagePullPolicy: "dummy", imagePullPolicy: "Always",
}], }],
initContainers: [{ initContainers: [{
name: "dummy", name: "dummy",
image: "dummy", image: "dummy",
imagePullPolicy: "dummy", imagePullPolicy: "Always",
}], }],
priority: 1, priority: 1,
serviceAccountName: "dummy", serviceAccountName: "dummy",

4
src/renderer/components/__tests__/deployments.store.test.ts
View File

@ -23,8 +23,8 @@ const spec: PodSpec = {
}, },
}, },
terminationMessagePath: "test", terminationMessagePath: "test",
terminationMessagePolicy: "test", terminationMessagePolicy: "File",
imagePullPolicy: "test", imagePullPolicy: "Always",
}], }],
restartPolicy: "restart", restartPolicy: "restart",
terminationGracePeriodSeconds: 1200, terminationGracePeriodSeconds: 1200,

22
src/renderer/components/dock/logs/__test__/pod.mock.ts
View File

@ -22,7 +22,7 @@ export const dockerPod = new Pod({
{ {
name: "docker-exporter", name: "docker-exporter",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
], ],
serviceAccountName: "dummy", serviceAccountName: "dummy",
@ -66,24 +66,24 @@ export const deploymentPod1 = new Pod({
{ {
name: "init-node-exporter", name: "init-node-exporter",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
{ {
name: "init-node-exporter-1", name: "init-node-exporter-1",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
], ],
containers: [ containers: [
{ {
name: "node-exporter", name: "node-exporter",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
{ {
name: "node-exporter-1", name: "node-exporter-1",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
], ],
serviceAccountName: "dummy", serviceAccountName: "dummy",
@ -127,24 +127,24 @@ export const deploymentPod2 = new Pod({
{ {
name: "init-node-exporter", name: "init-node-exporter",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
{ {
name: "init-node-exporter-1", name: "init-node-exporter-1",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
], ],
containers: [ containers: [
{ {
name: "node-exporter", name: "node-exporter",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
{ {
name: "node-exporter-1", name: "node-exporter-1",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
], ],
serviceAccountName: "dummy", serviceAccountName: "dummy",
@ -188,12 +188,12 @@ export const deploymentPod3 = new Pod({
{ {
name: "node-exporter", name: "node-exporter",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
{ {
name: "node-exporter-1", name: "node-exporter-1",
image: "docker.io/prom/node-exporter:v1.0.0-rc.0", image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
imagePullPolicy: "pull", imagePullPolicy: "IfNotPresent",
}, },
], ],
serviceAccountName: "dummy", serviceAccountName: "dummy",