github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix showing env var values (#10908)

pull/10914/head
Prabhat Khera 2024-01-08 08:26:20 +13:00 committed by GitHub
parent c7125266f6
commit 7a1893f864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationEnvVarsTable.tsx
View File

@ -73,14 +73,15 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
)
</span>
)}
{envVar.key ? (
<span className="flex items-center">
<Icon icon={Key} className="!mr-1" />
{envVar.key}
</span>
) : (
'-'
)}
{envVar.type !== 'env' &&
(envVar.key ? (
<span className="flex items-center">
<Icon icon={Key} className="!mr-1" />
{envVar.key}
</span>
) : (
'-'
))}
</td>
<td data-cy="k8sAppDetail-configName">
{!envVar.resourseName && <span>-</span>}
@ -116,13 +117,14 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
);
}
type EnvVarType = 'env' | 'configMap' | 'secret';
interface ContainerEnvVar {
key?: string;
value?: string;
fieldPath?: string;
containerName: string;
isInitContainer: boolean;
type: 'configMap' | 'secret';
type: EnvVarType;
resourseName: string;
}
@ -143,17 +145,26 @@ function getApplicationEnvironmentVariables(
const appContainersEnvVars =
appContainers?.flatMap((container) => {
const containerEnvVars: ContainerEnvVar[] =
container?.env?.map((envVar) => ({
key: envVar?.name,
fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
containerName: container.name,
isInitContainer: false,
type: envVar?.valueFrom?.configMapKeyRef ? 'configMap' : 'secret',
resourseName:
envVar?.valueFrom?.configMapKeyRef?.name ||
envVar?.valueFrom?.secretKeyRef?.name ||
'',
})) || [];
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,
fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
containerName: container.name,
isInitContainer: false,
type: envtype,
resourseName:
envVar?.valueFrom?.configMapKeyRef?.name ||
envVar?.valueFrom?.secretKeyRef?.name ||
'',
value: envVar?.value,
};
}) || [];
const containerEnvFroms: ContainerEnvVar[] =
container?.envFrom?.map((envFrom) => ({
@ -171,17 +182,26 @@ function getApplicationEnvironmentVariables(
const appInitContainersEnvVars =
appInitContainers?.flatMap((container) => {
const containerEnvVars: ContainerEnvVar[] =
container?.env?.map((envVar) => ({
key: envVar?.name,
fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
containerName: container.name,
isInitContainer: false,
type: envVar?.valueFrom?.configMapKeyRef ? 'configMap' : 'secret',
resourseName:
envVar?.valueFrom?.configMapKeyRef?.name ||
envVar?.valueFrom?.secretKeyRef?.name ||
'',
})) || [];
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,
fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
containerName: container.name,
isInitContainer: true,
type: envtype,
resourseName:
envVar?.valueFrom?.configMapKeyRef?.name ||
envVar?.valueFrom?.secretKeyRef?.name ||
'',
value: envVar?.value,
};
}) || [];
const containerEnvFroms: ContainerEnvVar[] =
container?.envFrom?.map((envFrom) => ({
@ -189,7 +209,7 @@ function getApplicationEnvironmentVariables(
resourseName:
envFrom?.configMapRef?.name || envFrom?.secretRef?.name || '',
containerName: container.name,
isInitContainer: false,
isInitContainer: true,
type: envFrom?.configMapRef ? 'configMap' : 'secret',
})) || [];