@rancher/shell 0.1.3 → 0.1.21

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;
       }
@@ -1190,32 +1222,40 @@ export default {
         return;
       }
 
-      const clusterId = get(this.credential, 'decodedData.clusterId') || '';
+      try {
+        const clusterId = get(this.credential, 'decodedData.clusterId') || '';
 
-      this.applyChartValues(this.value.spec.rkeConfig);
+        this.applyChartValues(this.value.spec.rkeConfig);
 
-      const isUpgrade = this.isEdit && this.liveValue?.spec?.kubernetesVersion !== this.value?.spec?.kubernetesVersion;
+        const isUpgrade = this.isEdit && this.liveValue?.spec?.kubernetesVersion !== this.value?.spec?.kubernetesVersion;
 
-      if (this.agentConfig['cloud-provider-name'] === HARVESTER && clusterId && (this.isCreate || isUpgrade)) {
-        const namespace = this.machinePools?.[0]?.config?.vmNamespace;
+        if (this.agentConfig['cloud-provider-name'] === HARVESTER && clusterId && (this.isCreate || isUpgrade)) {
+          const namespace = this.machinePools?.[0]?.config?.vmNamespace;
 
-        const res = await this.$store.dispatch('management/request', {
-          url:                  `/k8s/clusters/${ clusterId }/v1/harvester/kubeconfig`,
-          method:               'POST',
-          data:                 {
-            clusterRoleName:    'harvesterhci.io:cloudprovider',
-            namespace,
-            serviceAccountName: this.value.metadata.name,
-          },
-        });
+          const res = await this.$store.dispatch('management/request', {
+            url:                  `/k8s/clusters/${ clusterId }/v1/harvester/kubeconfig`,
+            method:               'POST',
+            data:                 {
+              clusterRoleName:    'harvesterhci.io:cloudprovider',
+              namespace,
+              serviceAccountName: this.value.metadata.name,
+            },
+          });
 
-        const kubeconfig = res.data;
+          const kubeconfig = res.data;
 
-        const harvesterKubeconfigSecret = await this.createKubeconfigSecret(kubeconfig);
+          const harvesterKubeconfigSecret = await this.createKubeconfigSecret(kubeconfig);
+
+          set(this.agentConfig, 'cloud-provider-config', `secret://fleet-default:${ harvesterKubeconfigSecret?.metadata?.name }`);
+          set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.clusterName`, this.value.metadata.name);
+          set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`, '/var/lib/rancher/rke2/etc/config-files/cloud-provider-config');
+        }
+      } catch (err) {
+        this.errors.push(err);
 
-        set(this.agentConfig, 'cloud-provider-config', `secret://fleet-default:${ harvesterKubeconfigSecret?.metadata?.name }`);
-        set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.clusterName`, this.value.metadata.name);
-        set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`, '/var/lib/rancher/rke2/etc/config-files/cloud-provider-config');
+        btnCb(false);
+
+        return;
       }
 
       await this.save(btnCb);
@@ -1562,12 +1602,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 +1750,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 +1860,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 +2167,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

