@rancher/shell 0.5.2 → 1.2.0

package/detail/node.vue

@@ -11,7 +11,6 @@ import {
   VALUE
 } from '@shell/config/table-headers';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
-import EmberPage from '@shell/components/EmberPage';
 import { METRIC, POD } from '@shell/config/types';
 import createEditView from '@shell/mixins/create-edit-view';
 import { formatSi, exponentNeeded, UNITS } from '@shell/utils/units';
@@ -20,7 +19,6 @@ import { mapGetters } from 'vuex';
 import { allDashboardsExist } from '@shell/utils/grafana';
 import Loading from '@shell/components/Loading';
 import metricPoller from '@shell/mixins/metric-poller';
-import { haveV1Monitoring } from '@shell/utils/monitoring';
 
 const NODE_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-node-detail-1/rancher-node-detail?orgId=1';
 const NODE_METRICS_SUMMARY_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-node-1/rancher-node?orgId=1';
@@ -36,7 +34,6 @@ export default {
     ResourceTabs,
     Tab,
     ResourceTable,
-    EmberPage,
   },
 
   mixins: [createEditView, metricPoller],
@@ -51,15 +48,6 @@ export default {
   async fetch() {
     this.showMetrics = await allDashboardsExist(this.$store, this.currentCluster.id, [NODE_METRICS_DETAIL_URL, NODE_METRICS_SUMMARY_URL]);
 
-    if (haveV1Monitoring(this.$store.getters)) {
-      const v3Nodes = await this.$store.dispatch('rancher/request', {
-        url:    '/v3/nodes',
-        method: 'get'
-      });
-
-      this.v3Nodes = v3Nodes;
-    }
-
     return this.$store.dispatch('cluster/findAll', { type: POD });
   },
 
@@ -67,7 +55,6 @@ export default {
     const podSchema = this.$store.getters['cluster/schemaFor'](POD);
 
     return {
-      v3Nodes:          null,
       metrics:          { cpu: 0, memory: 0 },
       infoTableHeaders: [
         {
@@ -99,22 +86,6 @@ export default {
 
   computed: {
     ...mapGetters(['currentCluster']),
-    v1MonitoringUrl() {
-      if (this.v3Nodes && this.v3Nodes.data) {
-        const node = this.v3Nodes.data.find((n) => {
-          return n.nodeName === this.value.metadata?.name;
-        });
-
-        if (node) {
-          // Custom page just with node metrics graphs
-          const id = this.currentCluster.id;
-
-          return `/k/${ id }/monitoring/${ node.id }/metrics`;
-        }
-      }
-
-      return null;
-    },
     memoryUnits() {
       const exponent = exponentNeeded(this.value.ramReserved, 1024);
 
@@ -320,19 +291,6 @@ export default {
           :search="false"
         />
       </Tab>
-      <Tab
-        v-if="v1MonitoringUrl"
-        name="v1Metrics"
-        :label="t('node.detail.tab.metrics')"
-        :weight="0"
-      >
-        <div id="ember-anchor">
-          <EmberPage
-            inline="ember-anchor"
-            :src="v1MonitoringUrl"
-          />
-        </div>
-      </Tab>
     </ResourceTabs>
   </div>
 </template>

package/detail/pod.vue

@@ -7,10 +7,8 @@ import { STATE, SIMPLE_NAME, IMAGE_NAME } from '@shell/config/table-headers';
 import { sortableNumericSuffix } from '@shell/utils/sort';
 import { findBy } from '@shell/utils/array';
 import DashboardMetrics from '@shell/components/DashboardMetrics';
-import V1WorkloadMetrics from '@shell/mixins/v1-workload-metrics';
 import { mapGetters } from 'vuex';
 import { allDashboardsExist } from '@shell/utils/grafana';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
 import day from 'dayjs';
 import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
 import { escapeHtml } from '@shell/utils/string';
@@ -28,10 +26,9 @@ export default {
     ResourceTabs,
     Tab,
     SortableTable,
-    LabeledSelect,
   },
 
-  mixins: [CreateEditView, V1WorkloadMetrics],
+  mixins: [CreateEditView],
 
   async fetch() {
     this.showMetrics = await allDashboardsExist(this.$store, this.currentCluster.id, [POD_METRICS_DETAIL_URL, POD_METRICS_SUMMARY_URL]);
@@ -50,22 +47,13 @@ export default {
   },
 
   data() {
-    const t = this.$store.getters['i18n/t'];
-    const POD_OPTION = {
-      id:    '//POD//',
-      label: t('workload.metrics.pod'),
-    };
-
     return {
       POD_METRICS_DETAIL_URL,
       POD_METRICS_SUMMARY_URL,
       POD_PROJECT_METRICS_DETAIL_URL:  '',
       POD_PROJECT_METRICS_SUMMARY_URL: '',
-      POD_OPTION,
       showMetrics:                     false,
       showProjectMetrics:              false,
-      selection:                       POD_OPTION,
-      metricsID:                       null,
     };
   },
 
@@ -194,27 +182,6 @@ export default {
       };
     },
 
-    metricsOptions() {
-      const v = this.containers.map((c) => {
-        return {
-          id:    c.name,
-          label: c.name
-        };
-      });
-
-      v.unshift(this.POD_OPTION);
-
-      return v;
-    },
-
-    v1Metrics() {
-      if (!this.metricsID) {
-        return this.v1MonitoringUrl;
-      } else {
-        return `${ this.v1MonitoringContainerBaseUrl }/${ this.metricsID }`;
-      }
-    },
-
     dateTimeFormatString() {
       const dateFormat = escapeHtml( this.$store.getters['prefs/get'](DATE_FORMAT));
       const timeFormat = escapeHtml( this.$store.getters['prefs/get'](TIME_FORMAT));
@@ -224,13 +191,6 @@ export default {
   },
 
   methods: {
-    selectionChanged(c) {
-      const id = c === this.POD_OPTION ? null : c.id;
-
-      this.metricsID = id;
-      this.selection = c;
-    },
-
     dateTimeFormat(value) {
       return value ? day(value).format(this.dateTimeFormatString) : '';
     }
@@ -259,26 +219,6 @@ export default {
         :table-actions="false"
       />
     </Tab>
-    <Tab
-      v-if="v1MonitoringUrl"
-      name="v1Metrics"
-      :label="t('node.detail.tab.metrics')"
-      :weight="0"
-    >
-      <LabeledSelect
-        class="pod-metrics-chooser"
-        :value="selection"
-        label-key="workload.metrics.metricsView"
-        :options="metricsOptions"
-        @input="selectionChanged($event)"
-      />
-      <div id="ember-anchor">
-        <EmberPage
-          inline="ember-anchor"
-          :src="v1Metrics"
-        />
-      </div>
-    </Tab>
     <Tab
       v-if="showMetrics"
       :label="t('workload.container.titles.metrics')"
@@ -313,10 +253,3 @@ export default {
     </Tab>
   </ResourceTabs>
 </template>
-<style scoped>
-  .pod-metrics-chooser {
-    width: fit-content;
-    margin-bottom: 10px;
-    min-width: 300px;
-  }
-</style>

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

@@ -775,18 +775,17 @@ export default {
                   v-clean-html="t('resourceTable.groupLabel.notInANodePool')"
                 />
                 <div
-                  v-if="group.ref && group.ref.providerSummary"
+                  v-if="group.ref && group.ref.template"
                   class="description text-muted text-small"
                 >
-                  {{ group.ref.providerSummary }}
+                  {{ group.ref.providerDisplay }} &ndash;  {{ group.ref.providerLocation }} / {{ group.ref.providerSize }} ({{ group.ref.providerName }})
                 </div>
               </div>
               <div
-                v-if="group.ref"
+                v-if="group.ref && poolSummaryInfo[group.ref]"
                 class="right group-header-buttons mr-20"
               >
                 <MachineSummaryGraph
-                  v-if="poolSummaryInfo[group.ref]"
                   :row="poolSummaryInfo[group.ref]"
                   :horizontal="true"
                   class="mr-20"
@@ -880,7 +879,7 @@ export default {
                 <template v-if="group.ref.hasLink('update')">
                   <button
                     v-clean-tooltip="t('node.list.scaleDown')"
-                    :disabled="!group.ref.canScaleDownPool()"
+                    :disabled="group.ref.spec.quantity < 2"
                     type="button"
                     class="btn btn-sm role-secondary"
                     @click="toggleScaleDownModal($event, group.ref)"
@@ -1006,7 +1005,6 @@ export default {
       >
         <SortableTable
           class="snapshots"
-          :data-testid="'cluster-snapshots-list'"
           :headers="value.isRke1 ? rke1SnapshotHeaders : rke2SnapshotHeaders"
           default-sort-by="age"
           :table-actions="value.isRke1"

package/detail/workload/index.vue

@@ -11,7 +11,6 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import CountGauge from '@shell/components/CountGauge';
 import { allHash } from '@shell/utils/promise';
 import DashboardMetrics from '@shell/components/DashboardMetrics';
-import V1WorkloadMetrics from '@shell/mixins/v1-workload-metrics';
 import { mapGetters } from 'vuex';
 import { allDashboardsExist } from '@shell/utils/grafana';
 import PlusMinus from '@shell/components/form/PlusMinus';
@@ -51,7 +50,7 @@ export default {
     PlusMinus
   },
 
-  mixins: [CreateEditView, V1WorkloadMetrics],
+  mixins: [CreateEditView],
 
   async fetch() {
     let hasNodes = false;
@@ -452,19 +451,6 @@ export default {
           />
         </template>
       </Tab>
-      <Tab
-        v-if="v1MonitoringUrl"
-        name="v1Metrics"
-        :label="t('node.detail.tab.metrics')"
-        :weight="10"
-      >
-        <div id="ember-anchor">
-          <EmberPage
-            inline="ember-anchor"
-            :src="v1MonitoringUrl"
-          />
-        </div>
-      </Tab>
       <Tab
         v-if="!isJob && !isCronJob"
         name="services"

package/dialog/ScaleMachineDownDialog.vue

@@ -1,6 +1,6 @@
 <script>
 import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
-import { MANAGEMENT, CAPI } from '@shell/config/types';
+import { CAPI } from '@shell/config/types';
 import GenericPrompt from './GenericPrompt';
 
 export default {
@@ -14,38 +14,30 @@ export default {
   },
 
   async fetch() {
-    if (this.isRke2) {
-      await Promise.all([
-        this.$store.dispatch('management/findAll', { type: CAPI.MACHINE_DEPLOYMENT }),
-        this.$store.dispatch('management/findAll', { type: CAPI.MACHINE })
-      ]);
-    } else {
-      await Promise.all([
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL }),
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE })
-      ]);
-    }
+    await Promise.all([
+      this.$store.dispatch('management/findAll', { type: CAPI.MACHINE_DEPLOYMENT }),
+      this.$store.dispatch('management/findAll', { type: CAPI.MACHINE })
+    ]);
   },
 
   data() {
-    const isRke2 = this.resources[0].cluster?.isRke2;
-    const cluster = isRke2 ? this.resources[0].cluster : this.resources[0].provisioningCluster;
+    const allToDelete = Array.isArray(this.resources) ? this.resources : [this.resources];
+    const cluster = allToDelete[0].cluster;
 
     // Not all machines can be deleted, there must always be at least one left for roles control plane and etcd
     // First ensure that at least one control plane exists... and then check from the remaining machines that at least one etcd exists
     // This isn't optimisied, there may be cases that retaining a single machine with both roles would be better than retaining two with single roles
-    const [ignoredControlPlane, safeControlePlaneMachinesToDelete] = this.deleteType('isControlPlane', this.resources, cluster, isRke2);
-    const [ignoredEtcd, safeMachinesToDelete] = this.deleteType('isEtcd', safeControlePlaneMachinesToDelete, cluster, isRke2);
+    const [ignoredControlPlane, safeControlePlaneMachinesToDelete] = this.deleteType('isControlPlane', allToDelete, cluster);
+    const [ignoredEtcd, safeMachinesToDelete] = this.deleteType('isEtcd', safeControlePlaneMachinesToDelete, cluster);
     const ignored = [ignoredControlPlane, ignoredEtcd].filter((i) => !!i);
 
     return {
       cluster,
-      isRke2,
-      allToDelete: this.resources,
+      allToDelete,
       safeMachinesToDelete,
       ignored,
-      type:        this.$store.getters['type-map/labelFor'](this.resources[0].schema, this.resources.length),
-      config:      {
+      type:   this.$store.getters['type-map/labelFor'](allToDelete[0].schema, allToDelete.length),
+      config: {
         title:       this.t('promptRemove.title'),
         applyMode:   'delete',
         applyAction: this.remove,
@@ -54,7 +46,7 @@ export default {
   },
 
   methods: {
-    deleteType(type, allToDelete, cluster, isRke2) {
+    deleteType(type, allToDelete, cluster) {
       const allToDeleteByType = allToDelete.reduce((res, m) => {
         if (m[type]) {
           res.typed.push(m);
@@ -65,8 +57,7 @@ export default {
         return res;
       }, { typed: [], others: [] });
 
-      const machines = isRke2 ? cluster.machines : cluster.nodes;
-      const totalTypes = machines.filter((m) => m[type]).length;
+      const totalTypes = cluster.machines.filter((m) => m[type]).length;
       const typesToDelete = allToDeleteByType.typed.length;
       // If we're attempting to remove all control plan machines.... ignore one
       const ignoredType = totalTypes - typesToDelete === 0 ? allToDeleteByType.typed.pop() : undefined;
@@ -76,14 +67,6 @@ export default {
     },
 
     async remove() {
-      if (!this.isRke2) {
-        await Promise.all(this.safeMachinesToDelete.map((node) => {
-          return node.norman?.doAction('scaledown');
-        }));
-
-        return;
-      }
-
       // Group machines into pools
       const poolInfo = this.safeMachinesToDelete.reduce((res, m) => {
         res.set(m.pool, res.get(m.pool) || []);
@@ -120,7 +103,7 @@ export default {
     <template slot="body">
       <div class="pl-10 pr-10 mt-20 mb-20 body">
         <div v-if="allToDelete.length === 1">
-          {{ t('promptRemove.attemptingToRemove', { type }) }} <b>{{ safeMachinesToDelete[0].nameDisplay }}</b>
+          {{ t('promptRemove.attemptingToRemove', { type }) }} <b>{{ safeMachinesToDelete[0].name }}</b>
         </div>
         <div v-else>
           {{ t('promptScaleMachineDown.attemptingToRemove', { type, count: allToDelete.length }, true) }}
@@ -132,8 +115,8 @@ export default {
           <span class="mb-20">{{ t('promptScaleMachineDown.retainedMachine1') }}</span>
           <span
             v-for="i in ignored"
-            :key="i.nameDisplay"
-            v-clean-html="t('promptScaleMachineDown.retainedMachine2', { name: i.nameDisplay }, true)"
+            :key="i.name"
+            v-clean-html="t('promptScaleMachineDown.retainedMachine2', { name: i.name }, true)"
           />
         </div>
       </div>

package/edit/auth/googleoauth.vue

@@ -33,7 +33,11 @@ export default {
 
   computed: {
     tArgs() {
-      const hostname = window.location.hostname;
+      let hostname = '';
+
+      if (process.client) {
+        hostname = window.location.hostname;
+      }
 
       return {
         hostname,

package/edit/catalog.cattle.io.clusterrepo.vue

@@ -1,5 +1,4 @@
 <script>
-import Vue from 'vue';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Footer from '@shell/components/form/Footer';
 import { LabeledInput } from '@components/Form/LabeledInput';
@@ -7,7 +6,7 @@ import { RadioGroup } from '@components/Form/Radio';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Labels from '@shell/components/form/Labels';
 import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthSecret';
-import { NAMESPACE } from '@shell/config/types';
+import { MANAGEMENT, NAMESPACE } from '@shell/config/types';
 
 export default {
   name: 'CruCatalogRepo',
@@ -28,6 +27,9 @@ export default {
   },
 
   computed: {
+    inStore() {
+      return this.$store.getters['currentProduct']?.inStore || MANAGEMENT;
+    },
     secretNamespace() {
       const tryNames = ['cattle-system', 'default'];
 
@@ -37,22 +39,7 @@ export default {
         }
       }
 
-      return this.$store.getters['cluster/all'](NAMESPACE)[0]?.id;
-    }
-  },
-
-  methods: {
-    onTargetChange(isGit) {
-      // reset entered value when switching options
-      if (isGit) {
-        Vue.set(this.value.spec, 'url', '');
-      } else {
-        Vue.set(this.value.spec, 'gitRepo', '');
-
-        if (!!this.value.spec.gitBranch) {
-          Vue.set(this.value.spec, 'gitBranch', '');
-        }
-      }
+      return this.$store.getters[`${ this.inStore }/all`](NAMESPACE)[0]?.id;
     }
   },
 };
@@ -76,7 +63,6 @@ export default {
           :labels="[t('catalog.repo.target.http'), t('catalog.repo.target.git')]"
           :mode="mode"
           data-testid="clusterrepo-radio-input"
-          @input="onTargetChange"
         />
       </div>
     </div>
@@ -114,14 +100,15 @@ export default {
       :label="t('catalog.repo.url.label')"
       :placeholder="t('catalog.repo.url.placeholder', null, true)"
       :mode="mode"
-      data-testid="clusterrepo-helm-url-input"
     />
 
     <SelectOrCreateAuthSecret
       v-model="value.spec.clientSecret"
+      data-testid="clusterrepo-auth-secret"
       :register-before-hook="registerBeforeHook"
       :namespace="secretNamespace"
       :limit-to-namespace="false"
+      :in-store="inStore"
       generate-name="clusterrepo-auth-"
     />
 

package/edit/cloudcredential.vue

@@ -260,8 +260,6 @@ export default {
         v-model="value"
         name-key="_name"
         description-key="description"
-        name-label="cluster.credential.name.label"
-        name-placeholder="cluster.credential.name.placeholder"
         :mode="mode"
         :namespaced="false"
       />

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

@@ -22,7 +22,7 @@ import { base64Decode, base64Encode } from '@shell/utils/crypto';
 import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthSecret';
 import { _CREATE } from '@shell/config/query-params';
 import { isHarvesterCluster } from '@shell/utils/cluster';
-import { CAPI, CATALOG } from '@shell/config/labels-annotations';
+import { CAPI, CATALOG, FLEET as FLEET_LABELS } 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';
@@ -413,8 +413,9 @@ export default {
           type:     SECRET,
           metadata: {
             namespace:    this.value.metadata.namespace,
-            generateName: 'auth-'
-          },
+            generateName: 'auth-',
+            labels:       { [FLEET_LABELS.MANAGED]: 'true' }
+          }
         });
 
         let type, publicField, privateField;

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

@@ -5,6 +5,7 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
 import CruResource from '@shell/components/CruResource';
 import Labels from '@shell/components/form/Labels';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Project';
 import { HARVESTER_TYPES, RANCHER_TYPES } from '@shell/components/form/ResourceQuota/shared';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -20,15 +21,26 @@ import { Banner } from '@components/Banner';
 
 export default {
   components: {
-    ContainerResourceLimit, CruResource, Labels, NameNsDescription, ProjectMembershipEditor, ResourceQuota, Tabbed, Tab, Banner
+    ContainerResourceLimit, CruResource, Labels, LabeledSelect, NameNsDescription, ProjectMembershipEditor, ResourceQuota, Tabbed, Tab, Banner
   },
 
   mixins: [CreateEditView, FormValidation],
+  async fetch() {
+    if ( this.$store.getters['management/canList'](MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE) ) {
+      this.allPSPs = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE });
+    }
+
+    // User can only change the PSP if the user has permissions to see the binding schema for PSP Templates
+    const pspBindingSchema = this.$store.getters['management/schemaFor'](MANAGEMENT.PSP_TEMPLATE_BINDING);
+
+    this.canEditPSPBindings = !!pspBindingSchema;
+  },
   data() {
     this.$set(this.value, 'spec', this.value.spec || {});
     this.$set(this.value.spec, 'podSecurityPolicyTemplateId', this.value.status?.podSecurityPolicyTemplateId || '');
 
     return {
+      allPSPs:                          [],
       projectRoleTemplateBindingSchema: this.$store.getters[`management/schemaFor`](MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING),
       createLocation:                   {
         name:   'c-cluster-product-resource-create',
@@ -45,6 +57,7 @@ export default {
       HARVESTER_TYPES,
       RANCHER_TYPES,
       fvFormRuleSets:     [{ path: 'spec.displayName', rules: ['required'] }],
+      canEditPSPBindings: true,
     };
   },
   computed: {
@@ -78,6 +91,31 @@ export default {
       return (this.currentCluster?.spec?.kubernetesVersion || '').includes('k3s');
     },
 
+    pspOptions() {
+      if ( this.isK3s || !this.currentCluster.spec.defaultPodSecurityPolicyTemplateName ) {
+        return null;
+      }
+
+      const out = [{ label: this.t('project.psp.default'), value: '' }];
+
+      if ( this.allPSPs ) {
+        for ( const pspt of this.allPSPs ) {
+          out.push({
+            label: pspt.nameDisplay,
+            value: pspt.id,
+          });
+        }
+      }
+
+      const cur = this.value.status?.podSecurityPolicyTemplateId;
+
+      if ( cur && !out.find((x) => x.value === cur) ) {
+        out.unshift({ label: this.t('project.psp.current', { value: cur }), value: cur });
+      }
+
+      return out;
+    },
+
     isHarvester() {
       return this.$store.getters['currentProduct'].inStore === HARVESTER;
     },
@@ -185,6 +223,19 @@ export default {
       :normalize-name="false"
       :rules="{ name: fvGetAndReportPathRules('spec.displayName'), namespace: [], description: [] }"
     />
+    <div class="row mb-20">
+      <div class="col span-3">
+        <LabeledSelect
+          v-if="pspOptions"
+          v-model="value.spec.podSecurityPolicyTemplateId"
+          class="psp"
+          :mode="mode"
+          :options="pspOptions"
+          :disabled="!canEditPSPBindings"
+          :label="t('project.psp.label')"
+        />
+      </div>
+    </div>
     <Tabbed :side-tabs="true">
       <Tab
         v-if="canViewMembers"