Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-28 01:39:39 +02:00
Code Issues Releases Activity

fix(app/kubernetes): Fix listing of secrets and configmaps with same name [r8s-288] (#897)

Browse source
This commit is contained in:
James Player 2025-07-16 16:37:59 +12:00 • committed by GitHub
parent 383bcc4113
commit 4e4c5ffdb6
4 changed files with 1316 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationEnvVarsTable.tsx
View file

@ -84,8 +84,8 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
))}
</td>
<td data-cy="k8sAppDetail-configName">
{!envVar.resourseName && <span>-</span>}
{envVar.resourseName && (
{!envVar.resourceName && <span>-</span>}
{envVar.resourceName && (
<span>
<Link
to={
@ -94,17 +94,17 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
: 'kubernetes.secrets.secret'
}
params={{
name: envVar.resourseName,
name: envVar.resourceName,
namespace,
}}
className="flex items-center"
data-cy={`configmap-link-${envVar.resourseName}`}
data-cy={`configmap-link-${envVar.resourceName}`}
>
<Icon
icon={envVar.type === 'configMap' ? FileCode : Lock}
className="!mr-1"
/>
{envVar.resourseName}
{envVar.resourceName}
</Link>
</span>
)}
@ -126,7 +126,7 @@ interface ContainerEnvVar {
containerName: string;
isInitContainer: boolean;
type: EnvVarType;
resourseName: string;
resourceName: string;
}
function getApplicationEnvironmentVariables(
@ -159,7 +159,7 @@ function getApplicationEnvironmentVariables(
containerName: container.name,
isInitContainer: false,
type: envtype,
resourseName:
resourceName:
envVar?.valueFrom?.configMapKeyRef?.name ||
envVar?.valueFrom?.secretKeyRef?.name ||
'',
@ -170,7 +170,7 @@ function getApplicationEnvironmentVariables(
const containerEnvFroms: ContainerEnvVar[] =
container?.envFrom?.map((envFrom) => ({
name: '',
resourseName:
resourceName:
envFrom?.configMapRef?.name || envFrom?.secretRef?.name || '',
containerName: container.name,
isInitContainer: false,
@ -196,7 +196,7 @@ function getApplicationEnvironmentVariables(
containerName: container.name,
isInitContainer: true,
type: envtype,
resourseName:
resourceName:
envVar?.valueFrom?.configMapKeyRef?.name ||
envVar?.valueFrom?.secretKeyRef?.name ||
'',
@ -207,7 +207,7 @@ function getApplicationEnvironmentVariables(
const containerEnvFroms: ContainerEnvVar[] =
container?.envFrom?.map((envFrom) => ({
name: '',
resourseName:
resourceName:
envFrom?.configMapRef?.name || envFrom?.secretRef?.name || '',
containerName: container.name,
isInitContainer: true,