diff --git a/app/scripts/modules/core/src/help/help.contents.ts b/app/scripts/modules/core/src/help/help.contents.ts index dd73730ea2c..a2796535318 100644 --- a/app/scripts/modules/core/src/help/help.contents.ts +++ b/app/scripts/modules/core/src/help/help.contents.ts @@ -385,9 +385,9 @@ const helpContents: { [key: string]: string } = {

Filters the list of load balancers and server groups (if enabled) to only show load balancers with instances failing the health check for the load balancer.

`, 'project.cluster.stack': - '

(Optional field)

Filters displayed clusters by stack.

Enter * to include all stacks; leave blank to omit any clusters with a stack.

', + '

(Optional field)

Filters displayed clusters by stack.

Enter * to include all stacks; leave blank to omit any clusters with a stack.

Only * is valid for Kubernetes V2 accounts.

', 'project.cluster.detail': - '

(Optional field)

Filters displayed clusters by detail.

Enter * to include all details; leave blank to omit any clusters with a detail.

', + '

(Optional field)

Filters displayed clusters by detail.

Enter * to include all details; leave blank to omit any clusters with a detail.

Only * is valid for Kubernetes V2 accounts.

', 'instanceType.storageOverridden': '

These storage settings have been cloned from the base server group and differ from the default settings for this instance type.

', 'instanceType.unavailable': '

This instance type is not available for the selected configuration.

', diff --git a/app/scripts/modules/core/src/projects/configure/Clusters.tsx b/app/scripts/modules/core/src/projects/configure/Clusters.tsx index f465d104b07..25f20755f0a 100644 --- a/app/scripts/modules/core/src/projects/configure/Clusters.tsx +++ b/app/scripts/modules/core/src/projects/configure/Clusters.tsx @@ -50,6 +50,11 @@ export class Clusters extends React.Component implements IWizard formik.setFieldValue(path, isChecked ? [] : null); } + private areStackAndDetailDisabled(cluster: IProjectCluster): boolean { + const account = this.props.accounts.find(({ name }) => name === cluster.account); + return account.type === 'kubernetes' && account.providerVersion === 'v2'; + } + public render() { const { HelpField } = NgReact; const { accounts } = this.props; @@ -87,6 +92,7 @@ export class Clusters extends React.Component implements IWizard {clusters.map((cluster, idx) => { const clusterPath = `config.clusters[${idx}]`; const applicationsPath = `${clusterPath}.applications`; + const areStackAndDetailDisabled = this.areStackAndDetailDisabled(cluster); return ( @@ -118,14 +124,26 @@ export class Clusters extends React.Component implements IWizard } + input={props => ( + + )} /> } + input={props => ( + + )} />