@rancher/shell 3.0.5-rc.8 → 3.0.5-rc.9

package/edit/cloudcredential.vue

@@ -14,8 +14,6 @@ import SelectIconGrid from '@shell/components/SelectIconGrid';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
 import { set } from '@shell/utils/object';
-import { mapFeature, RKE2 as RKE2_FEATURE } from '@shell/store/features';
-import { rke1Supports } from '@shell/store/plugins';
 
 export default {
   name: 'CruCloudCredential',
@@ -35,7 +33,7 @@ export default {
   async fetch() {
     this.nodeDrivers = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_DRIVER });
     this.kontainerDrivers = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.KONTAINER_DRIVER });
-
+    this.extensions = this.getExtensions();
     // Force reload the cloud cred schema and any missing subtypes because there aren't change events sent when drivers come/go
     try {
       const schema = await this.$store.dispatch('rancher/find', {
@@ -87,7 +85,8 @@ export default {
       credCustomComponentValidation: false,
       nameRequiredValidation:        false,
       nodeDrivers:                   null,
-      kontainerDrivers:              null
+      kontainerDrivers:              null,
+      extensions:                    null
     };
   },
 
@@ -98,12 +97,9 @@ export default {
   },
 
   computed: {
-    rke2Enabled: mapFeature(RKE2_FEATURE),
 
     hasCustomCloudCredentialComponent() {
-      const driverName = this.driverName;
-
-      return this.$store.getters['type-map/hasCustomCloudCredentialComponent'](driverName);
+      return this.getCustomCloudCredentialComponent(this.driverName);
     },
 
     cloudCredentialComponent() {
@@ -140,15 +136,14 @@ export default {
     secretSubTypes() {
       const out = [];
 
-      const drivers = [...this.nodeDrivers, ...this.kontainerDrivers]
+      const fromDrivers = [...this.nodeDrivers, ...this.kontainerDrivers]
         .filter((x) => x.spec.active && x.id !== 'rancherkubernetesengine')
         .map((x) => x.spec.displayName || x.id);
 
-      let types = uniq(drivers.map((x) => this.$store.getters['plugins/credentialDriverFor'](x)));
+      const fromExtensions = this.extensions?.filter((x) => !!this.getCustomCloudCredentialComponent(x?.id)).map((x) => x?.id) || [];
+      const providers = [...fromDrivers, ...fromExtensions];
 
-      if ( !this.rke2Enabled ) {
-        types = types.filter((x) => rke1Supports.includes(x));
-      }
+      let types = uniq(providers.map((x) => this.$store.getters['plugins/credentialDriverFor'](x)));
 
       const schema = this.$store.getters['rancher/schemaFor'](NORMAN.CLOUD_CREDENTIAL);
 
@@ -178,7 +173,7 @@ export default {
       for ( const id of types ) {
         let bannerAbbrv;
 
-        let bannerImage = this.$store.app.$plugin.getDynamic('image', `providers/${ id }.svg`);
+        let bannerImage = this.$store.app.$extension.getDynamic('image', `providers/${ id }.svg`);
 
         if (!bannerImage) {
           try {
@@ -191,7 +186,7 @@ export default {
 
         out.push({
           id,
-          label: this.typeDisplay(CAPI.CREDENTIAL_DRIVER, id),
+          label: this.typeDisplay(id),
           bannerImage,
           bannerAbbrv
         });
@@ -214,6 +209,25 @@ export default {
       this.credCustomComponentValidation = passed;
     },
 
+    getExtensions() {
+      const context = {
+        dispatch:   this.$store.dispatch,
+        getters:    this.$store.getters,
+        axios:      this.$store.$axios,
+        $extension: this.$store.app.$extension,
+        t:          (...args) => this.t.apply(this, args),
+        isCreate:   this.isCreate,
+        isEdit:     this.isEdit,
+        isView:     this.isView,
+      };
+
+      return this.$extension.getProviders(context);
+    },
+
+    getCustomCloudCredentialComponent(driverName) {
+      return this.$store.getters['type-map/hasCustomCloudCredentialComponent'](driverName);
+    },
+
     async saveCredential(btnCb) {
       if ( this.errors ) {
         clear(this.errors);
@@ -266,10 +280,10 @@ export default {
       }
 
       this.value['_type'] = type;
-      this.$emit('set-subtype', this.typeDisplay(type, driver));
+      this.$emit('set-subtype', this.typeDisplay(driver));
     },
 
-    typeDisplay(type, driver) {
+    typeDisplay(driver) {
       return this.$store.getters['i18n/withFallback'](`cluster.provider."${ driver }"`, null, driver);
     },
 

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

@@ -17,6 +17,7 @@ import { saferDump } from '@shell/utils/create-yaml';
 import NamespaceList, { NAMESPACE_FILTERS_HELPER } from './NamespaceList';
 import MatchKinds from './MatchKinds';
 import Scope, { SCOPE_OPTIONS } from './Scope';
+import Banner from '@components/Banner/Banner';
 
 function findConstraintTypes(schemas) {
   return schemas
@@ -43,7 +44,8 @@ export default {
     Scope,
     Tab,
     Tabbed,
-    YamlEditor
+    YamlEditor,
+    Banner
   },
 
   mixins: [CreateEditView],
@@ -230,11 +232,17 @@ export default {
 };
 </script>
 <template>
+  <Banner
+    v-if="templateSubtypes.length === 0"
+    color="warning"
+  >
+    {{ t('gatekeeperConstraint.templateRequired') }}
+  </Banner>
   <CruResource
+    v-else
     :done-route="doneRoute"
     :mode="mode"
     :resource="value"
-    :selected-subtype="value.kind"
     :subtypes="templateSubtypes"
     :validation-passed="true"
     :errors="errors"

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

@@ -56,10 +56,14 @@ export default {
     async save(buttonDone) {
       try {
         this.errors = [];
+
         await this.value.save();
 
         await this.normanCluster.save();
 
+        // Changes (such as labels or annotations fields) to normanCluster are reflected in the fleet cluster via Rancher services, so wait for that to occur
+        await this.waitForFleetClusterLastRevision();
+
         this.done();
         buttonDone(true);
       } catch (e) {
@@ -67,6 +71,21 @@ export default {
         buttonDone(false);
       }
     },
+
+    async waitForFleetClusterLastRevision() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      const currRev = this.value?.metadata?.resourceVersion;
+
+      try {
+        return await this.value.waitForTestFn(() => {
+          const rev = this.$store.getters[`${ inStore }/byId`](this.value.type, this.value.id)?.metadata?.resourceVersion;
+
+          return currRev && currRev !== rev;
+        }, `${ this.value.id } - wait for resourceVersion to change`, 1000, 200);
+      } catch (e) {
+      }
+    }
   },
 };
 </script>

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

@@ -58,25 +58,26 @@ export default {
   mixins: [CreateEditView, FormValidation],
 
   async fetch() {
-    let tls = _VERIFY;
+    this.currentUser = await this.value.getCurrentUser();
+  },
+
+  data() {
+    let tlsMode = _VERIFY;
+    let caBundle = null;
 
     if ( this.value.spec.insecureSkipTLSVerify ) {
-      tls = _SKIP;
+      tlsMode = _SKIP;
     } else if ( this.value.spec.caBundle ) {
       try {
-        this.caBundle = base64Decode(this.value.spec.caBundle);
-        tls = _SPECIFY;
+        caBundle = base64Decode(this.value.spec.caBundle);
+        tlsMode = _SPECIFY;
       } catch (e) {
         // Hmm...
       }
     }
 
-    this.tlsMode = tls;
-
-    this.correctDriftEnabled = this.value.spec?.correctDrift?.enabled || false;
-  },
+    const correctDriftEnabled = this.value.spec?.correctDrift?.enabled || false;
 
-  data() {
     let pollingInterval = toSeconds(this.value.spec.pollingInterval) || this.value.spec.pollingInterval;
 
     if (!pollingInterval) {
@@ -92,14 +93,15 @@ export default {
     const refValue = this.value.spec?.[ref] || '';
 
     return {
+      currentUser:             {},
       tempCachedValues:        {},
       username:                null,
       password:                null,
       publicKey:               null,
       privateKey:              null,
-      tlsMode:                 null,
-      caBundle:                null,
-      correctDriftEnabled:     false,
+      caBundle,
+      tlsMode,
+      correctDriftEnabled,
       pollingInterval,
       ref,
       refValue,
@@ -179,8 +181,14 @@ export default {
   },
 
   watch: {
-    tlsMode:  'updateTls',
-    caBundle: 'updateTls',
+    tlsMode: {
+      handler:   'updateTls',
+      immediate: true
+    },
+    caBundle: {
+      handler:   'updateTls',
+      immediate: true
+    },
 
     workspace(neu) {
       if ( this.isCreate ) {
@@ -406,8 +414,7 @@ export default {
       this.value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
 
       if (this.mode === _CREATE) {
-        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_ID] = this.value.currentUser.id;
-        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_NAME] = this.value.currentUser.username;
+        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_ID] = this.currentUser.id;
       }
     },
 

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

@@ -34,23 +34,24 @@ export default {
 
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
-    const alertmanagerConfigId = this.value.id;
-
-    const { receiverSchema, routeSchema } = await fetchAlertManagerConfigSpecs(this.$store);
+    const { receiverSchema } = await fetchAlertManagerConfigSpecs(this.$store);
 
     this.receiverSchema = receiverSchema;
-    this.routeSchema = routeSchema;
 
-    const alertmanagerConfigResource = await this.$store.dispatch(`${ inStore }/find`, { type: MONITORING.ALERTMANAGERCONFIG, id: alertmanagerConfigId });
+    // The edit page is (mis)used as the detail page. When it's in create world none of the below is valid (there's no existing resource)
+    if (!this.isCreate) {
+      const alertmanagerConfigResource = await this.$store.dispatch(`${ inStore }/find`, { type: MONITORING.ALERTMANAGERCONFIG, id: this.value.id });
+
+      this.alertmanagerConfigId = this.value.id;
+      this.alertmanagerConfigResource = alertmanagerConfigResource;
 
-    this.alertmanagerConfigId = alertmanagerConfigId;
-    this.alertmanagerConfigResource = alertmanagerConfigResource;
-    this.alertmanagerConfigDetailRoute = alertmanagerConfigResource?._detailLocation;
+      this.alertmanagerConfigDetailRoute = alertmanagerConfigResource._detailLocation;
 
-    const alertmanagerConfigActions = alertmanagerConfigResource.availableActions;
-    const receiverActions = alertmanagerConfigResource.getReceiverActions(alertmanagerConfigActions);
+      const alertmanagerConfigActions = alertmanagerConfigResource.availableActions;
+      const receiverActions = alertmanagerConfigResource.getReceiverActions(alertmanagerConfigActions);
 
-    this.receiverActions = receiverActions;
+      this.receiverActions = receiverActions;
+    }
   },
 
   data() {

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

@@ -128,6 +128,16 @@ export default {
     const expectedFields = Object.keys(receiverSchema.resourceFields);
     const suffix = {};
 
+    // Values contains multiple receivers of two types
+    // 1. Known (expected, from schema) shown in their own tabs with explicity forms
+    // 2. unknown (not expected, missing in schema) shown as a yaml blob
+
+    // - expectedFields and suffixYaml are only used if the receiver is of type `custom`
+    // - expectedFields are the known types
+    // - suffixYaml are the unknown types
+    // - usages,
+    //   - for custom, we need to know only the unknown / yaml blog. so suffixYaml is created by extracting all known (expectedFields) from value
+    //   - on edit of custom we then combine the two again and save to value
     Object.keys(this.value).forEach((key) => {
       if (!expectedFields.includes(key)) {
         suffix[key] = this.value[key];
@@ -195,7 +205,7 @@ export default {
       return {
         duplicateName: () => {
           const receiversArray = this.alertmanagerConfigResource.spec.receivers;
-          const receiverNamesArray = receiversArray.map((R) => R.name);
+          const receiverNamesArray = receiversArray?.map((R) => R.name) || [];
           const receiversSet = new Set(receiverNamesArray);
 
           if (receiversArray.length !== receiversSet.size) {

package/edit/provisioning.cattle.io.cluster/index.vue

@@ -149,25 +149,20 @@ export default {
     });
 
     // Custom Providers from extensions - initialize each with the store and the i18n service
-    // Wrap in try ... catch, to prevent errors in an extension breaking the page
-    try {
-      const extensionClasses = this.$plugin.listDynamic('provisioner').map((name) => this.$plugin.getDynamic('provisioner', name));
-
-      // We can't pass in this.$store as this leads to a circular-reference that causes Vue to freeze,
-      // so pass in specific services that the provisioner extension may need
-      this.extensions = extensionClasses.map((c) => new c({
-        dispatch: this.$store.dispatch,
-        getters:  this.$store.getters,
-        axios:    this.$store.$axios,
-        $plugin:  this.$store.app.$plugin,
-        t:        (...args) => this.t.apply(this, args),
-        isCreate: this.isCreate,
-        isEdit:   this.isEdit,
-        isView:   this.isView,
-      }));
-    } catch (e) {
-      console.error('Error loading provisioner(s) from extensions', e); // eslint-disable-line no-console
-    }
+    // We can't pass in this.$store as this leads to a circular-reference that causes Vue to freeze,
+    // so pass in specific services that the provisioner extension may need
+    const context = {
+      dispatch:   this.$store.dispatch,
+      getters:    this.$store.getters,
+      axios:      this.$store.$axios,
+      $extension: this.$store.app.$extension,
+      t:          (...args) => this.t.apply(this, args),
+      isCreate:   this.isCreate,
+      isEdit:     this.isEdit,
+      isView:     this.isView,
+    };
+
+    this.extensions = this.$extension.getProviders(context);
   },
 
   data() {

package/edit/provisioning.cattle.io.cluster/rke2.vue

@@ -221,6 +221,8 @@ export default {
   },
 
   data() {
+    const isGoogle = this.provider === GOOGLE;
+
     return {
       loadedOnce:                      false,
       lastIdx:                         0,
@@ -270,7 +272,8 @@ export default {
       clusterAgentDefaultPC:                    null,
       clusterAgentDefaultPDB:                   null,
       activeTab:                                null,
-      isAuthenticated:                          this.provider !== GOOGLE || this.mode === _EDIT,
+      isGoogle,
+      isAuthenticated:                          !isGoogle || this.mode === _EDIT,
       projectId:                                null,
       REGISTRIES_TAB_NAME,
       labelForAddon,
@@ -861,7 +864,7 @@ export default {
       }
     },
     hideFooter() {
-      return this.needCredential && !this.credential;
+      return this.needCredential && !this.credentialId;
     },
 
     overallFormValidationPassed() {
@@ -1029,6 +1032,9 @@ export default {
 
       if (!this.machinePools) {
         await this.initMachinePools(this.value.spec.rkeConfig.machinePools);
+        if (this.isEdit && this.isGoogle && this.machinePools?.length > 0 && this.machinePools[0]?.config?.project) {
+          this.projectId = this.machinePools[0]?.config?.project;
+        }
         if (this.mode === _CREATE && !this.machinePools.length) {
           await this.addMachinePool();
         }
@@ -1437,6 +1443,8 @@ export default {
           entry.pool.machineConfigRef.name = neu.metadata.name;
           entry.create = false;
           entry.update = true;
+
+          this.initialMachinePoolsValues[entry.config.id] = clone(neu);
         } else if (entry.update) {
           entry.config = await entry.config.save();
         }
@@ -2219,7 +2227,7 @@ export default {
     </div>
     <AccountAccess
       v-if="!isAuthenticated"
-      v-model:credential="credential"
+      v-model:credential="credentialId"
       v-model:project="projectId"
       v-model:is-authenticated="isAuthenticated"
       :mode="mode"

package/edit/resources.cattle.io.restore.vue

@@ -159,19 +159,16 @@ export default {
       if (neu === 'useDefault') {
         delete this.value.spec.storageLocation;
         delete this.value.spec.backupFilename;
-      } else if (!this.value.spec.storageLocation && neu === 'configureS3') {
-        this.value.spec['storageLocation'] = { s3: {} };
-        this.s3 = this.value.spec.storageLocation.s3;
-      }
-      if (neu === 'useBackup') {
+        this.s3 = {};
+      } else if (neu === 'configureS3') {
+        this.s3 = this.value.spec.storageLocation?.s3 || {};
+        this.value.spec.storageLocation = { s3: this.s3 };
+      } else if (neu === 'useBackup') {
         delete this.value.spec.storageLocation;
 
         if (this.availableBackups.length === 1) {
           this.updateTargetBackup(this.availableBackups[0]);
         }
-      } else {
-        delete this.value.spec.backupFilename;
-        this.value.spec.storageLocation = { s3: this.s3 };
       }
     },
 

package/list/__tests__/workload.test.ts

@@ -37,6 +37,7 @@ describe('component: workload', () => {
               'prefs/get':                   () => resource,
               'cluster/schemaFor':           () => {},
               'cluster/all':                 () => [{}],
+              'features/get':                () => false,
             }
           },
           $fetchState: {

package/list/workload.vue

@@ -5,6 +5,7 @@ import {
 } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+import { STEVE_CACHE } from '@shell/store/features';
 
 const workloadSchema = {
   id:         'workload',
@@ -84,11 +85,17 @@ export default {
   },
 
   data() {
+    const allTypes = this.$route.params.resource === workloadSchema.id;
+
+    if (allTypes && this.$store.getters['features/get'](STEVE_CACHE)) {
+      this.$store.dispatch('loadingError', new Error(this.t('nav.failWhale.resourceListNotFound', { resource: workloadSchema.id }, true)));
+
+      return;
+    }
     // Ensure these are set on load (to determine if the NS filter is required) rather than too late on `fetch`
     const { loadResources, loadIndeterminate } = $loadingResources(this.$route, this.$store);
 
     const { params:{ resource: type } } = this.$route;
-    const allTypes = this.$route.params.resource === workloadSchema.id;
     const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
     const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type });
 

package/machine-config/components/GCEImage.vue

@@ -43,6 +43,10 @@ export default {
       type:    String,
       default: _CREATE,
     },
+    poolCreateMode: {
+      type:    Boolean,
+      default: true
+    },
     location: {
       type:     Object,
       required: true
@@ -85,7 +89,7 @@ export default {
   },
   created() {
     this.debouncedLoadFamilies = debounce(this.getFamilies, 500);
-    if (this.mode !== _CREATE) {
+    if (!this.poolCreateMode) {
       this.imageProjects = `${ this.getProjectFromImage() }`;
     }
   },
@@ -111,9 +115,6 @@ export default {
 
       };
     },
-    isCreate() {
-      return this.mode === _CREATE;
-    },
     project() {
       return this.value.project;
     },
@@ -284,7 +285,7 @@ export default {
     async getImages(val) {
       this.loadingImages = true;
       try {
-        const isOriginal = !this.isCreate && this.machineImage === this.getImageNameFromImage(this.originalMachineImage);
+        const isOriginal = !this.poolCreateMode && this.machineImage === this.getImageNameFromImage(this.originalMachineImage);
 
         this.machineImages = await this.getImagesInProject(val, this.showDeprecated);
         // If we had to reload list of images, we need to reset selected image if it is no longer in the list,

package/machine-config/google.vue

@@ -79,7 +79,11 @@ export default {
     disabled: {
       type:    Boolean,
       default: false
-    }
+    },
+    poolCreateMode: {
+      type:    Boolean,
+      default: true
+    },
   },
 
   async fetch() {
@@ -123,7 +127,7 @@ export default {
     };
   },
   created() {
-    if (this.mode === _CREATE) {
+    if (this.poolCreateMode) {
       this.$emit('validationChanged', false);
       this.value.project = this.projectId;
       for (const key in this.defaultConfig) {
@@ -157,7 +161,7 @@ export default {
     'value.setExternalFirewallRulePrefix'(neu) {
       if (!neu) {
         this.value.openPort = [];
-      } else if (this.isCreate) {
+      } else if (this.poolCreateMode) {
         this.value.openPort.push('6443');
       } else {
         this.value.openPort = this.originalOpenPort.length > 0 ? this.originalOpenPort : ['6443'];
@@ -334,7 +338,7 @@ export default {
 
         if (!cur ) {
           // If default is not actually available, reset
-          if (this.isCreate) {
+          if (this.poolCreateMode) {
             this.value.diskType = '';
           }
         } else {
@@ -446,6 +450,7 @@ export default {
         :credentialId="credentialId"
         :projectId="value.project"
         :originalMachineImage="originalMachineImage"
+        :pool-create-mode="poolCreateMode"
         :mode="mode"
         :location="location"
         :rules="{machineImage: fvGetAndReportPathRules('machineImage')}"
@@ -494,7 +499,7 @@ export default {
           label-key="cluster.machineConfig.gce.network.label"
           :mode="mode"
           :options="networkOptions"
-          :disabled="!isCreate"
+          :disabled="!poolCreateMode"
           option-key="name"
           option-label="label"
           :loading="loadingNetworks"
@@ -508,7 +513,7 @@ export default {
           label-key="cluster.machineConfig.gce.subnetwork.label"
           :mode="mode"
           :options="subnetworkOptions"
-          :disabled="!isCreate"
+          :disabled="!poolCreateMode"
           option-key="name"
           option-label="name"
           :loading="loadingNetworks"