@rancher/shell 0.3.27 → 0.3.29

package/models/management.cattle.io.project.js

@@ -99,42 +99,6 @@ export default class Project extends HybridModel {
     // and the PUT request should have a query param _replace=true.
     const newValue = await norman.save({ replace: forceReplaceOnReq });
 
-    let retryCount = 0;
-
-    const finishProjectCreation = async() => {
-      try {
-        await newValue.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId: this.spec.podSecurityPolicyTemplateId || null });
-      } catch (err) {
-        if ( err.status === 409 || err.status === 403 ) {
-          // The backend updates each new project soon after it is created,
-          // so there is a chance of a 409 resource conflict or forbidden error. If that happens,
-          // retry the action.
-
-          // The 403 permission error can happen due to the user requesting
-          // the project before the project is fully created and the project
-          // permissions are assigned to the user so we allow some
-          // time for that process to complete.
-
-          if (retryCount < 3) {
-            retryCount++;
-            await setTimeout(() => {
-              // Delay for three seconds to avoid another failure due to latency.
-              finishProjectCreation();
-            }, '3000');
-          } else {
-            throw err;
-          }
-        }
-      }
-    };
-
-    // Only update PSP template if the value changed
-    const newPSPTemplateID = this.spec.podSecurityPolicyTemplateId || null;
-
-    if (norman.podSecurityPolicyTemplateId !== newPSPTemplateID) {
-      await finishProjectCreation();
-    }
-
     return newValue;
   }
 

package/models/management.cattle.io.setting.js

@@ -1,5 +1,6 @@
 import { ALLOWED_SETTINGS } from '@shell/config/settings';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
