@rancher/shell 0.1.3 → 0.1.21

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

@@ -93,7 +93,7 @@ export default {
       fetchOne.snapshots = this.$store.dispatch('management/findAll', { type: SNAPSHOT });
     }
 
-    if ( this.value.isImported || this.value.isCustom || this.value.isAKS || this.value.isEKS ) {
+    if ( this.value.isImported || this.value.isCustom || this.value.isHostedKubernetesProvider ) {
       fetchOne.clusterToken = this.value.getOrCreateToken();
     }
 
@@ -322,7 +322,7 @@ export default {
     },
 
     showEksNodeGroupWarning() {
-      if ( this.value.isEKS ) {
+      if ( this.value.provisioner === 'EKS' ) {
         const desiredTotal = this.value.eksNodeGroups.filter(g => g.desiredSize === 0);
 
         if ( desiredTotal.length === this.value.eksNodeGroups.length ) {
@@ -451,7 +451,7 @@ export default {
         return true;
       }
 
-      if ( ( this.value.isAKS || this.value.isEKS ) && !this.isClusterReady ) {
+      if ( this.value.isHostedKubernetesProvider && !this.isClusterReady ) {
         return true;
       }
 

package/detail/workload/index.vue

@@ -121,7 +121,7 @@ export default {
     },
 
     isPod() {
-      return this.value.type === WORKLOAD_TYPES.POD;
+      return this.value.type === POD;
     },
 
     podSchema() {
@@ -141,7 +141,8 @@ export default {
         return this.value.spec.jobTemplate.spec.template.spec;
       }
 
-      if ( this.value.type === WORKLOAD_TYPES.POD ) {
+      // This is for viewing
+      if ( this.value.type === POD ) {
         return this.value;
       }
 

package/dialog/DiagnosticTimingsDialog.vue

@@ -0,0 +1,116 @@
+<script>
+import { exceptionToErrorsArray } from '@shell/utils/error';
+
+import AsyncButton from '@shell/components/AsyncButton';
+import { Card } from '@components/Card';
+import { Banner } from '@components/Banner';
+
+export default {
+  components: {
+    Card,
+    AsyncButton,
+    Banner,
+  },
+
+  props:      {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  data() {
+    return { errors: [] };
+  },
+
+  computed: {
+    config() {
+      return this.resources[0];
+    },
+
+    applyMode() {
+      return 'diagnostic';
+    },
+
+    title() {
+      return this.t('about.diagnostic.modal.title');
+    },
+
+    body() {
+      return this.t('about.diagnostic.modal.body');
+    }
+  },
+
+  methods: {
+    close() {
+      this.$emit('close');
+    },
+
+    apply(btnCb) {
+      try {
+        this.config.downloadData(btnCb);
+        this.close();
+      } catch (err) {
+        console.error(err); // eslint-disable-line
+        this.errors = exceptionToErrorsArray(err);
+        btnCb(false);
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <Card class="prompt-restore" :show-highlight-border="false">
+    <h4 slot="title" class="text-default-text" v-html="title" />
+
+    <template slot="body">
+      <slot name="body">
+        <div class="pl-10 pr-10" style="min-height: 50px;">
+          <div class="row">
+            {{ body }}
+          </div>
+
+          <AsyncButton
+            mode="timing"
+            class="row mt-20"
+            @click="config.gatherResponseTimes"
+          />
+        </div>
+      </slot>
+    </template>
+
+    <div slot="actions" class="bottom">
+      <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />
+      <div class="buttons">
+        <button class="btn role-secondary mr-10" @click="close">
+          {{ t('generic.cancel') }}
+        </button>
+
+        <AsyncButton
+          :mode="applyMode"
+          @click="apply"
+        />
+      </div>
+    </div>
+  </Card>
+</template>
+<style lang='scss' scoped>
+  .prompt-restore {
+    margin: 0;
+  }
+  .bottom {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    .banner {
+      margin-top: 0
+    }
+    .buttons {
+      display: flex;
+      justify-content: flex-end;
+      width: 100%;
+    }
+  }
+
+</style>

package/dialog/RotateCertificatesDialog.vue

@@ -40,19 +40,25 @@ export default {
 
     serviceOptions() {
       if (this.cluster.isRke2) {
-        return [
+        const options = [
           'admin',
           'api-server',
           'controller-manager',
           'scheduler',
-          'rke2-controller',
-          'rke2-server',
           'cloud-controller',
           'etcd',
           'auth-proxy',
           'kubelet',
           'kube-proxy'
         ];
+
+        if ( this.cluster.isK3s ) {
+          options.push('k3s-controller', 'k3s-server');
+        } else {
+          options.push('rke2-controller', 'rke2-server');
+        }
+
+        return options.sort();
       }
       // For RKE1 clusters, Norman provides the list of service options:
       // type RotateCertificateInput struct {

package/edit/auth/azuread.vue

@@ -1,4 +1,5 @@
 <script>
+import isEqual from 'lodash/isEqual';
 import Loading from '@shell/components/Loading';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
@@ -76,6 +77,8 @@ export default {
   data() {
     return {
       endpoint:          'standard',
+      oldEndpoint:        false,
+
       // Storing the applicationSecret is necessary because norman doesn't support returning secrets and when we
       // override the steve authconfig with a norman config the applicationSecret is lost
       applicationSecret: this.value.applicationSecret
@@ -147,9 +150,6 @@ export default {
       handler() {
         this.model.accessMode = this.model.accessMode || 'unrestricted';
         this.model.rancherUrl = this.model.rancherUrl || this.replyUrl;
-        if (this.endpoint !== 'custom') {
-          this.setEndpoints(this.endpoint);
-        }
 
         if (this.model.applicationSecret) {
           this.$set(this, 'applicationSecret', this.model.applicationSecret);
@@ -162,11 +162,13 @@ export default {
   methods: {
     setEndpoints(endpoint) {
       if (this.editConfig || !this.model.enabled) {
-        Object.keys(ENDPOINT_MAPPING[endpoint]).forEach((key) => {
+        const endpointType = this.oldEndpoint && endpoint !== 'custom' ? OLD_ENDPOINTS : ENDPOINT_MAPPING;
+
+        Object.keys(endpointType[endpoint]).forEach((key) => {
           this.$set(
             this.model,
             key,
-            ENDPOINT_MAPPING[endpoint][key].replace(
+            endpointType[endpoint][key].replace(
               TENANT_ID_TOKEN,
               this.model.tenantId
             )
@@ -176,13 +178,30 @@ export default {
     },
 
     setInitialEndpoint(endpoint) {
-      const endpointKey = Object.keys(ENDPOINT_MAPPING).find(key => ENDPOINT_MAPPING[key].graphEndpoint === endpoint);
+      const newEndpointKey = this.determineEndpointKeyType(ENDPOINT_MAPPING);
+      const oldEndpointKey = Object.keys(OLD_ENDPOINTS).find(key => OLD_ENDPOINTS[key].graphEndpoint === endpoint);
 
-      if ( endpointKey ) {
-        this.endpoint = endpointKey;
+      if ( oldEndpointKey ) {
+        this.endpoint = this.determineEndpointKeyType(OLD_ENDPOINTS);
+        this.oldEndpoint = true;
       } else {
-        this.endpoint = 'custom';
+        this.endpoint = newEndpointKey;
+      }
+    },
+
+    determineEndpointKeyType(endpointTypes) {
+      let out = 'custom';
+
+      for ( const [endpointKey, endpointKeyValues] of Object.entries(endpointTypes) ) {
+        const mappedValues = Object.values(endpointKeyValues).map(endpoint => endpoint.replace(TENANT_ID_TOKEN, this.model?.tenantId));
+        const valuesToCheck = Object.keys(endpointKeyValues).map(key => this.value[key]);
+
+        if ( isEqual(mappedValues, valuesToCheck) ) {
+          out = endpointKey;
+        }
       }
+
+      return out;
     },
 
     getNewApplicationSecret() {

package/edit/networking.k8s.io.ingress/index.vue

@@ -65,7 +65,7 @@ export default {
           path: 'metadata.name', rules: ['required', 'hostname'], translationKey: 'nameNsDescription.name.label'
         },
         {
-          path: 'spec.rules.host', rules: ['hostname'], translationKey: 'ingress.rules.requestHost.label'
+          path: 'spec.rules.host', rules: ['wildcardHostname'], translationKey: 'ingress.rules.requestHost.label'
         },
         {
           path: 'spec.rules.http.paths.path', rules: ['absolutePath'], translationKey: 'ingress.rules.path.label'
@@ -83,7 +83,7 @@ export default {
         {
           path: 'spec.defaultBackend.service.port.number', rules: ['required', 'requiredInt', 'portNumber'], translationKey: 'ingress.defaultBackend.port.label'
         },
-        { path: 'spec.tls.hosts', rules: ['required', 'hostname'] }
+        { path: 'spec.tls.hosts', rules: ['required', 'wildcardHostname'] }
       ],
       fvReportedValidationPaths: ['spec.rules.http.paths.backend.service.port.number', 'spec.rules.http.paths.path', 'spec.rules.http.paths.backend.service.name']
     };

package/edit/persistentvolume/index.vue

@@ -1,4 +1,5 @@
 <script>
+import { mapGetters } from 'vuex';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
@@ -15,10 +16,11 @@ import UnitInput from '@shell/components/form/UnitInput';
 import { NODE, PVC, STORAGE_CLASS } from '@shell/config/types';
 import Loading from '@shell/components/Loading';
 import { LONGHORN_PLUGIN, VOLUME_PLUGINS } from '@shell/models/persistentvolume';
-import { _CREATE, _VIEW } from '@shell/config/query-params';
+import { _CREATE, _VIEW, _EDIT } from '@shell/config/query-params';
 import { clone } from '@shell/utils/object';
 import InfoBox from '@shell/components/InfoBox';
 import { mapFeature, UNSUPPORTED_STORAGE_DRIVERS } from '@shell/store/features';
+import ResourceManager from '@shell/mixins/resource-manager';
 
 export default {
   name: 'PersistentVolume',
@@ -39,18 +41,26 @@ export default {
     UnitInput
   },
 
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, ResourceManager],
 
-  async fetch() {
-    const storageClasses = await this.$store.dispatch('cluster/findAll', { type: STORAGE_CLASS });
+  fetch() {
+    if (this.mode === _EDIT) {
+      this.secondaryResourceData.namespace = this.value?.spec?.claimRef?.namespace || null;
 
-    await this.$store.dispatch('cluster/findAll', { type: PVC });
+      this.secondaryResourceData.data[PVC] = {
+        applyTo: [
+          {
+            var:         'currentClaim',
+            classify:    true,
+            parsingFunc: (data) => {
+              return data.find(claim => claim.spec.volumeName === this.value.name);
+            }
+          }
+        ]
+      };
+    }
 
-    this.storageClassOptions = storageClasses.map(s => ({
-      label: s.name,
-      value: s.name
-    }));
-    this.storageClassOptions.unshift(this.NONE_OPTION);
+    this.resourceManagerFetchSecondaryResources(this.secondaryResourceData);
   },
 
   data() {
@@ -70,7 +80,30 @@ export default {
     const plugin = (foundPlugin || VOLUME_PLUGINS[0]).value;
 
     return {
+      secondaryResourceData:       {
+        namespace: null,
+        data:      {
+          [STORAGE_CLASS]: {
+            applyTo: [
+              {
+                var:         'storageClassOptions',
+                parsingFunc: (data) => {
+                  const storageClassOptions = data.map(s => ({
+                    label: s.metadata.name,
+                    value: s.metadata.name
+                  }));
+
+                  storageClassOptions.unshift(this.NONE_OPTION);
+
+                  return storageClassOptions;
+                }
+              }
+            ]
+          },
+        }
+      },
       storageClassOptions: [],
+      currentClaim:        null,
       plugin,
       NONE_OPTION,
       NODE,
@@ -80,6 +113,7 @@ export default {
 
   computed: {
     showUnsupportedStorage: mapFeature(UNSUPPORTED_STORAGE_DRIVERS),
+    ...mapGetters(['currentProduct', 'currentCluster']),
 
     readWriteOnce: {
       get() {
@@ -196,12 +230,12 @@ export default {
       :namespaced="false"
     />
 
-    <InfoBox v-if="value.claim">
+    <InfoBox v-if="currentClaim">
       <div class="row">
         <div class="col span-6 text-center">
           <label class="text-muted">Persistent Volume Claim:</label>&nbsp;
-          <n-link :to="value.claim.detailLocation">
-            {{ value.claim.namespacedName }}
+          <n-link :to="currentClaim.detailLocation">
+            {{ currentClaim.namespacedName }}
           </n-link>
         </div>
         <div class="col span-6 text-center">
@@ -267,6 +301,7 @@ export default {
               v-model="value.spec.storageClassName"
               :label="t('persistentVolume.customize.assignToStorageClass.label')"
               :options="storageClassOptions"
+              :loading="isLoadingSecondaryResources"
             />
           </div>
         </div>
@@ -295,4 +330,7 @@ export default {
   max-height: 100%;
   height: 100%;
 }
+.info-box {
+  flex-grow: 0;
+}
 </style>

package/edit/persistentvolumeclaim.vue

@@ -15,6 +15,7 @@ import StatusTable from '@shell/components/StatusTable';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Labels from '@shell/components/form/Labels';
 import { Banner } from '@components/Banner';
+import ResourceManager from '@shell/mixins/resource-manager';
 
 const DEFAULT_STORAGE = '10Gi';
 
@@ -36,26 +37,17 @@ export default {
     UnitInput,
   },
 
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, ResourceManager],
   async fetch() {
     const storageClasses = await this.$store.dispatch('cluster/findAll', { type: STORAGE_CLASS });
 
     if (this.$store.getters['management/canList'](PV)) {
-      this.persistentVolumes = await this.$store.dispatch('cluster/findAll', { type: PV });
+      this.resourceManagerFetchSecondaryResources(this.secondaryResourceData);
     }
 
     this.storageClassOptions = storageClasses.map(s => s.name).sort();
     this.storageClassOptions.unshift(this.t('persistentVolumeClaim.useDefault'));
-    this.persistentVolumeOptions = this.persistentVolumes
-      .map((s) => {
-        const status = s.status.phase === 'Available' ? '' : ` (${ s.status.phase })`;
 
-        return {
-          label:  `${ s.name }${ status }`,
-          value: s.name
-        };
-      })
-      .sort((l, r) => l.label.localeCompare(r.label));
     this.$set(this.value.spec, 'storageClassName', this.value.spec.storageClassName || this.storageClassOptions[0]);
   },
   data() {
@@ -85,6 +77,31 @@ export default {
     const defaultTab = this.$route.query[FOCUS] || null;
 
     return {
+      secondaryResourceData:       {
+        namespace: this.value?.metadata?.namespace || null,
+        data:      {
+          [PV]: {
+            applyTo: [
+              { var: 'persistentVolumes' },
+              {
+                var:         'persistentVolumeOptions',
+                parsingFunc: (data) => {
+                  return data
+                    .map((s) => {
+                      const status = s.status.phase === 'Available' ? '' : ` (${ s.status.phase })`;
+
+                      return {
+                        label:  `${ s.metadata.name }${ status }`,
+                        value: s.metadata.name
+                      };
+                    })
+                    .sort((l, r) => l.label.localeCompare(r.label));
+                }
+              }
+            ]
+          },
+        }
+      },
       sourceOptions,
       source:                  this.value.spec.volumeName ? sourceOptions[1].value : sourceOptions[0].value,
       immutableMode:           this.realMode === _CREATE ? _CREATE : _VIEW,
@@ -126,7 +143,7 @@ export default {
         return this.value.spec.volumeName;
       },
       set(value) {
-        const persistentVolume = this.persistentVolumes.find(pv => pv.name === value);
+        const persistentVolume = this.persistentVolumes.find(pv => pv.metadata.name === value);
 
         if (persistentVolume) {
           this.$set(this.value.spec.resources.requests, 'storage', persistentVolume.spec.capacity?.storage);
@@ -170,7 +187,7 @@ export default {
       }
     },
     isPersistentVolumeSelectable(option) {
-      const persistentVolume = this.persistentVolumes.find(pv => pv.name === option.value);
+      const persistentVolume = this.persistentVolumes.find(pv => pv.metadata.name === option.value);
 
       return persistentVolume.status.phase === 'Available';
     },
@@ -248,6 +265,7 @@ export default {
                   :label="t('persistentVolumeClaim.volumeClaim.persistentVolume')"
                   :selectable="isPersistentVolumeSelectable"
                   :mode="immutableMode"
+                  :loading="isLoadingSecondaryResources"
                 />
                 <LabeledInput
                   v-else

package/edit/pod.vue

@@ -0,0 +1,27 @@
+<script>
+import CreateEditView from '@shell/mixins/create-edit-view';
+import FormValidation from '@shell/mixins/form-validation';
+import WorkLoadMixin from '@shell/edit/workload/mixins/workload';
+import Workload from '@shell/edit/workload/index.vue';
+
+export default {
+  name:       'WorkloadDeployments',
+  components: { Workload },
+  mixins:     [CreateEditView, FormValidation, WorkLoadMixin],
+  props:      {
+    value: {
+      type:     Object,
+      required: true,
+    },
+
+    mode: {
+      type:    String,
+      default: 'create',
+    },
+  },
+};
+</script>
+
+<template>
+  <Workload v-bind="$props" />
+</template>