@rancher/shell 0.1.2 → 0.1.4

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/{components/dialog → 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';
@@ -67,11 +68,17 @@ export default {
 
   async fetch() {
     await this.reloadModel();
+
+    if ( this.value?.graphEndpoint ) {
+      this.setInitialEndpoint(this.value.graphEndpoint);
+    }
   },
 
   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
@@ -143,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);
@@ -158,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
             )
@@ -171,6 +177,33 @@ export default {
       }
     },
 
+    setInitialEndpoint(endpoint) {
+      const newEndpointKey = this.determineEndpointKeyType(ENDPOINT_MAPPING);
+      const oldEndpointKey = Object.keys(OLD_ENDPOINTS).find(key => OLD_ENDPOINTS[key].graphEndpoint === endpoint);
+
+      if ( oldEndpointKey ) {
+        this.endpoint = this.determineEndpointKeyType(OLD_ENDPOINTS);
+        this.oldEndpoint = true;
+      } else {
+        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() {
       const applicationSecretOrId =
         this.model.applicationSecret || this.applicationSecret;
@@ -291,7 +324,7 @@ export default {
         <InfoBox v-if="!model.enabled" id="reply-info" class="mt-20 mb-20 p-10">
           {{ t('authConfig.azuread.reply.info') }}
           <br />
-          <label>{{ t('authConfig.azuread.reply.label') }} </label>
+          <label class="reply-url">{{ t('authConfig.azuread.reply.label') }} </label>
           <CopyToClipboardText :plain="true" :text="replyUrl" />
         </InfoBox>
 
@@ -387,4 +420,9 @@ export default {
 #reply-info {
   flex-grow: 0;
 }
+
+.reply-url {
+  color: inherit;
+  font-weight: 700;
+}
 </style>

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

@@ -16,7 +16,7 @@ import { NAME } from '@shell/config/product/explorer';
 import { PROJECT_ID, _VIEW, _CREATE, _EDIT } from '@shell/config/query-params';
 import ProjectMembershipEditor from '@shell/components/form/Members/ProjectMembershipEditor';
 import { canViewProjectMembershipEditor } from '@shell/components/form/Members/ProjectMembershipEditor.vue';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 import { Banner } from '@components/Banner';
 
 export default {
@@ -188,7 +188,7 @@ export default {
 <template>
   <CruResource
     class="project"
-    :done-route="'c-cluster-product-projectsnamespaces'"
+    :done-route="value.listLocation"
     :errors="fvUnreportedValidationErrors"
     :mode="mode"
     :resource="value"

package/edit/namespace.vue

@@ -15,7 +15,7 @@ import MoveModal from '@shell/components/MoveModal';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Namespace';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_TYPES, RANCHER_TYPES } from '@shell/components/form/ResourceQuota/shared';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 
 export default {
   components: {
@@ -34,9 +34,11 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
-    this.projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
+    if (this.$store.getters['management/schemaFor'](MANAGEMENT.PROJECT)) {
+      this.projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
 
-    this.project = this.projects.find(p => p.id.includes(this.projectName));
+      this.project = this.projects.find(p => p.id.includes(this.projectName));
+    }
   },
 
   data() {
@@ -62,8 +64,9 @@ export default {
 
   computed: {
     ...mapGetters(['isSingleProduct']),
-    isHarvester() {
-      return this.$store.getters['currentProduct'].inStore === HARVESTER;
+
+    isSingleHarvester() {
+      return this.$store.getters['currentProduct'].inStore === HARVESTER && this.isSingleProduct;
     },
 
     projectOpts() {
@@ -93,7 +96,11 @@ export default {
     },
 
     showResourceQuota() {
-      return Object.keys(this.project?.spec?.resourceQuota?.limit || {}).length > 0;
+      return !this.isSingleHarvester && Object.keys(this.project?.spec?.resourceQuota?.limit || {}).length > 0;
+    },
+
+    showContainerResourceLimit() {
+      return !this.isSingleHarvester;
     }
   },
 
@@ -160,13 +167,13 @@ export default {
       :namespaced="false"
       :mode="mode"
     >
-      <template v-if="!isSingleProduct" #project-col>
+      <template v-if="project" #project-col>
         <LabeledSelect v-model="projectName" :label="t('namespace.project.label')" :options="projectOpts" />
       </template>
     </NameNsDescription>
 
     <Tabbed :side-tabs="true">
-      <Tab v-if="!isSingleProduct && showResourceQuota" :weight="1" name="container-resource-quotas" :label="t('namespace.resourceQuotas')">
+      <Tab v-if="showResourceQuota" :weight="1" name="container-resource-quotas" :label="t('namespace.resourceQuotas')">
         <div class="row">
           <div class="col span-12">
             <p class="helper-text mb-10">
@@ -177,7 +184,7 @@ export default {
         </div>
         <ResourceQuota v-model="value" :mode="mode" :project="project" :types="isHarvester ? HARVESTER_TYPES : RANCHER_TYPES" />
       </Tab>
-      <Tab v-if="!isSingleProduct" :weight="0" name="container-resource-limit" :label="t('namespace.containerResourceLimit')">
+      <Tab v-if="showContainerResourceLimit" :weight="0" name="container-resource-limit" :label="t('namespace.containerResourceLimit')">
         <ContainerResourceLimit
           :key="JSON.stringify(containerResourceLimits)"
           :value="containerResourceLimits"
@@ -200,6 +207,6 @@ export default {
         />
       </Tab>
     </Tabbed>
-    <MoveModal />
+    <MoveModal v-if="projects" />
   </CruResource>
 </template>

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

@@ -295,4 +295,7 @@ export default {
   max-height: 100%;
   height: 100%;
 }
+.info-box {
+  flex-grow: 0;
+}
 </style>

package/edit/persistentvolumeclaim.vue

@@ -269,6 +269,7 @@ export default {
                   :output-modifier="true"
                   :increment="1024"
                   :min="1"
+                  :required="true"
                 />
                 <Banner v-if="isEdit && !value.expandable" color="info" class="mt-10">
                   {{ t('persistentVolumeClaim.expand.notSupported') }}

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>

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

@@ -71,7 +71,7 @@ export default {
         const e = sanitizeValue(t.effect);
 
         if ( k && v && e ) {
-          out.push(`--taint ${ k }=${ v }:${ e }`);
+          out.push(`--taints ${ k }=${ v }:${ e }`);
         }
       }
 

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

@@ -1,5 +1,4 @@
 <script>
-
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { Checkbox } from '@components/Form/Checkbox';
 import { _EDIT } from '@shell/config/query-params';
@@ -64,11 +63,40 @@ export default {
 
   data() {
     const parseDuration = (duration) => {
-      // The back end stores the timeout in Duration format, for example, "10m".
-      // Here we convert that string to an integer.
-      const numberString = duration.split('m')[0];
+      // The back end stores the timeout in Duration format, for example, "42d31h10m30s".
+      // Here we convert that string to an integer and return the duration as seconds.
+      const splitStr = duration.split(/([a-z])/);
+
+      const durationsAsSeconds = splitStr.reduce((old, neu, idx) => {
+        const parsed = parseInt(neu);
+
+        if ( isNaN(parsed) ) {
+          return old;
+        }
+
+        const interval = splitStr[(idx + 1)];
+
+        switch (interval) {
+        case 'd':
+          old.push(parsed * 24 * 60 * 60);
+          break;
+        case 'h':
+          old.push(parsed * 60 * 60);
+          break;
+        case 'm':
+          old.push(parsed * 60);
+          break;
+        case 's':
+          old.push(parsed);
+          break;
+        default:
+          break;
+        }
+
+        return old;
+      }, []);
 
-      return parseInt(numberString, 10);
+      return durationsAsSeconds.reduce((old, neu) => old + neu);
     };
 
     return {

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

@@ -14,7 +14,8 @@ import {
   NORMAN,
   SCHEMA,
   DEFAULT_WORKSPACE,
-  SECRET
+  SECRET,
+  HCI,
 } from '@shell/config/types';
 import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 
@@ -311,7 +312,8 @@ export default {
       clusterIsAlreadyCreated:     !!this.value.id,
       fvFormRuleSets:              [{
         path: 'metadata.name', rules: ['subDomain'], translationKey: 'nameNsDescription.name.label'
-      }]
+      }],
+      harvesterVersionRange: {},
     };
   },
 
@@ -499,7 +501,7 @@ export default {
         const isExternal = opt === 'external';
         let disabled = false;
 
-        if (this.isHarvesterExternalCredential && isPreferred) {
+        if ((this.isHarvesterExternalCredential || this.isHarvesterIncompatible) && isPreferred) {
           disabled = true;
         }
 
@@ -850,6 +852,33 @@ export default {
     isHarvesterExternalCredential() {
       return this.credential?.harvestercredentialConfig?.clusterType === 'external';
     },
+
+    isHarvesterIncompatible() {
+      let ccmRke2Version = (this.chartVersions['harvester-cloud-provider'] || {})['version'];
+      let csiRke2Version = (this.chartVersions['harvester-csi-driver'] || {})['version'];
+
+      const ccmVersion = this.harvesterVersionRange?.['harvester-cloud-provider'];
+      const csiVersion = this.harvesterVersionRange?.['harvester-csi-provider'];
+
+      if ((ccmRke2Version || '').endsWith('00')) {
+        ccmRke2Version = ccmRke2Version.slice(0, -2);
+      }
+
+      if ((csiRke2Version || '').endsWith('00')) {
+        csiRke2Version = csiRke2Version.slice(0, -2);
+      }
+
+      if (ccmVersion && csiVersion) {
+        if (semver.satisfies(ccmRke2Version, ccmVersion) &&
+            semver.satisfies(csiRke2Version, csiVersion)) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    },
   },
 
   watch: {
@@ -867,7 +896,10 @@ export default {
     credentialId(val) {
       if ( val ) {
         this.credential = this.$store.getters['rancher/byId'](NORMAN.CLOUD_CREDENTIAL, this.credentialId);
-        this.setHarvesterDefaultCloudProvider();
+
+        if (this.isHarvesterDriver) {
+          this.setHarvesterVersionRange();
+        }
       } else {
         this.credential = null;
       }
@@ -1562,12 +1594,36 @@ export default {
     get,
 
     setHarvesterDefaultCloudProvider() {
-      if (this.isHarvesterDriver && this.mode === _CREATE && this.agentConfig['cloud-provider-name'] === undefined && !this.isHarvesterExternalCredential) {
+      if (this.isHarvesterDriver &&
+        this.mode === _CREATE &&
+        !this.agentConfig['cloud-provider-name'] &&
+        !this.isHarvesterExternalCredential &&
+        !this.isHarvesterIncompatible
+      ) {
         this.agentConfig['cloud-provider-name'] = HARVESTER;
       } else {
         this.agentConfig['cloud-provider-name'] = '';
       }
     },
+
+    async setHarvesterVersionRange() {
+      const clusterId = this.credential?.decodedData?.clusterId;
+      const clusterType = this.credential?.decodedData?.clusterType;
+
+      if (clusterId && clusterType === 'imported') {
+        const url = `/k8s/clusters/${ clusterId }/v1`;
+        const res = await this.$store.dispatch('cluster/request', { url: `${ url }/${ HCI.SETTING }s` });
+
+        const version = (res?.data || []).find(s => s.id === 'harvester-csi-ccm-versions');
+
+        if (version) {
+          this.harvesterVersionRange = JSON.parse(version.value || version.default || '{}');
+        } else {
+          this.harvesterVersionRange = {};
+        }
+      }
+      this.setHarvesterDefaultCloudProvider();
+    },
   },
 };
 </script>
@@ -1686,6 +1742,14 @@ export default {
         <Tab name="basic" label-key="cluster.tabs.basic" :weight="11" @active="refreshYamls">
           <Banner v-if="!haveArgInfo" color="warning" label="Configuration information is not available for the selected Kubernetes version.  The options available in this screen will be limited, you may want to use the YAML editor." />
           <Banner v-if="showk8s21LegacyWarning" color="warning" :label="t('cluster.legacyWarning')" />
+          <Banner
+            v-if="isHarvesterDriver && isHarvesterIncompatible && showCloudProvider"
+            color="warning"
+          >
+            <span
+              v-html="t('cluster.harvester.warning.cloudProvider.incompatible', null, true)"
+            />
+          </Banner>
           <div class="row mb-10">
             <div class="col span-6">
               <LabeledSelect
@@ -1788,6 +1852,12 @@ export default {
             </div>
           </div>
 
+          <div v-if="serverConfig.cni === 'cilium' && value.spec.enableNetworkPolicy" class="row">
+            <div class="col span-12">
+              <Banner color="info" :label="t('cluster.rke2.enableNetworkPolicy.warning')" />
+            </div>
+          </div>
+
           <div class="spacer" />
 
           <div v-if="serverArgs.disable" class="row">
@@ -2089,6 +2159,7 @@ export default {
         </Tab>
 
         <Tab
+          v-if="haveArgInfo || agentArgs['protect-kernel-defaults']"
           name="advanced"
           label-key="cluster.tabs.advanced"
           :weight="-1"