+import { isServerUrl } from '@shell/utils/validators/setting';
 
 export default class Setting extends HybridModel {
   get fromEnv() {
@@ -31,12 +32,15 @@ export default class Setting extends HybridModel {
   }
 
   get customValidationRules() {
-    return [
-      {
-        path:           'value',
-        translationKey: 'setting.serverUrl.https',
-        validators:     [`isHttps:${ this.metadata.name }`]
-      },
-    ];
+    const out = [];
+
+    if (isServerUrl(this.metadata.name)) {
+      out.push({
+        path:       'value',
+        validators: ['required', 'https', 'url', 'trailingForwardSlash']
+      });
+    }
+
+    return out;
   }
 }

package/models/provisioning.cattle.io.cluster.js

@@ -239,10 +239,24 @@ export default class ProvCluster extends SteveModel {
     return providers.includes(this.provisioner);
   }
 
+  get isLocal() {
+    return this.mgmt?.isLocal;
+  }
+
   get isImported() {
     // As of Rancher v2.6.7, this returns false for imported K3s clusters,
     // in which this.provisioner is `k3s`.
-    return this.provisioner === 'imported';
+
+    const isImportedProvisioner = this.provisioner === 'imported';
+    const isImportedSpecialCases = this.mgmt?.providerForEmberParam === 'import' ||
+      // when imported cluster is GKE
+      !!this.mgmt?.spec?.gkeConfig?.imported ||
+      // or AKS
+      !!this.mgmt?.spec?.aksConfig?.imported ||
+      // or EKS
+      !!this.mgmt?.spec?.eksConfig?.imported;
+
+    return !this.isLocal && (isImportedProvisioner || (!this.isRke2 && !this.mgmt?.machineProvider && isImportedSpecialCases));
   }
 
   get isCustom() {
@@ -262,8 +276,6 @@ export default class ProvCluster extends SteveModel {
   }
 
   get isImportedK3s() {
-    // As of Rancher v2.6.7, this returns false for imported K3s clusters,
-    // in which this.provisioner is `k3s`.
     return this.isImported && this.isK3s;
   }
 
@@ -280,7 +292,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get isRke1() {
-    return !!this.mgmt?.spec?.rancherKubernetesEngineConfig;
+    return !!this.mgmt?.spec?.rancherKubernetesEngineConfig || this.labels['provider.cattle.io'] === 'rke';
   }
 
   get isHarvester() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.27",
+  "version": "0.3.29",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -41,6 +41,7 @@
     "@nuxtjs/eslint-config-typescript": "6.0.1",
     "@nuxtjs/webpack-profile": "0.1.0",
     "@popperjs/core": "2.4.4",
+    "@types/is-url": "1.2.30",
     "@types/node": "16.4.3",
     "@typescript-eslint/eslint-plugin": "4.33.0",
     "@typescript-eslint/parser": "4.33.0",

package/pages/auth/setup.vue

@@ -18,6 +18,10 @@ import Password from '@shell/components/form/Password';
 import { applyProducts } from '@shell/store/type-map';
 import BrandImage from '@shell/components/BrandImage';
 import { waitFor } from '@shell/utils/async';
+import { Banner } from '@components/Banner';
+import FormValidation from '@shell/mixins/form-validation';
+import isUrl from 'is-url';
+import { isLocalhost } from '@shell/utils/validators/setting';
 
 const calcIsFirstLogin = (store) => {
   const firstLoginSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.FIRST_LOGIN);
@@ -36,11 +40,18 @@ const calcMustChangePassword = async(store) => {
 export default {
   layout: 'unauthenticated',
 
+  mixins: [FormValidation],
+
   data() {
     return {
       passwordOptions: [
         { label: this.t('setup.useRandom'), value: true },
         { label: this.t('setup.useManual'), value: false }],
+      fvFormRuleSets: [{
+        path:       'serverUrl',
+        rootObject: this,
+        rules:      ['required', 'https', 'url', 'trailingForwardSlash']
+      }]
     };
   },
 
@@ -78,7 +89,7 @@ export default {
   },
 
   components: {
-    AsyncButton, LabeledInput, CopyToClipboard, Checkbox, RadioGroup, Password, BrandImage
+    AsyncButton, LabeledInput, CopyToClipboard, Checkbox, RadioGroup, Password, BrandImage, Banner
   },
 
   async asyncData({ route, req, store }) {
@@ -191,6 +202,10 @@ export default {
         }
       }
 
+      if (!isUrl(this.serverUrl) || this.fvGetPathErrors(['serverUrl']).length > 0) {
+        return false;
+      }
+
       return true;
     },
 
@@ -198,6 +213,10 @@ export default {
       const out = findBy(this.principals, 'me', true);
 
       return out;
+    },
+
+    showLocalhostWarning() {
+      return isLocalhost(this.serverUrl);
     }
   },
 
@@ -265,6 +284,10 @@ export default {
     done() {
       this.$router.replace('/');
     },
+
+    onServerUrlChange(value) {
+      this.serverUrl = value.trim();
+    },
   },
 };
 </script>
@@ -368,10 +391,24 @@ export default {
                 />
               </p>
               <div class="mt-20">
+                <Banner
+                  v-if="showLocalhostWarning"
+                  color="warning"
+                  :label="t('validation.setting.serverUrl.localhost')"
+                />
+                <Banner
+                  v-for="(err, i) in fvGetPathErrors(['serverUrl'])"
+                  :key="i"
+                  color="error"
+                  :label="err"
+                />
                 <LabeledInput
                   v-model="serverUrl"
                   :label="t('setup.serverUrl.label')"
                   data-testid="setup-server-url"
+                  :rules="fvGetAndReportPathRules('serverUrl')"
+                  :required="true"
+                  @input="onServerUrlChange"
                 />
               </div>
             </template>

package/pages/c/_cluster/apps/charts/__tests__/install.helper.test.ts

@@ -2,30 +2,15 @@ import { ignoreVariables } from '@shell/pages/c/_cluster/apps/charts/install.hel
 
 describe('fX: ignoreVariables', () => {
   describe.each([['epinio', 'global.rbac.pspEnabled']])('given chart %p with path %p', (name, path) => {
-    it.each([
-      ['v1.24.11+rke2r1'],
-    ])('should not return variable path list if cluster has k8s version %p', (version) => {
-      const cluster = { kubernetesVersion: version };
-      const data = {
-        chart:  { name },
-        values: { global: { rbac: { pspEnabled: undefined } } }
-      };
-
-      const paths = ignoreVariables(cluster, data);
-
-      expect(paths).toStrictEqual([]);
-    });
-
     it.each([
       ['v1.25.11+rke2r1'],
-    ])('should return questions if cluster has k8s version %p', (version) => {
-      const cluster = { kubernetesVersion: version };
+    ])('should return questions', () => {
       const data = {
         chart:  { name },
         values: { global: { rbac: { pspEnabled: undefined } } }
       };
 
-      const paths = ignoreVariables(cluster, data);
+      const paths = ignoreVariables(data);
 
       expect(paths).toStrictEqual([path]);
     });

package/pages/c/_cluster/apps/charts/index.vue

@@ -54,7 +54,6 @@ export default {
       searchQuery:     null,
       showDeprecated:  null,
       showHidden:      null,
-      isPspLegacy:     false,
       chartOptions:    [
         {
           label: 'Browse',
@@ -241,14 +240,6 @@ export default {
     }
   },
 
-  created() {
-    const release = this.currentCluster?.status?.version?.gitVersion || '';
-    const isRKE2 = release.includes('rke2');
-    const version = release.match(/\d+/g);
-
-    this.isPspLegacy = version?.length ? isRKE2 && (+version[0] === 1 && +version[1] < 25) : false;
-  },
-
   methods: {
     colorForChart(chart) {
       const repos = this.repoOptions;
@@ -377,12 +368,6 @@ export default {
       />
     </div>
 
-    <Banner
-      v-if="isPspLegacy"
-      color="warning"
-      :label="t('catalog.chart.banner.legacy')"
-    />
-
     <TypeDescription resource="chart" />
     <div class="left-right-split">
       <Select

package/pages/c/_cluster/apps/charts/install.helpers.js

@@ -1,7 +1,7 @@
 /**
  * Return list of variables to filter chart questions
  */
-export const ignoreVariables = (cluster, data) => {
+export const ignoreVariables = (data) => {
   const pspChartMap = {
     epinio:                     'global.rbac.pspEnabled',
     longhorn:                   'enablePSP',
@@ -11,16 +11,5 @@ export const ignoreVariables = (cluster, data) => {
   };
   const path = pspChartMap[data.chart.name];
 
-  if (path) {
-    const clusterVersion = cluster?.kubernetesVersion || '';
-    const version = clusterVersion.match(/\d+/g);
-    const isRequiredVersion = version?.length ? +version[0] === 1 && +version[1] < 25 : false;
-
-    // Provide path as question variable to be ignored
-    if (!isRequiredVersion) {
-      return [path];
-    }
-  }
-
-  return [];
+  return [path];
 };

package/pages/c/_cluster/apps/charts/install.vue

@@ -473,7 +473,7 @@ export default {
      * Return list of variables to filter chart questions
      */
     ignoreVariables() {
-      return ignoreVariables(this.currentCluster, this.versionInfo);
+      return ignoreVariables(this.versionInfo);
     },
 
     namespaceIsNew() {

package/pages/c/_cluster/explorer/index.vue

@@ -15,7 +15,6 @@ import {
   WORKLOAD_TYPES,
   COUNT,
   CATALOG,
-  PSP,
 } from '@shell/config/types';
 import { setPromiseResult } from '@shell/utils/promise';
 import AlertTable from '@shell/components/AlertTable';
@@ -27,7 +26,6 @@ import {
   STATE,
 } from '@shell/config/table-headers';
 
-import { mapPref, PSP_DEPRECATION_BANNER } from '@shell/store/prefs';
 import { haveV1Monitoring, monitoringStatus, canViewGrafanaLink } from '@shell/utils/monitoring';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -156,20 +154,6 @@ export default {
     ...mapGetters(['currentCluster']),
     ...monitoringStatus(),
 
-    displayPspDeprecationBanner() {
-      const cluster = this.currentCluster;
-      const major = cluster.status?.version?.major ? parseInt(cluster.status?.version?.major) : 0;
-      const minor = cluster.status?.version?.minor ? parseInt(cluster.status?.version?.minor) : 0;
-
-      if (major === 1 && minor >= 21 && minor < 25) {
-        const clusterCounts = this.$store.getters[`cluster/all`](COUNT)?.[0]?.counts;
-
-        return !!clusterCounts?.[PSP]?.summary?.count;
-      }
-
-      return false;
-    },
-
     nodes() {
       return this.$store.getters['cluster/all'](NODE);
     },
@@ -178,8 +162,6 @@ export default {
       return this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
     },
 
-    hidePspDeprecationBanner: mapPref(PSP_DEPRECATION_BANNER),
-
     hasV1Monitoring() {
       return haveV1Monitoring(this.$store.getters);
     },
@@ -434,17 +416,6 @@ export default {
         </div>
       </div>
     </header>
-    <Banner
-      v-if="displayPspDeprecationBanner && !hidePspDeprecationBanner"
-      :closable="true"
-      color="warning"
-      @close="hidePspDeprecationBanner = true"
-    >
-      <t
-        k="landing.deprecatedPsp"
-        :raw="true"
-      />
-    </Banner>
     <div
       class="cluster-dashboard-glance"
     >
@@ -478,14 +449,6 @@ export default {
           :show-tooltip="true"
         /></span>
       </div>
-      <p
-        v-if="displayPspDeprecationBanner && hidePspDeprecationBanner"
-        v-clean-tooltip="t('landing.deprecatedPsp')"
-        class="alt-psp-deprecation-info"
-      >
-        <span>{{ t('landing.psps') }}</span>
-        <i class="icon icon-warning" />
-      </p>
       <div :style="{'flex':1}" />
       <div v-if="!monitoringStatus.v2 && !monitoringStatus.v1">
         <n-link
@@ -734,16 +697,6 @@ export default {
   margin-top: 0;
 }
 
-.alt-psp-deprecation-info {
-  display: flex;
-  align-items: center;
-  color: var(--warning);
-
-  span {
-    margin-right: 4px;
-  }
-}
-
 .monitoring-install {
   display: flex;
   margin-left: 10px;

package/pages/c/_cluster/manager/pages/_page.vue

@@ -7,11 +7,10 @@ export default {
   data() {
     return {
       PAGES: {
-        'rke-drivers':           '/n/drivers/cluster',
-        'rke-templates':         '/g/rke-templates/index',
-        'cloud-credentials':     '/g/security/cloud-credentials',
-        'node-templates':        '/n/node-templates',
-        'pod-security-policies': '/g/security/policies',
+        'rke-drivers':       '/n/drivers/cluster',
+        'rke-templates':     '/g/rke-templates/index',
+        'cloud-credentials': '/g/security/cloud-credentials',
+        'node-templates':    '/n/node-templates',
       }
     };
   }