@rancher/shell 0.3.13 → 0.3.15

package/components/GrafanaDashboard.vue

@@ -23,6 +23,12 @@ export default {
       type:    String,
       default: null
     },
+    // change the grafana url prefix for local clusters in certain monitoring versions
+    // project monitoring (projectHelmCharts) supply a grafana url that never needs to be modified in this way
+    modifyPrefix: {
+      type:    Boolean,
+      default: true
+    },
     backgroundColor: {
       type:    String,
       default: '#1b1c21'
@@ -138,7 +144,7 @@ export default {
       const clusterId = this.$store.getters['currentCluster'].id;
       const params = this.computeParams();
 
-      return computeDashboardUrl(this.monitoringVersion, embedUrl, clusterId, params);
+      return computeDashboardUrl(this.monitoringVersion, embedUrl, clusterId, params, this.modifyPrefix);
     },
     computeParams() {
       const params = {};

package/components/GrowlManager.vue

@@ -10,7 +10,7 @@ export default {
     ...mapState('growl', ['stack']),
 
     shouldRun() {
-      return this.stack.length && this.stack.find(x => x.timeout > 0);
+      return this.stack.length && this.stack.find((x) => x.timeout > 0);
     }
   },
 

package/components/HarvesterServiceAddOnConfig.vue

@@ -1,13 +1,22 @@
 <script>
+import { mapGetters } from 'vuex';
+import semver from 'semver';
+
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { _CREATE } from '@shell/config/query-params';
 import { get } from '@shell/utils/object';
 import { HCI as HCI_LABELS_ANNOTATIONS } from '@shell/config/labels-annotations';
+import { SERVICE } from '@shell/config/types';
+import { allHash } from '@shell/utils/promise';
 
 const HARVESTER_ADD_ON_CONFIG = [{
   variableName: 'ipam',
   key:          HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_IPAM,
   default:      'dhcp'
+}, {
+  variableName: 'sharedService',
+  key:          HCI_LABELS_ANNOTATIONS.PRIMARY_SERVICE,
+  default:      ''
 }];
 
 export default {
@@ -38,6 +47,19 @@ export default {
     }
   },
 
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    const hash = {
+      rke2Versions: this.$store.dispatch('management/request', { url: '/v1-rke2-release/releases' }),
+      services:     this.$store.dispatch(`${ inStore }/findAll`, { type: SERVICE }),
+    };
+
+    const res = await allHash(hash);
+
+    this.rke2Versions = res.rke2Versions;
+  },
+
   data() {
     const harvesterAddOnConfig = {};
 
@@ -45,10 +67,24 @@ export default {
       harvesterAddOnConfig[c.variableName] = this.value.metadata.annotations[c.key] || c.default;
     });
 
-    return { ...harvesterAddOnConfig };
+    let showShareIP;
+
+    if (this.value.metadata.annotations[HCI_LABELS_ANNOTATIONS.PRIMARY_SERVICE]) {
+      showShareIP = true;
+    } else {
+      showShareIP = false;
+    }
+
+    return {
+      ...harvesterAddOnConfig,
+      showShareIP,
+      rke2Versions: {},
+    };
   },
 
   computed: {
+    ...mapGetters(['allowedNamespaces', 'namespaces', 'currentCluster']),
+
     ipamOptions() {
       return [{
         label: 'DHCP',
@@ -62,15 +98,73 @@ export default {
     portOptions() {
       const ports = this.value?.spec?.ports || [];
 
-      return ports.filter(p => p.port && p.protocol === 'TCP').map(p => p.port) || [];
+      return ports.filter((p) => p.port && p.protocol === 'TCP').map((p) => p.port) || [];
+    },
+
+    serviceOptions() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const services = this.$store.getters[`${ inStore }/all`](SERVICE);
+
+      const namespaces = this.namespaces();
+
+      const out = services.filter((s) => {
+        const ingress = s?.status?.loadBalancer?.ingress || [];
+
+        return ingress.length > 0 &&
+                !s?.metadata?.annotations?.['cloudprovider.harvesterhci.io/primary-service'] &&
+                s.spec?.type === 'LoadBalancer' &&
+                namespaces[s.metadata.namespace];
+      });
+
+      return out.map((s) => s.id);
+    },
+
+    shareIPEnabled() {
+      const kubernetesVersion = this.currentCluster.kubernetesVersion || '';
+      const kubernetesVersionExtension = this.currentCluster.kubernetesVersionExtension;
+
+      if (kubernetesVersionExtension.startsWith('+rke2')) {
+        const charts = ((this.rke2Versions?.data || []).find((v) => v.id === kubernetesVersion) || {}).charts;
+        let ccmVersion = charts?.['harvester-cloud-provider']?.version || '';
+
+        if (ccmVersion.endsWith('00')) {
+          ccmVersion = ccmVersion.slice(0, -2);
+        }
+
+        return semver.satisfies(ccmVersion, '>=0.2.0');
+      } else {
+        return true;
+      }
     },
   },
 
   methods: {
     willSave() {
+      const errors = [];
+
+      if (this.showShareIP) {
+        if (!this.sharedService) {
+          errors.push(this.t('validation.required', { key: this.t('servicesPage.harvester.shareIP.label') }, true));
+        }
+      }
+
+      if (errors.length > 0) {
+        return Promise.reject(errors);
+      }
+
       HARVESTER_ADD_ON_CONFIG.forEach((c) => {
         this.value.metadata.annotations[c.key] = String(get(this, c.variableName));
       });
+
+      if (this.showShareIP) {
+        delete this.value.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_IPAM];
+      } else {
+        delete this.value.metadata.annotations[HCI_LABELS_ANNOTATIONS.PRIMARY_SERVICE];
+      }
+    },
+
+    toggleShareIP() {
+      this.showShareIP = !this.showShareIP;
     },
   },
 };
@@ -81,11 +175,32 @@ export default {
     <div class="row mt-30">
       <div class="col span-6">
         <LabeledSelect
+          v-if="showShareIP"
+          v-model="sharedService"
+          :mode="mode"
+          :options="serviceOptions"
+          :label="t('servicesPage.harvester.shareIP.label')"
+          :disabled="mode === 'edit'"
+        />
+        <LabeledSelect
+          v-else
           v-model="ipam"
           :mode="mode"
           :options="ipamOptions"
           :label="t('servicesPage.harvester.ipam.label')"
+          :disabled="mode === 'edit'"
         />
+        <div
+          v-if="mode === 'create'"
+          class="mt-10"
+        >
+          <a
+            role="button"
+            @click="toggleShareIP"
+          >
+            {{ showShareIP ? t('servicesPage.harvester.useIpam.label') : t('servicesPage.harvester.useShareIP.label') }}
+          </a>
+        </div>
       </div>
     </div>
   </div>

package/components/IconOrSvg.vue

@@ -18,7 +18,7 @@
  */
 import Vue from 'vue';
 import { Solver } from '@shell/utils/svg-filter';
-import { colorToRgb, mapStandardColors } from '@shell/utils/color';
+import { colorToRgb, mapStandardColors, normalizeHex } from '@shell/utils/color';
 
 const filterCache = {};
 const cssCache = {};
@@ -75,11 +75,18 @@ export default {
         if (stylesheet && stylesheet.cssRules) {
           for (let x = 0; x < Object.keys(stylesheet.cssRules).length; x++) {
             const cssRules = stylesheet.cssRules[x];
-            const selectorText = currTheme === 'light' ? 'body, .theme-light' : '.theme-dark';
 
-            if (cssRules.selectorText && cssRules.selectorText === selectorText) {
+            if (cssRules.selectorText && ((currTheme === 'light' && cssRules.selectorText.includes('body') &&
+              cssRules.selectorText.includes('.theme-light') && cssRules.style.cssText.includes('--link:')) ||
+              (currTheme === 'dark' && cssRules.selectorText.includes('.theme-dark')))) {
+              // grab the colors to be used on the icon from the css rules
               uiColor = mapStandardColors(cssRules.style.getPropertyValue(colors[this.color].color).trim());
               hoverColor = mapStandardColors(cssRules.style.getPropertyValue(colors[this.color].hover).trim());
+
+              // normalize hex colors (#xxx to #xxxxxx)
+              uiColor = normalizeHex(uiColor);
+              hoverColor = normalizeHex(hoverColor);
+
               found = true;
               break;
             }

package/components/LandingPagePreference.vue

@@ -35,7 +35,7 @@ export default {
     routeFromDropdown: {
       get() {
         const route = this.customRoute || {};
-        const out = this.routeDropdownOptions.find(opt => opt.value.name === route.name && opt.value.params?.cluster === route.params?.cluster);
+        const out = this.routeDropdownOptions.find((opt) => opt.value.name === route.name && opt.value.params?.cluster === route.params?.cluster);
 
         return out || this.routeDropdownOptions[0];
       },
@@ -72,7 +72,7 @@ export default {
     routeDropdownOptions() {
       // Drop-down shows list of clusters that can ber set as login landing page
       const out = [];
-      const kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.clusters), this.$store);
+      const kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.clusters, this.$store), this.$store);
 
       kubeClusters.forEach((c) => {
         if (c.isReady) {

package/components/MoveModal.vue

@@ -27,7 +27,7 @@ export default {
     ...mapGetters(['currentCluster']),
 
     excludedProjects() {
-      return this.toMove.filter(namespace => !!namespace.project).map(namespace => namespace.project.shortId);
+      return this.toMove.filter((namespace) => !!namespace.project).map((namespace) => namespace.project.shortId);
     },
 
     projectOptions() {

package/components/PodSecurityAdmission.vue

@@ -83,7 +83,7 @@ export default Vue.extend({
       // Generate PSA form controls
       psaControls:           toDictionary(PSAModes, getPsaControl) as Record<PSAMode, PSAControl>,
       psaExemptionsControls: toDictionary(PSADimensions, getExemptionControl) as Record<PSADimension, PSAExemptionControl>,
-      options:               PSALevels.map(level => ({
+      options:               PSALevels.map((level) => ({
         value: level,
         label: this.t(`podSecurityAdmission.labels.${ level }`)
       })),
@@ -145,7 +145,7 @@ export default Vue.extend({
      */
     updateExemptions(): void {
       const exemptions = PSADimensions.reduce((acc, dimension) => {
-        const value = this.psaExemptionsControls[dimension].value.split(',').map(value => value.trim());
+        const value = this.psaExemptionsControls[dimension].value.split(',').map((value) => value.trim());
         const active = this.psaExemptionsControls[dimension].active;
 
         return {
@@ -182,7 +182,7 @@ export default Vue.extend({
      */
     getPsaExemptions(): Record<PSADimension, PSAExemptionControl> {
       return PSADimensions.reduce((acc, dimension) => {
-        const values = (this.exemptions[dimension] || []).map(value => value.trim()).join(',');
+        const values = (this.exemptions[dimension] || []).map((value) => value.trim()).join(',');
 
         return {
           ...acc,

package/components/ProgressBarMulti.vue

@@ -68,7 +68,7 @@ export default {
       if ( !this.max ) {
         max = 100;
         if ( out.length ) {
-          max = out.map(x => x.value).reduce((a, b) => a + b);
+          max = out.map((x) => x.value).reduce((a, b) => a + b);
         }
       }
 
@@ -88,7 +88,7 @@ export default {
         obj.style = `width: ${ obj.percent }%`;
       }
 
-      return out.filter(obj => obj.percent);
+      return out.filter((obj) => obj.percent);
     },
   }
 };

package/components/PromptRemove.vue

@@ -9,11 +9,13 @@ import { uniq } from '@shell/utils/array';
 import AsyncButton from '@shell/components/AsyncButton';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { CATALOG } from '@shell/config/types';
+import { LabeledInput } from '@components/Form/LabeledInput';
+
 export default {
   name: 'PromptRemove',
 
   components: {
-    Card, Checkbox, AsyncButton
+    Card, Checkbox, AsyncButton, LabeledInput
   },
   props: {
     /**
@@ -42,7 +44,7 @@ export default {
   },
   computed: {
     names() {
-      return this.toRemove.map(obj => obj.nameDisplay).slice(0, 5);
+      return this.toRemove.map((obj) => obj.nameDisplay).slice(0, 5);
     },
 
     nameToMatchPosition() {
@@ -100,6 +102,11 @@ export default {
       if (this.toRemove.length > 1) {
         return null;
       }
+
+      if (this.toRemove[0].doneLocationRemove) {
+        return this.toRemove[0].doneLocationRemove;
+      }
+
       const currentRoute = this.toRemove[0].currentRoute();
       const out = {};
       const params = { ...currentRoute.params };
@@ -184,7 +191,7 @@ export default {
     // if none found (delete is allowed), then check for any resources with a warning message
     toRemove(neu) {
       let message;
-      const preventDeletionMessages = neu.filter(item => item.preventDeletionMessage);
+      const preventDeletionMessages = neu.filter((item) => item.preventDeletionMessage);
 
       this.preventDelete = false;
 
@@ -192,7 +199,7 @@ export default {
         this.preventDelete = true;
         message = preventDeletionMessages[0].preventDeletionMessage;
       } else {
-        const warnDeletionMessages = neu.filter(item => item.warnDeletionMessage);
+        const warnDeletionMessages = neu.filter((item) => item.warnDeletionMessage);
 
         if (!!warnDeletionMessages.length) {
           message = warnDeletionMessages[0].warnDeletionMessage;
@@ -224,6 +231,7 @@ export default {
         // doneLocation will recompute to undefined when delete request completes
         this.cachedDoneLocation = { ...this.doneLocation };
       }
+
       if (this.hasCustomRemove && this.$refs?.customPrompt?.remove) {
         let handled = this.$refs.customPrompt.remove(btnCB);
 
@@ -247,7 +255,7 @@ export default {
           return;
         }
       }
-      const serialRemove = this.toRemove.some(resource => resource.removeSerially);
+      const serialRemove = this.toRemove.some((resource) => resource.removeSerially);
 
       if (serialRemove) {
         this.serialRemove(btnCB);
@@ -272,10 +280,16 @@ export default {
     },
     async parallelRemove(btnCB) {
       try {
+        if (typeof this.toRemove[0].bulkRemove !== 'undefined') {
+          await this.toRemove[0].bulkRemove(this.toRemove, {});
+        } else {
+          await Promise.all(this.toRemove.map((resource) => resource.remove()));
+        }
+
         const spoofedTypes = this.getSpoofedTypes(this.toRemove);
 
-        await Promise.all(this.toRemove.map(resource => resource.remove()));
         await this.refreshSpoofedTypes(spoofedTypes);
+
         this.done();
       } catch (err) {
         this.error = err.message || err;
@@ -289,7 +303,7 @@ export default {
       this.close();
     },
     getSpoofedTypes(resources) {
-      const uniqueResourceTypes = uniq(this.toRemove.map(resource => resource.type));
+      const uniqueResourceTypes = uniq(this.toRemove.map((resource) => resource.type));
 
       return uniqueResourceTypes.filter(this.$store.getters['type-map/isSpoofed']);
     },
@@ -297,7 +311,7 @@ export default {
     // If spoofed we need to reload the values as the server can't have watchers for them.
     refreshSpoofedTypes(types) {
       const inStore = this.$store.getters['currentProduct'].inStore;
-      const promises = types.map(type => this.$store.dispatch(`${ inStore }/findAll`, { type, opt: { force: true } }, { root: true }));
+      const promises = types.map((type) => this.$store.dispatch(`${ inStore }/findAll`, { type, opt: { force: true } }, { root: true }));
 
       return Promise.all(promises);
     },
@@ -372,32 +386,42 @@ export default {
             </div>
           </template>
         </div>
-        <input
+        <LabeledInput
           v-if="needsConfirm"
           id="confirm"
           v-model="confirmName"
+          v-focus
           :data-testid="componentTestid + '-input'"
           type="text"
         >
-        <div class="text-warning mb-10 mt-10">
-          {{ warning }}
-        </div>
-        <div class="text-error mb-10 mt-10">
-          {{ error }}
-        </div>
-        <div
-          v-if="!needsConfirm"
-          class="text-info mt-20"
-        >
-          {{ protip }}
-        </div>
-        <Checkbox
-          v-if="chartsToRemoveIsApp"
-          v-model="chartsDeleteCrd"
-          label-key="promptRemoveApp.removeCrd"
-          class="mt-10 type"
-          @input="chartAddCrdToRemove"
-        />
+          <div class="text-warning mb-10 mt-10">
+            {{ warning }}
+          </div>
+          <div class="text-error mb-10 mt-10">
+            {{ error }}
+          </div>
+          <div
+            v-if="!needsConfirm"
+            class="text-info mt-20"
+          >
+            {{ protip }}
+          </div>
+          <Checkbox
+            v-if="chartsToRemoveIsApp"
+            v-model="chartsDeleteCrd"
+            label-key="promptRemoveApp.removeCrd"
+            class="mt-10 type"
+            @input="chartAddCrdToRemove"
+          />
+        </labeledinput>
+        <template v-else>
+          <div class="text-warning mb-10 mt-10">
+            {{ warning }}
+          </div>
+          <div class="text-error mb-10 mt-10">
+            {{ error }}
+          </div>
+        </template>
       </div>
       <template #actions>
         <button

package/components/PromptRestore.vue

@@ -70,7 +70,7 @@ export default {
 
     clusterSnapshots() {
       if (this.sortedSnapshots) {
-        return this.sortedSnapshots.map(snapshot => ({ label: this.snapshotLabel(snapshot), value: snapshot.name }));
+        return this.sortedSnapshots.map((snapshot) => ({ label: this.snapshotLabel(snapshot), value: snapshot.name }));
       } else {
         return [];
       }
@@ -115,13 +115,13 @@ export default {
 
       if (!cluster.isRke2) {
         promise = this.$store.dispatch('rancher/findAll', { type: NORMAN.ETCD_BACKUP }).then((snapshots) => {
-          return snapshots.filter(s => s.clusterId === cluster.metadata.name);
+          return snapshots.filter((s) => s.clusterId === cluster.metadata.name);
         });
       } else {
         promise = this.$store.dispatch('management/findAll', { type: SNAPSHOT }).then((snapshots) => {
           const toRestoreClusterName = cluster?.clusterName || cluster?.metadata?.name;
 
-          return snapshots.filter(s => s.clusterName === toRestoreClusterName);
+          return snapshots.filter((s) => s.clusterName === toRestoreClusterName);
         });
       }
 

package/components/Questions/index.vue

@@ -67,9 +67,9 @@ function migrate(expr) {
   let out;
 
   if ( expr.includes('||') ) {
-    out = expr.split('||').map(x => migrate(x)).join(' || ');
+    out = expr.split('||').map((x) => migrate(x)).join(' || ');
   } else if ( expr.includes('&&') ) {
-    out = expr.split('&&').map(x => migrate(x)).join(' && ');
+    out = expr.split('&&').map((x) => migrate(x)).join(' && ');
   } else {
     const parts = expr.match(/^(.*)(!?=)(.*)$/);
 
@@ -311,9 +311,9 @@ export default {
       let result;
 
       if ( get(or, 'length') > 1 ) {
-        result = or.some(showIf => this.calExpression(showIf, allQuestions));
+        result = or.some((showIf) => this.calExpression(showIf, allQuestions));
       } else {
-        result = and.every(showIf => this.calExpression(showIf, allQuestions));
+        result = and.every((showIf) => this.calExpression(showIf, allQuestions));
       }
 
       return result;
@@ -368,7 +368,7 @@ export default {
       return null;
     },
     getAnswer(variable, questions) {
-      const found = questions.find(q => q.variable === variable);
+      const found = questions.find((q) => q.variable === variable);
 
       if ( found ) {
         // Equivalent to finding question.answer in Ember

package/components/RelatedWorkloadsTable.vue

@@ -22,7 +22,7 @@ export default {
       WORKLOAD_TYPES.JOB,
       WORKLOAD_TYPES.STATEFUL_SET
     ];
-    const allWorkloadsNested = await Promise.all(types.map(type => this.$store.dispatch('cluster/findAll', { type })));
+    const allWorkloadsNested = await Promise.all(types.map((type) => this.$store.dispatch('cluster/findAll', { type })));
     const allWorkloads = allWorkloadsNested.flat();
 
     this.relatedWorkloadRows = allWorkloads.filter(this.filter);

package/components/ResourceList/Masthead.vue

@@ -139,7 +139,7 @@ export default {
       }
 
       // blocked-post means you can post through norman, but not through steve.
-      if ( this.schema && !this.schema?.collectionMethods.find(x => ['blocked-post', 'post'].includes(x.toLowerCase())) ) {
+      if ( this.schema && !this.schema?.collectionMethods.find((x) => ['blocked-post', 'post'].includes(x.toLowerCase())) ) {
         return false;
       }
 

package/components/ResourceTable.vue

@@ -225,7 +225,7 @@ export default {
 
       // If only one namespace is selected, hide the namespace column
       if ( !showNamespace ) {
-        const idx = headers.findIndex(header => header.name === NAMESPACE.name);
+        const idx = headers.findIndex((header) => header.name === NAMESPACE.name);
 
         if ( idx >= 0 ) {
           headers.splice(idx, 1);
@@ -236,7 +236,7 @@ export default {
       const custom = this.listGroupMapped[this.group];
 
       if (custom?.hideColumn) {
-        const idx = headers.findIndex(header => header.name === custom.hideColumn);
+        const idx = headers.findIndex((header) => header.name === custom.hideColumn);
 
         if ( idx >= 0 ) {
           headers.splice(idx, 1);
@@ -291,7 +291,7 @@ export default {
     group: {
       get() {
         // Check group is valid
-        const exists = this.groupOptions.find(g => g.value === this._group);
+        const exists = this.groupOptions.find((g) => g.value === this._group);
 
         if (!exists) {
           return DEFAULT_GROUP;

package/components/ResourceYaml.vue

@@ -166,7 +166,7 @@ export default {
       try {
         const parsed = jsyaml.load(this.currentYaml);
         const annotations = Object.keys(parsed?.metadata?.annotations || {});
-        const regexes = ANNOTATIONS_TO_FOLD.map(x => ensureRegex(x));
+        const regexes = ANNOTATIONS_TO_FOLD.map((x) => ensureRegex(x));
 
         let foldAnnotations = false;
 

package/components/RoleBindings.vue

@@ -179,7 +179,7 @@ export default {
     },
 
     existingBindings() {
-      const roles = this.roles.map(x => x.name);
+      const roles = this.roles.map((x) => x.name);
 
       const out = this.allBindings.filter((binding) => {
         if ( binding.roleRef.kind !== this.roleScope || !binding.roleRef?.name) {
@@ -197,7 +197,7 @@ export default {
     },
 
     unremovedRows() {
-      return this.rows.filter(x => x.remove !== true);
+      return this.rows.filter((x) => x.remove !== true);
     },
   },
 

package/components/SingleClusterInfo.vue

@@ -37,7 +37,7 @@ export default {
     },
 
     accessibleResources() {
-      return RESOURCES.filter(resource => this.$store.getters['cluster/schemaFor'](resource));
+      return RESOURCES.filter((resource) => this.$store.getters['cluster/schemaFor'](resource));
     },
 
     totalCountGaugeInput() {

package/components/SortableTable/actions.js

@@ -38,11 +38,11 @@ export default {
 
   computed: {
     availableActions() {
-      return this.bulkActionsForSelection.filter(act => !act.external);
+      return this.bulkActionsForSelection.filter((act) => !act.external);
     },
 
     keyedAvailableActions() {
-      return this.availableActions.map(aa => aa.action);
+      return this.availableActions.map((aa) => aa.action);
     },
 
     selectedRowsText() {
@@ -139,7 +139,7 @@ export default {
             // Collate the actions in an array and hide in the normal row
             const id = ba.attributes.getNamedItem('id').value;
 
-            this.hiddenActions.push(this.availableActions.find(aa => aa.action === id));
+            this.hiddenActions.push(this.availableActions.find((aa) => aa.action === id));
             ba.style.display = 'none';
           }
         }