@rancher/shell 0.3.12 → 0.3.14

package/assets/translations/en-us.yaml

@@ -4844,6 +4844,12 @@ servicesPage:
     title: Add-on Config
     ipam:
       label: IPAM
+    useShareIP:
+      label: Use Share IP
+    useIpam:
+      label: Use IPAM
+    shareIP:
+      label: Share IP LB
 
   ips:
     define: Service Ports

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',
@@ -64,13 +100,71 @@ export default {
 
       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,31 @@ 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')"
         />
+        <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/config/labels-annotations.js

@@ -138,6 +138,7 @@ export const HCI = {
   CLOUD_PROVIDER_NAMESPACE: 'cloudprovider.harvesterhci.io/namespace',
   CLOUD_PROVIDER_NETWORK:   'cloudprovider.harvesterhci.io/network',
   CLOUD_PROVIDER_PROJECT:   'cloudprovider.harvesterhci.io/project',
+  PRIMARY_SERVICE:          'cloudprovider.harvesterhci.io/primary-service',
 };
 
 // Annotations that can be on management.cattle.io.cluster to configure a custom badge

package/creators/app/files/.gitignore

@@ -59,9 +59,6 @@ jspm_packages/
 # Optional REPL history
 .node_repl_history
 
-# Output of 'npm pack'
-*.tgz
-
 # Yarn Integrity file
 .yarn-integrity
 

package/edit/__tests__/namespace.test.ts

@@ -0,0 +1,46 @@
+import { mount } from '@vue/test-utils';
+import Namespace from '@shell/edit/namespace.vue';
+import { DefaultProps } from 'vue/types/options';
+import { ExtendedVue, Vue } from 'vue/types/vue';
+
+describe('view Namespace should', () => {
+  it('retrieve resource limits from project', () => {
+    const name = 'my project name';
+    const limits = 'whatever';
+    const project = { id: name, spec: { containerDefaultResourceLimit: limits } };
+    const wrapper = mount(Namespace as unknown as ExtendedVue<Vue, {}, {}, {}, DefaultProps>, {
+      propsData: {
+        value: {
+          metadata:     { labels: { 'field.cattle.io/projectId': name } },
+          annotations:  { 'field.cattle.io/containerDefaultResourceLimit': undefined },
+          listLocation: {},
+        }
+      },
+      mocks: {
+        $fetchState: {},
+        $route:      {
+          name:  'anything',
+          query: { AS: 'yaml' }
+        },
+        $router: { applyQuery: {} },
+        $store:  {
+          getters: {
+            'i18n/t':         jest.fn(),
+            'management/all': () => ([project]),
+            currentProduct:   jest.fn(),
+          }
+        }
+      },
+      stubs: {
+        CruResource:            { template: '<div><slot></slot></div>' }, // Required to render the slot content
+        ContainerResourceLimit: { template: '<div data-testid="limits"></div>' }, // Ensure value to be added to component
+        NameNsDescription:      true,
+        Tab:                    true,
+      }
+    });
+
+    const limitsUi = wrapper.find('[data-testid="limits"]');
+
+    expect(limitsUi.vm.$attrs.value).toStrictEqual(limits);
+  });
+});

package/edit/namespace.vue

@@ -57,7 +57,7 @@ export default {
       project:                 null,
       projects:                null,
       viewMode:                _VIEW,
-      containerResourceLimits: this.value.annotations[CONTAINER_DEFAULT_RESOURCE_LIMIT] || this.getDefaultContainerResourceLimits(projectName),
+      containerResourceLimits: this.value.annotations?.[CONTAINER_DEFAULT_RESOURCE_LIMIT] || this.getDefaultContainerResourceLimits(projectName),
       projectName,
       HARVESTER_TYPES,
       RANCHER_TYPES,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/scripts/extension/publish

@@ -280,7 +280,7 @@ for d in pkg/*/ ; do
     fi
 
     # Base URL referencing assets directly from GitHub
-    BASE_URL="assets/${pkg}"
+    BASE_URL="assets/"
 
     # Relative URL references assets within the container deployment
     RELATIVE_URL="plugin/"
@@ -320,6 +320,8 @@ if [ "${GITHUB_BUILD}" == "false" ]; then
 
   # Build the docker image
   ${SCRIPT_DIR}/bundle ${BASE_EXT} ${EXT_VERSION} ${REGISTRY} ${REGISTRY_ORG} ${IMAGE_PREFIX} ${PUSH}
+else
+  rm -rf ${CHART_TEMPLATE}
 fi
 
 if [ "${GITHUB_BUILD}" == "true" ] && [ -f ${ROOT_INDEX} ]; then