@rancher/shell 3.0.0-rc.8 → 3.0.0

package/config/router/routes.js

@@ -2,7 +2,6 @@ import { NAME as APPS } from '@shell/config/product/apps';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import { CAPI, MANAGEMENT, BACKUP_RESTORE, CIS } from '@shell/config/types';
-import { NAME as MCAPPS, NAME as LEGACY } from '@shell/config/product/multi-cluster-apps';
 import { NAME as AUTH } from '@shell/config/product/auth';
 
 // All these imports are related to the install-redirect.js navigation guard.
@@ -229,12 +228,10 @@ export default [
         path: '/c/:cluster/legacy',
         redirect(to) {
           return {
-            name:   'c-cluster-legacy-pages-page',
+            name:   'c-cluster-legacy-project',
             params: {
               ...(to?.params || {}),
-              cluster: 'local',
-              product: LEGACY,
-              page:    'alerts'
+              product: EXPLORER,
             }
           };
         },
@@ -262,19 +259,6 @@ export default [
           };
         },
         name: 'c-cluster-manager'
-      }, {
-        path: '/c/:cluster/mcapps',
-        redirect(to) {
-          return {
-            name:   'c-cluster-mcapps-pages-page',
-            params: {
-              ...(to?.params || {}),
-              product: MCAPPS,
-              page:    'catalogs'
-            }
-          };
-        },
-        name: 'c-cluster-mcapps'
       }, {
         path:      '/c/:cluster/monitoring',
         component: () => interopDefault(import('@shell/pages/c/_cluster/monitoring/index.vue')),
@@ -381,10 +365,6 @@ export default [
         path:      '/c/:cluster/auth/user.retention',
         component: () => interopDefault(import('@shell/pages/c/_cluster/auth/user.retention/index.vue')),
         name:      'c-cluster-auth-user.retention'
-      }, {
-        path:      '/c/:cluster/legacy/project/pipelines',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/legacy/project/pipelines.vue')),
-        name:      'c-cluster-legacy-project-pipelines'
       }, {
         path:      '/c/:cluster/manager/cloudCredential/create',
         component: () => interopDefault(import('@shell/pages/c/_cluster/manager/cloudCredential/create.vue')),
@@ -437,10 +417,6 @@ export default [
         path:      '/c/:cluster/manager/pages/:page?',
         component: () => interopDefault(import('@shell/pages/c/_cluster/manager/pages/_page.vue')),
         name:      'c-cluster-manager-pages-page'
-      }, {
-        path:      '/c/:cluster/mcapps/pages/:page?',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/mcapps/pages/_page.vue')),
-        name:      'c-cluster-mcapps-pages-page'
       }, {
         path:      '/c/:cluster/monitoring/alertmanagerconfig/:alertmanagerconfigid',
         component: () => interopDefault(import('@shell/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/index.vue')),

package/config/settings.ts

@@ -108,6 +108,7 @@ export const SETTING = {
   USER_LAST_LOGIN_DEFAULT:              'user-last-login-default',
   DISABLE_INACTIVE_USER_AFTER:          'disable-inactive-user-after',
   DELETE_INACTIVE_USER_AFTER:           'delete-inactive-user-after',
+  K3S_UPGRADER_UNINSTALL_CONCURRENCY:   'k3s-based-upgrader-uninstall-concurrency'
 } as const;
 
 // These are the settings that are allowed to be edited via the UI
@@ -165,6 +166,10 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
     options: ['strict', 'system-store'],
     warning: 'agent-tls-mode'
   },
+  [SETTING.K3S_UPGRADER_UNINSTALL_CONCURRENCY]: {
+    kind:    'integer',
+    ruleSet: [{ name: 'minValue', factoryArg: 1 }]
+  }
 };
 
 /**

package/config/version.js

@@ -25,3 +25,5 @@ export function setKubeVersionData(v) {
   // Remove any properties on 'v' we don't want
   _kubeVersionData = JSON.parse(JSON.stringify(v));
 }
+
+export const CURRENT_RANCHER_VERSION = '2.10';

package/detail/catalog.cattle.io.app.vue

@@ -9,7 +9,8 @@ import RelatedResources from '@shell/components/RelatedResources';
 import jsyaml from 'js-yaml';
 import merge from 'lodash/merge';
 import { CATALOG } from '@shell/config/types';
-import { sortBy } from '~shell/utils/sort';
+import { sortBy } from '@shell/utils/sort';
+import { allHash } from '@shell/utils/promise';
 
 export default {
   name: 'DetailRelease',
@@ -30,9 +31,15 @@ export default {
   },
 
   async fetch() {
-    await this.$store.dispatch('catalog/load');
+    const promises = {
+      catalog:       this.$store.dispatch('catalog/load'),
+      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }),
+      secrets:       this.value.fetchValues(true),
+    };
 
-    this.allOperations = await this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION });
+    const res = await allHash(promises);
+
+    this.allOperations = res.allOperations;
   },
 
   computed: {
@@ -45,7 +52,7 @@ export default {
     },
 
     valuesYaml() {
-      const combined = merge(merge({}, this.value?.spec?.chart?.values || {}), this.value?.spec?.values || {});
+      const combined = merge(merge({}, this.value?.chartValues || {}), this.value?.values || {});
 
       return jsyaml.dump(combined);
     },
@@ -95,6 +102,12 @@ export default {
       }
     },
   },
+
+  watch: {
+    'value.secretId'(neu, old) {
+      this.value.fetchValues(true);
+    }
+  },
 };
 </script>
 

package/detail/fleet.cattle.io.cluster.vue

@@ -6,6 +6,7 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
 import { MANAGEMENT, FLEET } from '@shell/config/types';
 import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
+import { allHash } from 'utils/promise';
 
 export default {
   name: 'FleetDetailCluster',
@@ -29,17 +30,18 @@ export default {
 
   async fetch() {
     const clusterId = this.value?.metadata?.labels[FLEET_LABELS.CLUSTER_NAME];
-
-    this.rancherCluster = await this.$store.dispatch('management/find', {
-      type: MANAGEMENT.CLUSTER,
-      id:   clusterId
+    const hash = await allHash({
+      rancherCluster: this.$store.dispatch('management/find', {
+        type: MANAGEMENT.CLUSTER,
+        id:   clusterId
+      }),
+      repos:             this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO }),
+      workspaces:        this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE }),
+      bundleDeployments: this.$store.dispatch('management/findAll', { type: FLEET.BUNDLE_DEPLOYMENT })
     });
 
-    this.allRepos = await this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO });
-
-    await this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE });
-
-    await this.$store.dispatch('management/findAll', { type: FLEET.BUNDLE_DEPLOYMENT });
+    this.rancherCluster = hash.rancherCluster;
+    this.allRepos = hash.repos;
   },
 
   data() {

package/detail/fleet.cattle.io.gitrepo.vue

@@ -42,7 +42,7 @@ export default {
   },
   computed: {
     gitRepoHasClusters() {
-      return this.value?.clusterResourceStatus?.length;
+      return this.value.status.desiredReadyClusters;
     },
     clusterSchema() {
       return this.$store.getters['management/schemaFor'](FLEET.CLUSTER);

package/edit/cis.cattle.io.clusterscan.vue

@@ -12,7 +12,7 @@ import { allHash } from '@shell/utils/promise';
 import { Checkbox } from '@components/Form/Checkbox';
 import { RadioGroup } from '@components/Form/Radio';
 import { get } from '@shell/utils/object';
-import { _VIEW, _CREATE, _EDIT } from '@shell/config/query-params';
+import { _VIEW, _CREATE } from '@shell/config/query-params';
 import { isValidCron } from 'cron-validator';
 import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
 
@@ -43,7 +43,8 @@ export default {
     // in the clusterscan edit/create views the "canBeScheduled" won't run properly
     await this.schema.fetchResourceFields();
 
-    if (this.realMode === _CREATE || this.realMode === _EDIT) {
+    // Only initialize on create or if we don't have a spec object (added for resilience)
+    if (this.realMode === _CREATE || !this.value.spec) {
       const includeScheduling = this.value.canBeScheduled();
       const spec = this.value.spec || {};
 
@@ -326,7 +327,7 @@ export default {
           </div>
           <div class="col span-6">
             <UnitInput
-              v-model.number="scheduledScanConfig.retentionCount"
+              v-model:value="scheduledScanConfig.retentionCount"
               :suffix="t('cis.reports')"
               type="number"
               :mode="mode"

package/edit/cis.cattle.io.clusterscanbenchmark.vue

@@ -18,6 +18,8 @@ export default {
 
   mixins: [createEditView],
 
+  inheritAttrs: false,
+
   props: {
     value: {
       type:    Object,

package/edit/constraints.gatekeeper.sh.constraint/index.vue

@@ -48,6 +48,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  inheritAttrs: false,
+
   props: {
     value: {
       type:     Object,

package/edit/fleet.cattle.io.cluster.vue

@@ -20,6 +20,8 @@ export default {
     NameNsDescription,
   },
 
+  inheritAttrs: false,
+
   mixins: [CreateEditView],
 
   props: {
@@ -53,6 +55,7 @@ export default {
   methods: {
     async save(buttonDone) {
       try {
+        this.errors = [];
         await this.value.save();
 
         await this.normanCluster.save();
@@ -60,6 +63,7 @@ export default {
         this.done();
         buttonDone(true);
       } catch (e) {
+        this.errors.push(e);
         buttonDone(false);
       }
     },

package/edit/fleet.cattle.io.gitrepo.vue

@@ -25,6 +25,7 @@ import { CAPI, CATALOG, FLEET as FLEET_LABELS } from '@shell/config/labels-annot
 import { SECRET_TYPES } from '@shell/config/secret';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
+import FormValidation from '@shell/mixins/form-validation';
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -33,6 +34,8 @@ const _SPECIFY = 'specify';
 export default {
   name: 'CruGitRepo',
 
+  inheritAttrs: false,
+
   emits: ['input'],
 
   components: {
@@ -50,7 +53,7 @@ export default {
     SelectOrCreateAuthSecret,
   },
 
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, FormValidation],
 
   async fetch() {
     const hash = await checkSchemasForFindAllHash({
@@ -153,7 +156,8 @@ export default {
       stepRepoInfo,
       stepTargetInfo,
       addRepositorySteps,
-      displayHelmRepoURLRegex: false
+      displayHelmRepoURLRegex: false,
+      fvFormRuleSets:          [{ path: 'spec.repo', rules: ['required'] }]
     };
   },
 
@@ -253,7 +257,7 @@ export default {
     },
 
     stepOneRequires() {
-      return !!this.value.metadata.name && !!this.refValue;
+      return !!this.value.metadata.name && !!this.refValue && !!this.fvFormIsValid;
     },
   },
 
@@ -265,6 +269,8 @@ export default {
     targetAdvanced:             'updateTargets',
     tlsMode:                    'updateTls',
     caBundle:                   'updateTls',
+    'value.metadata.name':      'stepOneReady',
+    'value.spec.repo':          'stepOneReady',
 
     workspace(neu) {
       if ( this.isCreate ) {
@@ -456,10 +462,6 @@ export default {
       this.tlsMode = event;
     },
 
-    onUpdateRepoName() {
-      this.stepOneReady();
-    },
-
     stepOneReady() {
       this.addRepositorySteps[0]['ready'] = this.stepOneRequires;
     },
@@ -528,7 +530,6 @@ export default {
         :namespaced="false"
         :mode="mode"
         @update:value="$emit('input', $event)"
-        @change="onUpdateRepoName"
       />
 
       <div class="row">
@@ -552,6 +553,8 @@ export default {
             :mode="mode"
             label-key="fleet.gitRepo.repo.label"
             :placeholder="t('fleet.gitRepo.repo.placeholder', null, true)"
+            :required="true"
+            :rules="fvGetAndReportPathRules('spec.repo')"
           />
         </div>
         <div class="col span-6">

package/edit/helm.cattle.io.projecthelmchart.vue

@@ -21,6 +21,8 @@ export default {
 
   mixins: [createEditView],
 
+  inheritAttrs: false,
+
   props: {
     value: {
       type:     Object,

package/edit/k8s.cni.cncf.io.networkattachmentdefinition.vue

@@ -22,6 +22,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  inheritAttrs: false,
+
   props: {
     value: {
       type:     Object,

package/edit/kontainerDriver.vue

@@ -15,6 +15,8 @@ export default {
 
   mixins: [CreateEditView, FormValidation],
 
+  inheritAttrs: false,
+
   data() {
     return {
       fvFormRuleSets: [

package/edit/logging-flow/index.vue

@@ -50,6 +50,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  inheritAttrs: false,
+
   async fetch() {
     const hasAccessToClusterOutputs = this.$store.getters[`cluster/schemaFor`](LOGGING.CLUSTER_OUTPUT);
     const hasAccessToOutputs = this.$store.getters[`cluster/schemaFor`](LOGGING.OUTPUT);

package/edit/management.cattle.io.project.vue

@@ -103,7 +103,8 @@ export default {
     this.value.metadata['namespace'] = this.$store.getters['currentCluster'].id;
     this.value['spec'] = this.value.spec || {};
     this.value.spec['containerDefaultResourceLimit'] = this.value.spec.containerDefaultResourceLimit || {};
-    if (!this.$store.getters['auth/principalId'].includes('local://')) {
+    // norman (and matching steve) resources treat annotations containing `cattle.io` as immutable, so only do this for the create world
+    if (this.isCreate && !this.$store.getters['auth/principalId'].includes('local://')) {
       this.value.metadata.annotations[CREATOR_PRINCIPAL_ID] = this.$store.getters['auth/principalId'];
     }
   },

package/edit/management.cattle.io.projectroletemplatebinding.vue

@@ -11,7 +11,8 @@ export default {
     ProjectMemberEditor,
   },
 
-  mixins: [CreateEditView],
+  mixins:       [CreateEditView],
+  inheritAttrs: false,
   async fetch() {
     await this.$store.dispatch('management/findAll', { type: MANAGEMENT.USER });
     this.projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });

package/edit/management.cattle.io.user.vue

@@ -14,10 +14,13 @@ export default {
   components: {
     ChangePassword, GlobalRoleBindings, CruResource, LabeledInput, Loading
   },
+
   mixins: [
     CreateEditView
   ],
 
+  inheritAttrs: false,
+
   data() {
     const showGlobalRoles = !!this.$store.getters[`management/schemaFor`](MANAGEMENT.GLOBAL_ROLE);
 

package/edit/monitoring.coreos.com.alertmanagerconfig/index.vue

@@ -30,6 +30,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  inheritAttrs: false,
+
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
     const alertmanagerConfigId = this.value.id;

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -105,6 +105,8 @@ export default {
 
   mixins: [CreateEditView, FormValidation],
 
+  inheritAttrs: false,
+
   async fetch() {
     /**
      * example receiver value:

package/edit/monitoring.coreos.com.prometheusrule/AlertingRule.vue

@@ -102,7 +102,7 @@ export default {
           if (isEmpty(this.value?.annotations)) {
             this.value['annotations'] = { summary: '' };
           } else {
-            this.value.annotations['summary'] = '';
+            this.value.annotations = { ...this.value.annotations, summary: '' };
           }
         } else {
           this.value.annotations['summary'] = '';
@@ -124,7 +124,7 @@ export default {
           if (isEmpty(this.value?.annotations)) {
             this.value['annotations'] = { message: '' };
           } else {
-            this.value.annotations['message'] = '';
+            this.value.annotations = { ...this.value.annotations, message: '' };
           }
         } else {
           this.value.annotations['message'] = '';
@@ -146,7 +146,7 @@ export default {
           if (isEmpty(this.value?.annotations)) {
             this.value['annotations'] = { description: '' };
           } else {
-            this.value.annotations['description'] = '';
+            this.value.annotations = { ...this.value.annotations, description: '' };
           }
         } else {
           this.value.annotations['description'] = '';
@@ -168,7 +168,7 @@ export default {
           if (isEmpty(this.value?.annotations)) {
             this.value['annotations'] = { runbook_url: '' };
           } else {
-            this.value.annotations['runbook_url'] = '';
+            this.value.annotations = { ...this.value.annotations, runbook_url: '' };
           }
         } else {
           this.value.annotations['runbook_url'] = '';
@@ -213,7 +213,7 @@ export default {
         return undefined;
       },
       set(v) {
-        this.value['for'] = [null, undefined].includes(v ? undefined : `${ v }s`);
+        this.value['for'] = [null, undefined].includes(v) ? undefined : `${ v }s`;
       }
     }
   },

package/edit/monitoring.coreos.com.prometheusrule/index.vue

@@ -29,6 +29,8 @@ export default {
 
   mixins: [CreateEditView, FormValidation],
 
+  inheritAttrs: false,
+
   props: {
     value: {
       type:     Object,
@@ -111,7 +113,7 @@ export default {
     },
 
     updateGroupInterval(group, interval) {
-      group['interval'] = [null, undefined].includes(interval ? undefined : `${ interval }s`);
+      group['interval'] = [null, undefined].includes(interval) ? undefined : `${ interval }s`;
     },
 
     getGroupInterval(interval) {

package/edit/monitoring.coreos.com.receiver/index.vue

@@ -37,6 +37,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  inheritAttrs: false,
+
   async fetch() {
     await this.$store.dispatch('cluster/findAll', { type: MONITORING.SPOOFED.ROUTE });
   },

package/edit/monitoring.coreos.com.route.vue

@@ -35,6 +35,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  inheritAttrs: false,
+
   async fetch() {
     const receivers = this.$store.dispatch('cluster/findAll', { type: MONITORING.SPOOFED.RECEIVER });
     const routes = this.$store.dispatch('cluster/findAll', { type: MONITORING.SPOOFED.ROUTE });

package/edit/networking.istio.io.destinationrule/index.vue

@@ -24,6 +24,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  inheritAttrs: false,
+
   created() {
     if (!get(this.value, 'spec.trafficPolicy.loadBalancer')) {
       set(this.value, 'spec.trafficPolicy.loadBalancer', { simple: 'ROUND_ROBIN' });

package/edit/nodeDriver.vue

@@ -15,6 +15,8 @@ export default {
 
   mixins: [CreateEditView, FormValidation],
 
+  inheritAttrs: false,
+
   data() {
     return {
       fvFormRuleSets: [

package/edit/provisioning.cattle.io.cluster/__tests__/Advanced.test.ts

@@ -128,6 +128,32 @@ describe('component: Advanced', () => {
 
         expect(checkbox.value).toBe('true');
       });
+
+      it(`should update agentConfig when 'protect-kernel-defaults' exists`, async() => {
+        const value = clone(PROV_CLUSTER);
+
+        value.spec.rkeConfig.machineGlobalConfig['protect-kernel-defaults'] = false;
+        value.spec.rkeConfig.machineSelectorConfig = [{
+          config:               { 'protect-kernel-defaults': true },
+          machineLabelSelector: {}
+        }];
+        value.agentConfig = value.spec.rkeConfig.machineSelectorConfig[0].config;
+
+        mountOptions.propsData.mode = _EDIT; // Use edit mode to allow interactions
+        mountOptions.propsData.value = value;
+
+        wrapper = mount(Advanced, mountOptions);
+
+        const checkboxLabel = wrapper
+          .find(`[data-testid="protect-kernel-defaults"]`)
+          .find('label');
+
+        checkboxLabel.trigger('click');
+        await wrapper.vm.$nextTick();
+
+        // Verify that agentConfig is updated
+        expect(value.spec.rkeConfig.machineSelectorConfig[0].config['protect-kernel-defaults']).toBe(false);
+      });
     });
 
     describe(`'kubelet-arg'`, () => {