mirror of https://github.com/portainer/portainer
fix showing env var values (#10908)
parent
c7125266f6
commit
7a1893f864
|
@ -73,14 +73,15 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
|
||||||
)
|
)
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{envVar.key ? (
|
{envVar.type !== 'env' &&
|
||||||
|
(envVar.key ? (
|
||||||
<span className="flex items-center">
|
<span className="flex items-center">
|
||||||
<Icon icon={Key} className="!mr-1" />
|
<Icon icon={Key} className="!mr-1" />
|
||||||
{envVar.key}
|
{envVar.key}
|
||||||
</span>
|
</span>
|
||||||
) : (
|
) : (
|
||||||
'-'
|
'-'
|
||||||
)}
|
))}
|
||||||
</td>
|
</td>
|
||||||
<td data-cy="k8sAppDetail-configName">
|
<td data-cy="k8sAppDetail-configName">
|
||||||
{!envVar.resourseName && <span>-</span>}
|
{!envVar.resourseName && <span>-</span>}
|
||||||
|
@ -116,13 +117,14 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type EnvVarType = 'env' | 'configMap' | 'secret';
|
||||||
interface ContainerEnvVar {
|
interface ContainerEnvVar {
|
||||||
key?: string;
|
key?: string;
|
||||||
value?: string;
|
value?: string;
|
||||||
fieldPath?: string;
|
fieldPath?: string;
|
||||||
containerName: string;
|
containerName: string;
|
||||||
isInitContainer: boolean;
|
isInitContainer: boolean;
|
||||||
type: 'configMap' | 'secret';
|
type: EnvVarType;
|
||||||
resourseName: string;
|
resourseName: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -143,17 +145,26 @@ function getApplicationEnvironmentVariables(
|
||||||
const appContainersEnvVars =
|
const appContainersEnvVars =
|
||||||
appContainers?.flatMap((container) => {
|
appContainers?.flatMap((container) => {
|
||||||
const containerEnvVars: ContainerEnvVar[] =
|
const containerEnvVars: ContainerEnvVar[] =
|
||||||
container?.env?.map((envVar) => ({
|
container?.env?.map((envVar) => {
|
||||||
|
let envtype: EnvVarType = 'env';
|
||||||
|
if (envVar?.valueFrom?.configMapKeyRef) {
|
||||||
|
envtype = 'configMap';
|
||||||
|
} else if (envVar?.valueFrom?.secretKeyRef) {
|
||||||
|
envtype = 'secret';
|
||||||
|
}
|
||||||
|
return {
|
||||||
key: envVar?.name,
|
key: envVar?.name,
|
||||||
fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
|
fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
|
||||||
containerName: container.name,
|
containerName: container.name,
|
||||||
isInitContainer: false,
|
isInitContainer: false,
|
||||||
type: envVar?.valueFrom?.configMapKeyRef ? 'configMap' : 'secret',
|
type: envtype,
|
||||||
resourseName:
|
resourseName:
|
||||||
envVar?.valueFrom?.configMapKeyRef?.name ||
|
envVar?.valueFrom?.configMapKeyRef?.name ||
|
||||||
envVar?.valueFrom?.secretKeyRef?.name ||
|
envVar?.valueFrom?.secretKeyRef?.name ||
|
||||||
'',
|
'',
|
||||||
})) || [];
|
value: envVar?.value,
|
||||||
|
};
|
||||||
|
}) || [];
|
||||||
|
|
||||||
const containerEnvFroms: ContainerEnvVar[] =
|
const containerEnvFroms: ContainerEnvVar[] =
|
||||||
container?.envFrom?.map((envFrom) => ({
|
container?.envFrom?.map((envFrom) => ({
|
||||||
|
@ -171,17 +182,26 @@ function getApplicationEnvironmentVariables(
|
||||||
const appInitContainersEnvVars =
|
const appInitContainersEnvVars =
|
||||||
appInitContainers?.flatMap((container) => {
|
appInitContainers?.flatMap((container) => {
|
||||||
const containerEnvVars: ContainerEnvVar[] =
|
const containerEnvVars: ContainerEnvVar[] =
|
||||||
container?.env?.map((envVar) => ({
|
container?.env?.map((envVar) => {
|
||||||
|
let envtype: EnvVarType = 'env';
|
||||||
|
if (envVar?.valueFrom?.configMapKeyRef) {
|
||||||
|
envtype = 'configMap';
|
||||||
|
} else if (envVar?.valueFrom?.secretKeyRef) {
|
||||||
|
envtype = 'secret';
|
||||||
|
}
|
||||||
|
return {
|
||||||
key: envVar?.name,
|
key: envVar?.name,
|
||||||
fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
|
fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
|
||||||
containerName: container.name,
|
containerName: container.name,
|
||||||
isInitContainer: false,
|
isInitContainer: true,
|
||||||
type: envVar?.valueFrom?.configMapKeyRef ? 'configMap' : 'secret',
|
type: envtype,
|
||||||
resourseName:
|
resourseName:
|
||||||
envVar?.valueFrom?.configMapKeyRef?.name ||
|
envVar?.valueFrom?.configMapKeyRef?.name ||
|
||||||
envVar?.valueFrom?.secretKeyRef?.name ||
|
envVar?.valueFrom?.secretKeyRef?.name ||
|
||||||
'',
|
'',
|
||||||
})) || [];
|
value: envVar?.value,
|
||||||
|
};
|
||||||
|
}) || [];
|
||||||
|
|
||||||
const containerEnvFroms: ContainerEnvVar[] =
|
const containerEnvFroms: ContainerEnvVar[] =
|
||||||
container?.envFrom?.map((envFrom) => ({
|
container?.envFrom?.map((envFrom) => ({
|
||||||
|
@ -189,7 +209,7 @@ function getApplicationEnvironmentVariables(
|
||||||
resourseName:
|
resourseName:
|
||||||
envFrom?.configMapRef?.name || envFrom?.secretRef?.name || '',
|
envFrom?.configMapRef?.name || envFrom?.secretRef?.name || '',
|
||||||
containerName: container.name,
|
containerName: container.name,
|
||||||
isInitContainer: false,
|
isInitContainer: true,
|
||||||
type: envFrom?.configMapRef ? 'configMap' : 'secret',
|
type: envFrom?.configMapRef ? 'configMap' : 'secret',
|
||||||
})) || [];
|
})) || [];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue