@rancher/shell 0.1.3 → 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/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

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

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/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"

package/edit/service.vue

@@ -198,7 +198,8 @@ export default {
   },
 
   watch: {
-    'value.spec.selector': 'updateMatchingPods',
+    'value.metadata.namespace': 'updateMatchingPods',
+    'value.spec.selector':      'updateMatchingPods',
     'value.spec.sessionAffinity'(val) {
       if (val === 'ClientIP') {
         this.value.spec.sessionAffinityConfig = { clientIP: { timeoutSeconds: null } };
@@ -240,21 +241,22 @@ export default {
 
   methods: {
     updateMatchingPods: throttle(function() {
-      const { allPods, value: { spec: { selector = { } } } } = this;
+      const { value: { spec: { selector = { } } } } = this;
+      const allInNamespace = this.allPods.filter(pod => pod.metadata.namespace === this.value?.metadata?.namespace);
 
       if (isEmpty(selector)) {
         this.matchingPods = {
           matched: 0,
-          total:   allPods.length,
+          total:   allInNamespace.length,
           none:    true,
           sample:  null,
         };
       } else {
-        const match = matching(allPods, selector);
+        const match = matching(allInNamespace, selector);
 
         this.matchingPods = {
           matched: match.length,
-          total:   allPods.length,
+          total:   allInNamespace.length,
           none:    match.length === 0,
           sample:  match[0] ? match[0].nameDisplay : null,
         };

package/edit/workload/__tests__/Upgrading.test.ts

@@ -26,6 +26,7 @@ describe('component: Upgrading', () => {
   });
 
   // TODO: #6179: Integrate test with component fix, as the scope is not to check the value of the input
+  // eslint-disable-next-line jest/no-disabled-tests
   it.skip.each([
     ['surge', 'maxSurge', '%'],
     ['unavailable', 'maxUnavailable', '%'],

package/edit/workload/index.vue

@@ -197,6 +197,19 @@ export default {
             <Tab :label="t('workload.container.titles.securityContext')" name="securityContext" :weight="tabWeightMap['securityContext']">
               <Security v-model="allContainers[i].securityContext" :mode="mode" />
             </Tab>
+            <Tab :label="t('workload.storage.title')" name="storage" :weight="tabWeightMap['storage']">
+              <ContainerMountPaths
+                v-model="podTemplateSpec"
+                :namespace="value.metadata.namespace"
+                :register-before-hook="registerBeforeHook"
+                :mode="mode"
+                :secrets="namespacedSecrets"
+                :config-maps="namespacedConfigMaps"
+                :container="allContainers[i]"
+                :save-pvc-hook-name="savePvcHookName"
+                @removePvcForm="clearPvcFormState"
+              />
+            </Tab>
           </Tabbed>
         </Tab>
         <Tab v-if="!isPod" :label="nameDisplayFor(type)" :name="nameDisplayFor(type)" :weight="99">
@@ -220,7 +233,6 @@ export default {
                 :mode="mode"
                 :secrets="namespacedSecrets"
                 :config-maps="namespacedConfigMaps"
-                :container="container"
                 :save-pvc-hook-name="savePvcHookName"
                 @removePvcForm="clearPvcFormState"
               />

package/edit/workload/mixins/workload.js

@@ -9,6 +9,7 @@ import {
   PVC,
   SERVICE_ACCOUNT,
   CAPI,
+  POD,
 } from '@shell/config/types';
 import Tab from '@shell/components/Tabbed/Tab';
 import CreateEditView from '@shell/mixins/create-edit-view';
@@ -36,6 +37,7 @@ import CruResource from '@shell/components/CruResource';
 import Command from '@shell/components/form/Command';
 import LifecycleHooks from '@shell/components/form/LifecycleHooks';
 import Storage from '@shell/edit/workload/storage';
+import ContainerMountPaths from '@shell/edit/workload/storage/ContainerMountPaths.vue';
 import Labels from '@shell/components/form/Labels';
 import { RadioGroup } from '@components/Form/Radio';
 import { UI_MANAGED } from '@shell/config/labels-annotations';
@@ -89,6 +91,7 @@ export default {
     Upgrading,
     VolumeClaimTemplate,
     WorkloadPorts,
+    ContainerMountPaths
   },
 
   mixins: [CreateEditView],
@@ -148,7 +151,6 @@ export default {
   },
 
   data() {
-    let defaultTab;
     let type = this.$route.params.resource;
     const createSidecar = !!this.$route.query.sidecar;
     const isInitContainer = !!this.$route.query.init;
@@ -159,24 +161,18 @@ export default {
 
     if (!this.value.spec) {
       this.value.spec = {};
-      if (this.value.type === WORKLOAD_TYPES.POD) {
+      if (this.value.type === POD) {
         const podContainers = [{
           imagePullPolicy: 'Always',
           name:            `container-0`,
         }];
 
-        defaultTab = 'container-0';
-
         const podSpec = { template: { spec: { containers: podContainers, initContainers: [] } } };
 
         this.$set(this.value, 'spec', podSpec);
       }
     }
 
-    if (this.mode === _CREATE) {
-      defaultTab = 'container-0';
-    }
-
     if ((this.mode === _EDIT || this.mode === _VIEW ) && this.value.type === 'pod' ) {
       const podSpec = { ...this.value.spec };
 
@@ -214,7 +210,6 @@ export default {
           imagePullPolicy: 'Always',
           name:            `container-${ allContainers.length }`,
         });
-        defaultTab = 'container-0';
 
         containers = podTemplateSpec.initContainers;
       }
@@ -224,8 +219,6 @@ export default {
           name:            `container-${ allContainers.length }`,
         };
 
-        defaultTab = 'container-0';
-
         containers.push(container);
       } else {
         container = containers[0];
@@ -261,7 +254,6 @@ export default {
         path: 'image', rootObject: this.container, rules: ['required'], translationKey: 'workload.container.image'
       }],
       fvReportedValidationPaths: ['spec'],
-      defaultTab
 
     };
   },
@@ -271,6 +263,14 @@ export default {
       return { general: this.fvGetPathErrors(['image'])?.length > 0 };
     },
 
+    defaultTab() {
+      if (!!this.$route.query.sidecar || this.$route.query.init || this.mode === _CREATE) {
+        return 'container-0';
+      }
+
+      return this.allContainers.length ? this.allContainers[0].name : '';
+    },
+
     isEdit() {
       return this.mode === _EDIT;
     },
@@ -297,7 +297,7 @@ export default {
     },
 
     isPod() {
-      return this.value.type === WORKLOAD_TYPES.POD;
+      return this.value.type === POD;
     },
 
     isStatefulSet() {