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

AKS - fix editing imported clusters (#11120) 

* sync upstream hosted provider cluster spec with rancher cluster spec on edit and fix aks authorizedIpRanges watcher

* rm eks upstream sync

* fix syncUpstreamConfig utility
This commit is contained in:
Nancy 2024-06-13 09:10:20 -07:00 committed by GitHub
parent 9fb2c97b20
commit a069ca28b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/aks/components/CruAks.vue
View File

@ -37,7 +37,7 @@ import {
} from '../util/aks';
import { parseTaint } from '../util/taints';
import { diffUpstreamSpec } from '@shell/utils/kontainer';
import { diffUpstreamSpec, syncUpstreamConfig } from '@shell/utils/kontainer';
import {
requiredInCluster,
clusterNameChars,
@ -144,6 +144,12 @@ export default defineComponent({
const liveNormanCluster = await this.value.findNormanCluster();
this.normanCluster = await store.dispatch(`rancher/clone`, { resource: liveNormanCluster });
// ensure any fields editable through this UI that have been altered in azure portal are shown here - see syncUpstreamConfig jsdoc for details
if (!this.isNewOrUnprovisioned) {
syncUpstreamConfig('aks', this.normanCluster);
}
// track original version on edit to ensure we don't offer k8s downgrades
this.originalVersion = this.normanCluster?.aksConfig?.kubernetesVersion;
} else {
@ -736,12 +742,14 @@ export default defineComponent({
}
},
setAuthorizedIpRanges(neu) {
setAuthorizedIPRanges(neu) {
if (neu) {
this.$set(this.config, 'privateCluster', false);
delete this.config.managedIdentity;
delete this.config.privateDnsZone;
delete this.config.userAssignedIdentity;
} else {
this.$set(this.config, 'authorizedIpRanges', []);
}
},

25
shell/utils/kontainer.ts
View File

@ -1,5 +1,28 @@
import { isArray } from '@shell/utils/array';
import { set, get } from '@shell/utils/object';
import { set, get, isEmpty } from '@shell/utils/object';
/**
* This function accepts a v3 cluster object and mutates its config field to sync values that were set outside Rancher (eg, when an imported cluster is created in its respective cloud provider).
* Values configured outside of rancher are not automatically propagated to the config field that the UI edits; they are reflected in the aksStatus/eksStatus/gkeStatus.upstreamSpec field.
* This function works in tandem with diffUpstreamSpec: the former runs when the edit form is initialized and the latter runs when the cluster is saved.
* @param configPrefix one of aks, eks, gke
* @param normanCluster v3 cluster object
*/
export function syncUpstreamConfig(configPrefix: string, normanCluster: {[key: string]: any}): void {
const configKey = `${ configPrefix }Config`;
const statusKey = `${ configPrefix }Status`;
const rancherConfig = normanCluster[configKey] || {};
const upstreamConfig = normanCluster?.[statusKey]?.upstreamSpec || {};
if (!isEmpty(upstreamConfig)) {
Object.keys(upstreamConfig).forEach((key) => {
if (isEmpty(rancherConfig[key]) && !isEmpty(upstreamConfig[key])) {
set(rancherConfig, key, upstreamConfig[key]);
}
});
}
}
/**
* Hosted provider (aks gke eks) edit functionality differs from other k8s resources