rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4711 from vincent99/master 

Send cluster resourceLocation
This commit is contained in:
Vincent Fiduccia 2021-07-14 11:56:32 -07:00 committed by GitHub
parent d002210431 d924a9d286
commit 10633c7820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/shared/addon/components/cluster-driver/driver-import-aks/component.js
View File

@ -71,7 +71,10 @@ export default Component.extend(ClusterDriver, {
if (!isEmpty(cluster?.rbacEnabled)) {
set(this, 'rbacEnabled', cluster.rbacEnabled);
}
set(this, 'config.resourceLocation', cluster.resourceLocation);
},
finishAndSelectCloudCredential(cred) {
if (isEmpty(cred)) {
set(this, 'config.azureCredentialSecret', null);
@ -89,17 +92,9 @@ export default Component.extend(ClusterDriver, {
},
async fetchAksResources(cb) {
const {
azureCredentialSecret, tenantId, resourceLocation
} = this.config;
const data = {
cloudCredentialId: azureCredentialSecret,
tenantId,
region: resourceLocation,
};
const url = addQueryParams('/meta/aksClusters', data);
const errors = [];
let step = 2;
const url = addQueryParams('/meta/aksClusters', { cloudCredentialId: this.config.azureCredentialSecret });
const errors = [];
let step = 2;
let allClusters;
set(this, 'loadingClusters', true);
@ -112,10 +107,11 @@ export default Component.extend(ClusterDriver, {
allClusters = (allClusters?.body || []).map((c) => {
return {
label: c?.clusterName,
value: c?.clusterName,
resourceGroup: c?.resourceGroup,
rbacEnabled: c?.rbacEnabled
label: c?.clusterName,
value: c?.clusterName,
resourceGroup: c?.resourceGroup,
rbacEnabled: c?.rbacEnabled,
resourceLocation: c?.location
};
}),