mirror of https://github.com/rancher/dashboard.git
windowsPathPrefix -> winPathPrefix
This commit is contained in:
parent
0ac575524d
commit
2d8b669ca6
|
|
@ -737,8 +737,8 @@ export default {
|
||||||
const defaultRegistry = this.defaultRegistrySetting?.value || '';
|
const defaultRegistry = this.defaultRegistrySetting?.value || '';
|
||||||
const serverUrl = this.serverUrlSetting?.value || '';
|
const serverUrl = this.serverUrlSetting?.value || '';
|
||||||
const isWindows = cluster.providerOs === 'windows';
|
const isWindows = cluster.providerOs === 'windows';
|
||||||
const pathPrefix = cluster.rancherKubernetesEngineConfig?.pathPrefix || '';
|
const pathPrefix = cluster.spec?.rancherKubernetesEngineConfig?.pathPrefix || '';
|
||||||
const windowsPathPrefix = cluster.rancherKubernetesEngineConfig?.windowsPathPrefix || '';
|
const windowsPathPrefix = cluster.spec?.rancherKubernetesEngineConfig?.winPathPrefix || '';
|
||||||
|
|
||||||
setIfNotSet(cattle, 'clusterId', cluster.id);
|
setIfNotSet(cattle, 'clusterId', cluster.id);
|
||||||
setIfNotSet(cattle, 'clusterName', cluster.nameDisplay);
|
setIfNotSet(cattle, 'clusterName', cluster.nameDisplay);
|
||||||
|
|
@ -770,8 +770,8 @@ export default {
|
||||||
const defaultRegistry = this.defaultRegistrySetting?.value || '';
|
const defaultRegistry = this.defaultRegistrySetting?.value || '';
|
||||||
const serverUrl = this.serverUrlSetting?.value || '';
|
const serverUrl = this.serverUrlSetting?.value || '';
|
||||||
const isWindows = cluster.providerOs === 'windows';
|
const isWindows = cluster.providerOs === 'windows';
|
||||||
const pathPrefix = cluster.rancherKubernetesEngineConfig?.pathPrefix || '';
|
const pathPrefix = cluster.spec?.rancherKubernetesEngineConfig?.pathPrefix || '';
|
||||||
const windowsPathPrefix = cluster.rancherKubernetesEngineConfig?.windowsPathPrefix || '';
|
const windowsPathPrefix = cluster.spec?.rancherKubernetesEngineConfig?.winPathPrefix || '';
|
||||||
|
|
||||||
if ( values.global?.cattle ) {
|
if ( values.global?.cattle ) {
|
||||||
deleteIfEqual(values.global.cattle, 'clusterId', cluster.id);
|
deleteIfEqual(values.global.cattle, 'clusterId', cluster.id);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue