@rancher/shell 0.3.5 → 0.3.7

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

@@ -24,6 +24,7 @@ import { isHarvesterCluster } from '@shell/utils/cluster';
 import { CAPI, CATALOG } from '@shell/config/labels-annotations';
 import { SECRET_TYPES } from '@shell/config/secret';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
+import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -33,6 +34,7 @@ export default {
   name: 'CruGitRepo',
 
   components: {
+    Checkbox,
     ArrayList,
     Banner,
     CruResource,
@@ -601,7 +603,20 @@ export default {
         </div>
       </template>
       <div class="spacer" />
-
+      <h2 v-t="'fleet.gitRepo.resources.label'" />
+      <Checkbox
+        v-model="value.spec.keepResources"
+        class="check"
+        type="checkbox"
+        label-key="fleet.gitRepo.resources.keepResources"
+        :mode="mode"
+      />
+      <Banner
+        color="info"
+      >
+        {{ t('fleet.gitRepo.resources.resourceBanner') }}
+      </Banner>
+      <div class="spacer" />
       <h2 v-t="'fleet.gitRepo.paths.label'" />
       <ArrayList
         v-model="value.spec.paths"

package/edit/logging.banzaicloud.io.output/index.vue

@@ -100,9 +100,6 @@ export default {
     }
   },
 
-  created() {
-    this.registerBeforeHook(this.willSave, 'willSave');
-  },
   methods: {
     getComponent(name) {
       return require(`./providers/${ name }`).default;
@@ -110,7 +107,22 @@ export default {
     launch(provider) {
       this.$refs.tabbed.select(provider.name);
     },
-    willSave() {
+    saveSettings(done) {
+      const t = this.$store.getters['i18n/t'];
+
+      if (this.selectedProvider === 'loki') {
+        const urlCheck = ['https://', 'http://'].some(checkValue => this.value.spec['loki'].url.toLowerCase().startsWith(checkValue));
+        const isLokiHttps = this.value.spec['loki'].url ? urlCheck : undefined;
+
+        if (!isLokiHttps) {
+          this.errors = [t('logging.loki.urlInvalid')];
+
+          return done(false);
+        }
+      }
+
+      this.errors = [];
+
       this.value.spec = { [this.selectedProvider]: this.value.spec[this.selectedProvider] };
 
       const bufferJson = jsyaml.load(this.bufferYaml);
@@ -120,6 +132,7 @@ export default {
       } else {
         this.$delete(this.value.spec[this.selectedProvider], 'buffer');
       }
+      this.save(done);
     },
     tabChanged({ tab }) {
       if ( tab.name === 'buffer' ) {
@@ -151,7 +164,7 @@ export default {
       :errors="errors"
       :can-yaml="true"
       @error="e=>errors = e"
-      @finish="save"
+      @finish="saveSettings"
       @cancel="done"
     >
       <NameNsDescription

package/edit/logging.banzaicloud.io.output/providers/loki.vue

@@ -47,6 +47,7 @@ export default {
           :mode="mode"
           :disabled="disabled"
           class="url"
+          placeholder="https://127.0.0.1:8000"
           :label="t('logging.loki.url')"
         />
       </div>

package/edit/namespace.vue

@@ -10,7 +10,7 @@ import PodSecurityAdmission from '@shell/components/PodSecurityAdmission';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import CruResource from '@shell/components/CruResource';
-import { PROJECT_ID, _VIEW } from '@shell/config/query-params';
+import { PROJECT_ID, _VIEW, FLAT_VIEW, _CREATE } from '@shell/config/query-params';
 import MoveModal from '@shell/components/MoveModal';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Namespace';
 import Loading from '@shell/components/Loading';
@@ -67,6 +67,10 @@ export default {
   computed: {
     ...mapGetters(['isSingleProduct']),
 
+    isCreate() {
+      return this.mode === _CREATE;
+    },
+
     isSingleHarvester() {
       return this.$store.getters['currentProduct'].inStore === HARVESTER && this.isSingleProduct;
     },
@@ -77,7 +81,6 @@ export default {
 
       // Filter out projects not for the current cluster
       projects = projects.filter(c => c.spec?.clusterName === clusterId);
-
       const out = projects.map((project) => {
         return {
           label: project.nameDisplay,
@@ -86,7 +89,7 @@ export default {
       });
 
       out.unshift({
-        label: '(None)',
+        label: this.t('namespace.project.none'),
         value: null,
       });
 
@@ -105,6 +108,9 @@ export default {
       return !this.isSingleHarvester;
     },
 
+    flatView() {
+      return (this.$route.query[FLAT_VIEW] || false);
+    }
   },
 
   watch: {
@@ -139,13 +145,11 @@ export default {
       }
 
       const projects = this.$store.getters['management/all'](MANAGEMENT.PROJECT);
-
       const project = projects.find(p => p.id.includes(projectName));
 
       return project?.spec?.containerDefaultResourceLimit || {};
     }
-  }
-
+  },
 };
 </script>
 
@@ -169,9 +173,10 @@ export default {
       :value="value"
       :namespaced="false"
       :mode="mode"
+      :extra-columns="['project-col']"
     >
       <template
-        v-if="project"
+        v-if="flatView && isCreate"
         #project-col
       >
         <LabeledSelect
@@ -181,7 +186,6 @@ export default {
         />
       </template>
     </NameNsDescription>
-
     <Tabbed :side-tabs="true">
       <Tab
         v-if="showResourceQuota"

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

@@ -173,6 +173,14 @@ export default {
 
 <template>
   <div>
+    <Banner
+      v-if="value.pool.hostnameLengthLimit"
+      color="info"
+    >
+      <div class="text">
+        {{ t('cluster.machinePool.truncationPool', { limit: value.pool.hostnameLengthLimit }) }}
+      </div>
+    </Banner>
     <div class="row">
       <div class="col span-4">
         <LabeledInput
@@ -200,19 +208,19 @@ export default {
         <Checkbox
           v-model="value.pool.etcdRole"
           :mode="mode"
-          label="etcd"
+          :label="t('cluster.machinePool.role.etcd')"
           :disabled="isWindows"
         />
         <Checkbox
           v-model="value.pool.controlPlaneRole"
           :mode="mode"
-          label="Control Plane"
+          :label="t('cluster.machinePool.role.controlPlane')"
           :disabled="isWindows"
         />
         <Checkbox
           v-model="value.pool.workerRole"
           :mode="mode"
-          label="Worker"
+          :label="t('cluster.machinePool.role.worker')"
         />
       </div>
     </div>
@@ -294,7 +302,6 @@ export default {
         :read-allowed="false"
         :value-can-be-empty="true"
       />
-
       <div class="spacer" />
 
       <Taints

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

@@ -135,31 +135,29 @@ export default {
     @finish="saveOverride"
     @error="e=>errors = e"
   >
-    <div class="mt-20">
-      <Banner
-        v-if="harvesterLocation"
-        color="info"
-        :closable="true"
-        class="mb-20"
-        @close="hideHarvesterNotice"
-      >
-        {{ t('cluster.harvester.importNotice') }}
-        <nuxt-link :to="harvesterLocation">
-          {{ t('product.harvesterManager') }}
-        </nuxt-link>
-      </Banner>
-
-      <NameNsDescription
-        v-if="!isView"
-        v-model="value"
-        :mode="mode"
-        :namespaced="false"
-        name-label="cluster.name.label"
-        name-placeholder="cluster.name.placeholder"
-        description-label="cluster.description.label"
-        description-placeholder="cluster.description.placeholder"
-      />
-    </div>
+    <Banner
+      v-if="harvesterLocation"
+      color="info"
+      :closable="true"
+      class="mb-20"
+      @close="hideHarvesterNotice"
+    >
+      {{ t('cluster.harvester.importNotice') }}
+      <nuxt-link :to="harvesterLocation">
+        {{ t('product.harvesterManager') }}
+      </nuxt-link>
+    </Banner>
+
+    <NameNsDescription
+      v-if="!isView"
+      v-model="value"
+      :mode="mode"
+      :namespaced="false"
+      name-label="cluster.name.label"
+      name-placeholder="cluster.name.placeholder"
+      description-label="cluster.description.label"
+      description-placeholder="cluster.description.placeholder"
+    />
 
     <Tabbed :side-tabs="true">
       <Tab

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

@@ -77,6 +77,26 @@ const ADVANCED = 'advanced';
 const HARVESTER = 'harvester';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
 
+const NETBIOS_TRUNCATION_LENGTH = 15;
+
+/**
+ * Classes to be adopted by the node badges in Machine pools
+ */
+const NODE_TOTAL = {
+  error: {
+    color: 'bg-error',
+    icon:  'icon-x',
+  },
+  warning: {
+    color: 'bg-warning',
+    icon:  'icon-warning',
+  },
+  success: {
+    color: 'bg-success',
+    icon:  'icon-checkmark'
+  }
+};
+
 export default {
   components: {
     ACE,
@@ -286,6 +306,13 @@ export default {
     const lastDefaultPodSecurityPolicyTemplateName = this.value.spec.defaultPodSecurityPolicyTemplateName;
     const previousKubernetesVersion = this.value.spec.kubernetesVersion;
 
+    const truncateLimit = this.value.machinePoolDefaults?.hostnameLengthLimit;
+
+    // Is hostname truncation supported by the backend?
+    const provSchema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
+    const specSchemaName = provSchema?.resourceFields?.spec?.type;
+    const specSchema = specSchemaName ? this.$store.getters['management/schemaFor'](specSchemaName) : {};
+
     return {
       loadedOnce:                      false,
       lastIdx:                         0,
@@ -321,6 +348,9 @@ export default {
       cisOverride:           false,
       cisPsaChangeBanner:    false,
       psps:                  null, // List of policies if any
+      truncateHostnames:     truncateLimit === NETBIOS_TRUNCATION_LENGTH,
+      truncateLimit,
+      supportsTruncation:    !!specSchema?.resourceFields?.machinePoolDefaults,
     };
   },
 
@@ -337,6 +367,10 @@ export default {
       return this.value.spec.rkeConfig;
     },
 
+    hostnameTruncationManuallySet() {
+      return this.truncateLimit && this.truncateLimit !== NETBIOS_TRUNCATION_LENGTH;
+    },
+
     /**
      * Check presence of PSPs as template or CLI creation
      */
@@ -703,11 +737,11 @@ export default {
 
       for ( const role of roles ) {
         counts[role] = 0;
-        out.color[role] = 'bg-success';
-        out.icon[role] = 'icon-checkmark';
+        out.color[role] = NODE_TOTAL.success.color;
+        out.icon[role] = NODE_TOTAL.success.icon;
       }
 
-      for ( const row of this.machinePools ) {
+      for ( const row of this.machinePools || [] ) {
         if ( row.remove ) {
           continue;
         }
@@ -729,27 +763,27 @@ export default {
       }
 
       if ( counts.etcd === 0 ) {
-        out.color.etcd = 'bg-error';
-        out.icon.etcd = 'icon-x';
+        out.color.etcd = NODE_TOTAL.error.color;
+        out.icon.etcd = NODE_TOTAL.error.icon;
       } else if ( counts.etcd === 1 || counts.etcd % 2 === 0 || counts.etcd > 7 ) {
-        out.color.etcd = 'bg-warning';
-        out.icon.etcd = 'icon-warning';
+        out.color.etcd = NODE_TOTAL.warning.color;
+        out.icon.etcd = NODE_TOTAL.warning.icon;
       }
 
       if ( counts.controlPlane === 0 ) {
-        out.color.controlPlane = 'bg-error';
-        out.icon.controlPlane = 'icon-x';
+        out.color.controlPlane = NODE_TOTAL.error.color;
+        out.icon.controlPlane = NODE_TOTAL.error.icon;
       } else if ( counts.controlPlane === 1 ) {
-        out.color.controlPlane = 'bg-warning';
-        out.icon.controlPlane = 'icon-warning';
+        out.color.controlPlane = NODE_TOTAL.warning.color;
+        out.icon.controlPlane = NODE_TOTAL.warning.icon;
       }
 
       if ( counts.worker === 0 ) {
-        out.color.worker = 'bg-error';
-        out.icon.worker = 'icon-x';
+        out.color.worker = NODE_TOTAL.error.color;
+        out.icon.worker = NODE_TOTAL.error.icon;
       } else if ( counts.worker === 1 ) {
-        out.color.worker = 'bg-warning';
-        out.icon.worker = 'icon-warning';
+        out.color.worker = NODE_TOTAL.warning.color;
+        out.icon.worker = NODE_TOTAL.warning.icon;
       }
 
       return out;
@@ -1061,6 +1095,21 @@ export default {
     nlToBr,
     set,
 
+    /**
+     * set instanceNameLimit to 15 to all pool machine if truncateHostnames checkbox is clicked
+     */
+    truncateName() {
+      if (this.truncateHostnames) {
+        this.value.machinePoolDefaults = this.value.machinePoolDefaults || {};
+        this.value.machinePoolDefaults.hostnameLengthLimit = 15;
+      } else {
+        delete this.value.machinePoolDefaults.hostnameLengthLimit;
+
+        if (Object.keys(this.value.machinePoolDefaults).length === 0) {
+          delete this.value.machinePoolDefaults;
+        }
+      }
+    },
     /**
      * Define PSP deprecation and restrict use of PSP based on min k8s version and current/edited mode
      */
@@ -1219,7 +1268,6 @@ export default {
         }
 
         await this.syncMachineConfigWithLatest(entry);
-
         // Capitals and such aren't allowed;
         set(entry.pool, 'name', normalizeName(entry.pool.name) || 'pool');
 
@@ -1269,8 +1317,17 @@ export default {
       }
     },
 
+    /**
+     * Ensure that all the existing node roles pool are at least 1 each
+     */
+    hasRequiredNodes() {
+      return this.nodeTotals?.color && Object.values(this.nodeTotals.color).every(color => color !== NODE_TOTAL.error.color);
+    },
+
     validationPassed() {
-      return (this.provider === 'custom' || this.isElementalCluster || !!this.credentialId);
+      const validMachinePools = this.hasMachinePools ? this.hasRequiredNodes() : true;
+
+      return (this.provider === 'custom' || this.isElementalCluster || !!this.credentialId) && validMachinePools;
     },
 
     cancelCredential() {
@@ -2540,8 +2597,29 @@ export default {
                 :label="t('cluster.rke2.address.nodePortRange.label')"
               />
             </div>
+            <div
+              v-if="supportsTruncation"
+              class="col span-6"
+            >
+              <Checkbox
+                v-if="!isView || isView && !hostnameTruncationManuallySet"
+                v-model="truncateHostnames"
+                class="mt-20"
+                :disabled="isEdit || isView || hostnameTruncationManuallySet"
+                :mode="mode"
+                :label="t('cluster.rke2.truncateHostnames')"
+                @input="truncateName"
+              />
+              <Banner
+                v-if="hostnameTruncationManuallySet"
+                color="info"
+              >
+                <div class="text">
+                  {{ t('cluster.machinePool.truncationCluster', { limit: truncateLimit }) }}
+                </div>
+              </Banner>
+            </div>
           </div>
-
           <div
             v-if="serverArgs['tls-san']"
             class="row mb-20"

package/edit/workload/mixins/workload.js

@@ -11,6 +11,7 @@ import {
   SERVICE_ACCOUNT,
   CAPI,
   POD,
+  LIST_WORKLOAD_TYPES,
 } from '@shell/config/types';
 import Tab from '@shell/components/Tabbed/Tab';
 import CreateEditView from '@shell/mixins/create-edit-view';
@@ -490,21 +491,19 @@ export default {
       return this.$store.getters['cluster/schemaFor'](this.type);
     },
 
-    workloadTypes() {
-      return omitBy(WORKLOAD_TYPES, (type) => {
+    // array of id, label, description, initials for type selection step
+    workloadSubTypes() {
+      const workloadTypes = omitBy(LIST_WORKLOAD_TYPES, (type) => {
         return (
           type === WORKLOAD_TYPES.REPLICA_SET ||
           type === WORKLOAD_TYPES.REPLICATION_CONTROLLER
         );
       });
-    },
 
-    // array of id, label, description, initials for type selection step
-    workloadSubTypes() {
       const out = [];
 
-      for (const prop in this.workloadTypes) {
-        const type = this.workloadTypes[prop];
+      for (const prop in workloadTypes) {
+        const type = workloadTypes[prop];
         const subtype = {
           id:          type,
           description: `workload.typeDescriptions.'${ type }'`,

package/edit/workload/storage/Mount.vue

@@ -138,13 +138,13 @@ export default {
 <style lang='scss'>
 .mount-headers, .mount-rows{
   display: grid;
-  grid-template-columns: 35% 35% auto auto;
+  grid-template-columns: 42% 42% 5% auto;
   grid-gap: $column-gutter;
   margin-bottom: 10px;
   align-items: center;
 
-  .remove {
-    text-align: right;
+  .remove BUTTON {
+    padding: 0px;
   }
 }