@@ -4,7 +4,7 @@ import FormValidation from '@shell/mixins/form-validation';
 import WorkLoadMixin from '@shell/edit/workload/mixins/workload';
 
 export default {
-  name:       'WorkloadDeployments',
+  name:       'Workload',
   mixins:     [CreateEditView, FormValidation, WorkLoadMixin], // The order here is important since WorkLoadMixin contains some FormValidation configuration
   props:      {
     value: {
@@ -56,6 +56,7 @@ export default {
         :mode="mode"
         :rules="{name: fvGetAndReportPathRules('metadata.name'), namespace: fvGetAndReportPathRules('metadata.namespace'), description: []}"
         @change="name=value.metadata.name"
+        @isNamespaceNew="isNamespaceNew = $event"
       />
       <div v-if="isCronJob || isReplicable || isStatefulSet || containerOptions.length > 1" class="row mb-20">
         <div v-if="isCronJob" class="col span-3">
@@ -91,10 +92,10 @@ export default {
           />
         </div>
       </div>
-      <Tabbed class="deployment-tabs" :show-tabs-add-remove="true" :default-tab="defaultTab" @changed="changed">
+      <Tabbed class="deployment-tabs" :show-tabs-add-remove="true" :default-tab="defaultTab" :flat="true" @changed="changed">
         <Tab
           v-for="(tab, i) in allContainers"
-          :key="i+tab.name"
+          :key="i"
           :label="tab.name"
           :name="tab.name"
           :weight="tab.weight"
@@ -110,7 +111,7 @@ export default {
               <div>
                 <div :style="{'align-items':'center'}" class="row mb-20">
                   <div class="col span-6">
-                    <LabeledInput v-model="container.name" :mode="mode" :label="t('workload.container.containerName')" />
+                    <LabeledInput v-model="allContainers[i].name" :mode="mode" :label="t('workload.container.containerName')" />
                   </div>
                   <div class="col span-6">
                     <RadioGroup
@@ -127,7 +128,7 @@ export default {
                 <div class="row mb-20">
                   <div class="col span-6">
                     <LabeledInput
-                      v-model.trim="container.image"
+                      v-model.trim="allContainers[i].image"
                       :mode="mode"
                       :label="t('workload.container.image')"
                       :placeholder="t('generic.placeholder', {text: 'nginx:latest'}, true)"
@@ -136,7 +137,7 @@ export default {
                   </div>
                   <div class="col span-6">
                     <LabeledSelect
-                      v-model="container.imagePullPolicy"
+                      v-model="allContainers[i].imagePullPolicy"
                       :label="t('workload.container.imagePullPolicy')"
                       :options="pullPolicyOptions"
                       :mode="mode"
@@ -169,7 +170,13 @@ export default {
               <div class="spacer" />
               <div>
                 <h3>{{ t('workload.container.titles.command') }}</h3>
-                <Command v-model="allContainers[i]" :secrets="namespacedSecrets" :config-maps="namespacedConfigMaps" :mode="mode" />
+                <Command
+                  v-model="allContainers[i]"
+                  :secrets="namespacedSecrets"
+                  :config-maps="namespacedConfigMaps"
+                  :mode="mode"
+                  :loading="isLoadingSecondaryResources"
+                />
               </div>
               <ServiceNameSelect
                 :value="podTemplateSpec.serviceAccountName"
@@ -178,6 +185,7 @@ export default {
                 :select-placeholder="t('workload.serviceAccountName.label')"
                 :options="namespacedServiceNames"
                 option-label="metadata.name"
+                :loading="isLoadingSecondaryResources"
                 @input="updateServiceAccount"
               />
               <div class="spacer" />
@@ -197,6 +205,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,8 +241,9 @@ export default {
                 :mode="mode"
                 :secrets="namespacedSecrets"
                 :config-maps="namespacedConfigMaps"
-                :container="container"
                 :save-pvc-hook-name="savePvcHookName"
+                :loading="isLoadingSecondaryResources"
+                :namespaced-pvcs="pvcs"
                 @removePvcForm="clearPvcFormState"
               />
             </Tab>
@@ -253,10 +275,10 @@ export default {
               </template>
             </Tab>
             <Tab :label="t('workload.container.titles.podScheduling')" name="podScheduling" :weight="tabWeightMap['podScheduling']">
-              <PodAffinity :mode="mode" :value="podTemplateSpec" :nodes="allNodeObjects" />
+              <PodAffinity :mode="mode" :value="podTemplateSpec" :nodes="allNodeObjects" :loading="isLoadingSecondaryResources" />
             </Tab>
             <Tab :label="t('workload.container.titles.nodeScheduling')" name="nodeScheduling" :weight="tabWeightMap['nodeScheduling']">
-              <NodeScheduling :mode="mode" :value="podTemplateSpec" :nodes="allNodes" />
+              <NodeScheduling :mode="mode" :value="podTemplateSpec" :nodes="allNodes" :loading="isLoadingSecondaryResources" />
             </Tab>
             <Tab :label="t('workload.container.titles.upgrading')" name="upgrading" :weight="tabWeightMap['upgrading']">
               <Job v-if="isJob || isCronJob" v-model="spec" :mode="mode" :type="type" />