Skip to content

Commit d196984

Browse files
authored
feat: support cluster external name (#3174)
1 parent b2bd79f commit d196984

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

src/containers/Clusters/utils.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export function calculateClusterPath(row: PreparedCluster, activeTab?: ClusterTa
1010
name: clusterName,
1111
clusterDomain,
1212
settings,
13+
clusterExternalName,
1314
} = row;
1415

1516
if (useEmbeddedUi && backend) {
@@ -21,7 +22,10 @@ export function calculateClusterPath(row: PreparedCluster, activeTab?: ClusterTa
2122
activeTab,
2223
environment: settings?.auth_service,
2324
},
24-
{backend, clusterName},
25+
{
26+
backend,
27+
clusterName: clusterDomain && clusterExternalName ? clusterExternalName : clusterName,
28+
},
2529
{withBasename: true},
2630
clusterDomain,
2731
);

src/store/reducers/cluster/parseFields.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ export function parseLoggingUrls(
7070
const settingsSchema = z.object({
7171
use_meta_proxy: z.boolean().optional(),
7272
cluster_domain: z.string().optional(),
73+
cluster_external_name: z.string().optional(),
7374
});
7475

7576
export function parseSettingsField(

src/store/reducers/clusters/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export interface PreparedCluster extends Omit<MetaExtendedClusterInfo, 'settings
66
preparedBackend?: string;
77
settings?: MetaClusterSettings;
88
clusterDomain?: string;
9+
clusterExternalName?: string;
910
}
1011

1112
export interface ClustersFilters {

src/store/reducers/clusters/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export const prepareClustersData = (data: MetaClusters): PreparedCluster[] => {
4242
preparedBackend,
4343
settings: parsedSettings,
4444
clusterDomain,
45+
clusterExternalName: parsedSettings?.cluster_external_name,
4546
};
4647
});
4748
};

src/types/api/meta.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,5 @@ export interface MetaClusterSettings {
9999
use_meta_proxy?: boolean;
100100
auth_service?: string;
101101
cluster_domain?: string;
102+
cluster_external_name?: string;
102103
}

0 commit comments

Comments
 (0)