[2.9.5] Fix AKS nodegroup upgrade validation (#12867)

* fix aks version-checking logic * add wait to flaky test
rancher · Dec 12, 2024 · 0a69edb · 0a69edb
1 parent c2c221a
commit 0a69edb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cypress/e2e/tests/pages/explorer/apps/repositories.spec.ts b/cypress/e2e/tests/pages/explorer/apps/repositories.spec.ts
@@ -179,6 +179,7 @@ describe('Apps', () => {
         // Note we're intercepting a more precise url here to avoid any icon requests made from the charts list
         cy.intercept('GET', '/v1/catalog.cattle.io.clusterrepos/rancher-charts?link=info&chartName=rancher-backup&version=*', cy.spy().as('rancherCharts2'));
         ChartPage.navTo(clusterId, 'Rancher Backups');
+        cy.wait(1000);// eslint-disable-line cypress/no-unnecessary-waiting
         chartPage.waitForPage('repo-type=cluster&repo=rancher-charts&chart=rancher-backup');
         // The specific version of the chart (and any other) should NOT be fetched
         cy.wait(1000); // eslint-disable-line cypress/no-unnecessary-waiting

diff --git a/pkg/aks/components/CruAks.vue b/pkg/aks/components/CruAks.vue
@@ -156,7 +156,7 @@ export default defineComponent({
       }
 
       // track original version on edit to ensure we don't offer k8s downgrades
-      const kubernetesVersion = semver.coerce(this.normanCluster?.aksConfig?.kubernetesVersion);
+      const kubernetesVersion = semver.coerce(this.normanCluster?.aksConfig?.kubernetesVersion)?.version;
 
       this.originalVersion = kubernetesVersion;
     } else {