diff --git a/app/react/kubernetes/ingresses/IngressDatatable/columns/name.tsx b/app/react/kubernetes/ingresses/IngressDatatable/columns/name.tsx
index f5f7a9e43..5e96da37c 100644
--- a/app/react/kubernetes/ingresses/IngressDatatable/columns/name.tsx
+++ b/app/react/kubernetes/ingresses/IngressDatatable/columns/name.tsx
@@ -1,7 +1,6 @@
import { CellContext } from '@tanstack/react-table';
import { Authorized } from '@/react/hooks/useUser';
-import { isSystemNamespace } from '@/react/kubernetes/namespaces/utils';
import { Link } from '@@/Link';
import { Badge } from '@@/Badge';
@@ -19,7 +18,6 @@ export const name = columnHelper.accessor('Name', {
function Cell({ row, getValue }: CellContext
) {
const name = getValue();
const namespace = row.original.Namespace;
- const isSystemIngress = isSystemNamespace(namespace);
return (
@@ -36,7 +34,7 @@ function Cell({ row, getValue }: CellContext
) {
{name}
- {isSystemIngress && (
+ {row.original.IsSystem && (
System
diff --git a/app/react/kubernetes/ingresses/types.ts b/app/react/kubernetes/ingresses/types.ts
index 48445dbc3..8e9b43484 100644
--- a/app/react/kubernetes/ingresses/types.ts
+++ b/app/react/kubernetes/ingresses/types.ts
@@ -35,6 +35,8 @@ export type Ingress = {
Type?: string;
Labels?: Record;
CreationDate?: string;
+
+ IsSystem?: boolean;
};
export interface DeleteIngressesRequest {
diff --git a/app/react/kubernetes/namespaces/queries/useNamespaceQuery.ts b/app/react/kubernetes/namespaces/queries/useNamespaceQuery.ts
index f9f115b5f..9e158d870 100644
--- a/app/react/kubernetes/namespaces/queries/useNamespaceQuery.ts
+++ b/app/react/kubernetes/namespaces/queries/useNamespaceQuery.ts
@@ -4,7 +4,7 @@ import axios, { parseAxiosError } from '@/portainer/services/axios';
import { notifyError } from '@/portainer/services/notifications';
import { EnvironmentId } from '@/react/portainer/environments/types';
-import { Namespaces } from '../types';
+import { DefaultOrSystemNamespace } from '../types';
export function useNamespaceQuery(
environmentId: EnvironmentId,
@@ -27,7 +27,7 @@ export async function getNamespace(
namespace: string
) {
try {
- const { data: ns } = await axios.get(
+ const { data: ns } = await axios.get(
`kubernetes/${environmentId}/namespaces/${namespace}`
);
return ns;
diff --git a/app/react/kubernetes/namespaces/types.ts b/app/react/kubernetes/namespaces/types.ts
index 20436c306..9ec305647 100644
--- a/app/react/kubernetes/namespaces/types.ts
+++ b/app/react/kubernetes/namespaces/types.ts
@@ -1,6 +1,8 @@
export interface Namespaces {
- [key: string]: {
- IsDefault: boolean;
- IsSystem: boolean;
- };
+ [key: string]: DefaultOrSystemNamespace;
+}
+
+export interface DefaultOrSystemNamespace {
+ IsDefault: boolean;
+ IsSystem: boolean;
}
diff --git a/app/react/kubernetes/namespaces/utils.ts b/app/react/kubernetes/namespaces/utils.ts
deleted file mode 100644
index 92736720b..000000000
--- a/app/react/kubernetes/namespaces/utils.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export const systemNamespaces = [
- 'kube-system',
- 'kube-public',
- 'kube-node-lease',
- 'portainer',
-];
-
-export function isSystemNamespace(namespace: string) {
- return systemNamespaces.includes(namespace || '');
-}
diff --git a/app/react/kubernetes/services/ServicesView/ServicesDatatable/ServicesDatatable.tsx b/app/react/kubernetes/services/ServicesView/ServicesDatatable/ServicesDatatable.tsx
index 21eea4d5a..25ad14305 100644
--- a/app/react/kubernetes/services/ServicesView/ServicesDatatable/ServicesDatatable.tsx
+++ b/app/react/kubernetes/services/ServicesView/ServicesDatatable/ServicesDatatable.tsx
@@ -1,14 +1,15 @@
+import { useMemo } from 'react';
import { Shuffle, Trash2 } from 'lucide-react';
import { useRouter } from '@uirouter/react';
import clsx from 'clsx';
import { Row } from '@tanstack/react-table';
+import { Namespaces } from '@/react/kubernetes/namespaces/types';
import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
import { Authorized, useAuthorizations } from '@/react/hooks/useUser';
import { notifyError, notifySuccess } from '@/portainer/services/notifications';
import { pluralize } from '@/portainer/helpers/strings';
import { DefaultDatatableSettings } from '@/react/kubernetes/datatables/DefaultDatatableSettings';
-import { isSystemNamespace } from '@/react/kubernetes/namespaces/utils';
import { SystemResourceDescription } from '@/react/kubernetes/datatables/SystemResourceDescription';
import { useNamespacesQuery } from '@/react/kubernetes/namespaces/queries/useNamespacesQuery';
@@ -52,12 +53,17 @@ export function ServicesDatatable() {
const filteredServices = services?.filter(
(service) =>
(canAccessSystemResources && tableState.showSystemResources) ||
- !isSystemNamespace(service.Namespace)
+ !namespaces?.[service.Namespace].IsSystem
+ );
+
+ const servicesWithIsSystem = useServicesRowData(
+ filteredServices || [],
+ namespaces
);
return (
row.UID}
- isRowSelectable={(row) => !isSystemNamespace(row.original.Namespace)}
+ isRowSelectable={(row) => !namespaces?.[row.original.Namespace].IsSystem}
disableSelect={readOnly}
renderTableActions={(selectedRows) => (
@@ -87,6 +93,21 @@ export function ServicesDatatable() {
);
}
+// useServicesRowData appends the `isSyetem` property to the service data
+function useServicesRowData(
+ services: Service[],
+ namespaces?: Namespaces
+): Service[] {
+ return useMemo(
+ () =>
+ services.map((service) => ({
+ ...service,
+ IsSystem: namespaces ? namespaces?.[service.Namespace].IsSystem : false,
+ })),
+ [services, namespaces]
+ );
+}
+
// needed to apply custom styling to the row cells and not globally.
// required in the AC's for this ticket.
function servicesRenderRow(row: Row, highlightedItemId?: string) {
diff --git a/app/react/kubernetes/services/ServicesView/ServicesDatatable/columns/name.tsx b/app/react/kubernetes/services/ServicesView/ServicesDatatable/columns/name.tsx
index 6f80a6a74..88c6bdece 100644
--- a/app/react/kubernetes/services/ServicesView/ServicesDatatable/columns/name.tsx
+++ b/app/react/kubernetes/services/ServicesView/ServicesDatatable/columns/name.tsx
@@ -1,5 +1,4 @@
import { Authorized } from '@/react/hooks/useUser';
-import { isSystemNamespace } from '@/react/kubernetes/namespaces/utils';
import { Badge } from '@@/Badge';
@@ -11,13 +10,12 @@ export const name = columnHelper.accessor(
const isExternal =
!row.Labels || !row.Labels['io.portainer.kubernetes.application.owner'];
- const isSystem = isSystemNamespace(row.Namespace);
- if (isExternal && !isSystem) {
+ if (isExternal && !row.IsSystem) {
name = `${name} external`;
}
- if (isSystem) {
+ if (row.IsSystem) {
name = `${name} system`;
}
return name;
@@ -27,7 +25,6 @@ export const name = columnHelper.accessor(
id: 'name',
cell: ({ row }) => {
const name = row.original.Name;
- const isSystem = isSystemNamespace(row.original.Namespace);
const isExternal =
!row.original.Labels ||
@@ -38,13 +35,13 @@ export const name = columnHelper.accessor(
{name}
- {isSystem && (
+ {row.original.IsSystem && (
System
)}
- {isExternal && !isSystem && (
+ {isExternal && !row.original.IsSystem && (
External
)}
diff --git a/app/react/kubernetes/services/types.ts b/app/react/kubernetes/services/types.ts
index 53ec3e514..4b4ceb4ae 100644
--- a/app/react/kubernetes/services/types.ts
+++ b/app/react/kubernetes/services/types.ts
@@ -38,6 +38,8 @@ export type Service = {
ExternalIPs?: Array;
CreationTimestamp: string;
Applications?: Application[];
+
+ IsSystem?: boolean;
};
export type NodeMetrics = {