@rancher/shell 0.3.21 → 0.3.22

package/assets/translations/en-us.yaml

@@ -2291,6 +2291,7 @@ gatekeeperIndex:
   poweredBy: OPA Gatekeeper
   unavailable: OPA + Gatekeeper is not available in the system-charts catalog.
   violations: Violations
+  deprecated: The OPA Gatekeeper chart is deprecated as of Rancher 2.8 and will be removed in a future release. Please consider switching to <a target="_blank" rel="noopener noreferrer nofollow" href="https://www.kubewarden.io">Kubewarden</a>.
 
 gatekeeperInstall:
   auditInterval: Auto Interval
@@ -2357,6 +2358,9 @@ growl:
   podSecurity:
     message: "The creation of this Pod would violate existing restricted policies for the adopted Namespace"
     title: PodSecurity violation
+  kubeApiHeaderWarning:
+    titleCreate: "{resourceType} Creation Warning"
+    titleUpdate: "{resourceType} Update Warning"
 
 hpa:
   detail:

package/assets/translations/zh-hans.yaml

@@ -3051,6 +3051,7 @@ login:
     noResponse: "没有收到响应。"
   error: 登录时发生错误，请重试。
   clientError: 无效的用户名或密码，请重试。
+  specificError: '登录时发生错误：{msg}'
   useLocal: 使用本地账号登录
   loginWithProvider: 使用 {provider} 登录
   username: 用户名
@@ -3525,8 +3526,11 @@ navLink:
         label: 链接标签
       description:
         label: 链接描述
+    groupImage:
+      label: 组图片
       iconSrc:
-        label: 添加镜像
+        tip: '图片的高度应为 21 像素，最大宽度为 200 像素。最大文件大小为 20KB。支持的格式：JPEG、PNG、SVG。'
+        label: 添加图片
 networkpolicy:
   egress:
     label: Egress 规则
@@ -5640,6 +5644,8 @@ validation:
     logdna:
       apiKey: 需要设置“API 密钥”。
   invalidCron: 无效的 cron 调度
+  invalidCidr: "无效的 CIDR"
+  invalidIP: "无效的 IP"
   k8s:
     name: 必须由小写字母数字或“-”组成，并且开头和结尾必须是字母数字（例如“my-name”或“123-abc”）。
     identifier:
@@ -5776,6 +5782,7 @@ wm:
   containerShell:
     clear: 清除
     containerName: "容器：{label}"
+    failed: "无法打开容器 shell（所有 shell 命令均未成功）\n\r"
   kubectlShell:
     title: "Kubectl: {name}"
 

package/cloud-credential/__tests__/azure.test.ts

@@ -0,0 +1,53 @@
+import { mount } from '@vue/test-utils';
+import AzureCloudCreds from '@shell/cloud-credential/azure.vue';
+
+const mockStore = {
+  getters:  { 'i18n/t': jest.fn() },
+  dispatch: () => jest.fn()
+};
+
+describe('cloud credentials: Azure', () => {
+  const wrapper = mount(AzureCloudCreds, {
+    propsData: {
+      value: {
+        decodedData: {
+          environment:    '',
+          subscriptionId: '',
+          clientId:       '',
+          clientSecret:   '',
+        },
+        setData: jest.fn()
+      }
+    },
+    mocks: { $store: mockStore }
+  });
+
+  it('should pass all the correct fields when checking if credentials are valid', async() => {
+    const spyDispatch = jest.spyOn(mockStore, 'dispatch');
+
+    wrapper.setData({
+      value: {
+        decodedData: {
+          environment:    'my-env',
+          subscriptionId: 'my-sub-id',
+          clientId:       'my-c-id',
+          clientSecret:   'my-c-secret',
+        }
+      }
+    });
+
+    await wrapper.vm.test();
+
+    expect(spyDispatch).toHaveBeenCalledWith('management/request', {
+      data: {
+        environment:    'my-env',
+        subscriptionId: 'my-sub-id',
+        clientId:       'my-c-id',
+        clientSecret:   'my-c-secret',
+      },
+      method:               'POST',
+      redirectUnauthorized: false,
+      url:                  '/meta/aksCheckCredentials'
+    });
+  });
+});

package/cloud-credential/azure.vue

@@ -40,6 +40,7 @@ export default {
         clientId,
         clientSecret,
         subscriptionId,
+        environment,
       } = this.value.decodedData;
 
       try {
@@ -50,6 +51,7 @@ export default {
             clientId,
             clientSecret,
             subscriptionId,
+            environment,
           },
           redirectUnauthorized: false,
         });
@@ -96,6 +98,7 @@ export default {
           :searchable="false"
           :required="true"
           :label="t('cluster.credential.azure.environment.label')"
+          data-testid="azure-cloud-credentials-environment"
           @input="value.setData('environment', $event)"
         />
       </div>
@@ -106,6 +109,7 @@ export default {
           type="text"
           :mode="mode"
           :required="true"
+          data-testid="azure-cloud-credentials-subscription-id"
           @input="value.setData('subscriptionId', $event)"
         />
       </div>
@@ -118,6 +122,7 @@ export default {
           type="text"
           :mode="mode"
           :required="true"
+          data-testid="azure-cloud-credentials-client-id"
           @input="value.setData('clientId', $event)"
         />
       </div>
@@ -128,6 +133,7 @@ export default {
           type="password"
           :mode="mode"
           :required="true"
+          data-testid="azure-cloud-credentials-client-secret"
           @input="value.setData('clientSecret', $event)"
         />
       </div>

package/components/GrowlManager.vue

@@ -99,15 +99,17 @@ export default {
             <i :class="{icon: true, ['icon-'+growl.icon]: true}" />
           </div>
           <div class="growl-text">
-            <div>{{ growl.title }}</div>
+            <i
+              class="close hand icon icon-close"
+              @click="close(growl)"
+            />
+            <div class="growl-text-title">
+              {{ growl.title }}
+            </div>
             <p v-if="growl.message">
               {{ growl.message }}
             </p>
           </div>
-          <i
-            class="close hand icon icon-close"
-            @click="close(growl)"
-          />
         </div>
       </div>
     </div>
@@ -135,7 +137,7 @@ export default {
     width: 100%;
 
     @media only screen and (min-width: map-get($breakpoints, '--viewport-7')) {
-      width: 350px;
+      width: 420px;
     }
   }
 
@@ -149,13 +151,15 @@ export default {
     margin: 10px;
     position: relative;
     word-break: break-all;
-
-    .close {
-      padding: 5px;
-    }
+    box-shadow: 0 3px 5px 0px var(--shadow);
 
     .icon-container {
       align-self: center;
+      flex-basis: 10%;
+      padding: 10px 20px 10px 10px;
+      i {
+        font-size: 24px;
+      }
     }
 
     .growl-message {
@@ -164,28 +168,27 @@ export default {
       &.growl-center {
         align-items: center;
       }
-    }
-
-    .growl-text {
-      flex-basis: 90%;
-      padding: 10px 10px 10px 0;
-      word-break: break-word;
-      white-space: normal;
-
-      > div {
-        font-size: 16px;
-      }
 
-      > P {
-        margin-top: 5px;
-      }
-    }
+      .growl-text {
+        position: relative;
+        flex-basis: 90%;
+        padding: 10px 10px 10px 0;
+        word-break: break-word;
+        white-space: normal;
+
+        .close {
+          position: absolute;
+          top: 12px;
+          right: 10px;
+        }
+        .growl-text-title {
+          font-size: 16px;
+          margin-bottom: 20px;
+        }
 
-    .icon-container {
-      flex-basis: 10%;
-      padding: 10px;
-      i {
-        font-size: 24px;
+        > P {
+          margin-top: 5px;
+        }
       }
     }
   }

package/components/form/ResourceQuota/ProjectRow.vue

@@ -27,37 +27,58 @@ export default {
     }
   },
 
-  computed: { ...ROW_COMPUTED },
+  computed: {
+    ...ROW_COMPUTED,
+
+    resourceQuotaLimit: {
+      get() {
+        return this.value.spec.resourceQuota?.limit || {};
+      },
+    },
+
+    namespaceDefaultResourceQuotaLimit: {
+      get() {
+        return this.value.spec.namespaceDefaultResourceQuota?.limit || {};
+      },
+    }
+  },
 
   methods: {
     updateType(type) {
-      if (typeof this.value.spec.resourceQuota.limit[this.type] !== 'undefined') {
+      if (typeof this.value.spec.resourceQuota?.limit[this.type] !== 'undefined') {
         this.$delete(this.value.spec.resourceQuota.limit, this.type);
       }
-
-      if (typeof this.value.spec.namespaceDefaultResourceQuota.limit[this.type] !== 'undefined') {
+      if (typeof this.value.spec.namespaceDefaultResourceQuota?.limit[this.type] !== 'undefined') {
         this.$delete(this.value.spec.namespaceDefaultResourceQuota.limit, this.type);
       }
 
       this.$emit('type-change', type);
+    },
+
+    updateQuotaLimit(prop, type, val) {
+      if (!this.value.spec[prop]) {
+        this.value.spec[prop] = { limit: { } };
+      }
+
+      this.value.spec[prop].limit[type] = val;
     }
   },
 };
 </script>
 <template>
-  <div
-    v-if="typeOption"
-    class="row"
+  <div
+    v-if="typeOption"
+    class="row"
   >
-    <Select
-      class="mr-10"
-      :mode="mode"
-      :value="type"
-      :options="types"
-      @input="updateType($event)"
+    <Select
+      class="mr-10"
+      :mode="mode"
+      :value="type"
+      :options="types"
+      @input="updateType($event)"
     />
     <UnitInput
-      v-model="value.spec.resourceQuota.limit[type]"
+      :value="resourceQuotaLimit[type]"
       class="mr-10"
       :mode="mode"
       :placeholder="typeOption.placeholder"
@@ -65,15 +86,17 @@ export default {
       :input-exponent="typeOption.inputExponent"
       :base-unit="typeOption.baseUnit"
       :output-modifier="true"
+      @input="updateQuotaLimit('resourceQuota', type, $event)"
     />
     <UnitInput
-      v-model="value.spec.namespaceDefaultResourceQuota.limit[type]"
+      :value="namespaceDefaultResourceQuotaLimit[type]"
       :mode="mode"
       :placeholder="typeOption.placeholder"
       :increment="typeOption.increment"
       :input-exponent="typeOption.inputExponent"
       :base-unit="typeOption.baseUnit"
       :output-modifier="true"
+      @input="updateQuotaLimit('namespaceDefaultResourceQuota', type, $event)"
     />
   </div>
 </template>

package/components/formatter/ClusterProvider.vue

@@ -7,14 +7,20 @@ export default {
     },
   },
   data(props) {
+    const mgmt = props.row?.mgmt;
+
     return {
       // The isImported getter on the provisioning cluster
       // model doesn't work for imported K3s clusters, in
       // which case it returns 'k3s' instead of 'imported.'
       // This is the workaround.
-      isImported: props.row?.mgmt?.providerForEmberParam === 'import' ||
-        // when imported cluster is Google GKE
-        props.row?.mgmt?.spec?.gkeConfig?.imported
+      isImported: mgmt?.providerForEmberParam === 'import' ||
+        // when imported cluster is GKE
+        !!mgmt?.spec?.gkeConfig?.imported ||
+        // or AKS
+        !!mgmt?.spec?.aksConfig?.imported ||
+        // or EKS
+        !!mgmt?.spec?.eksConfig?.imported
     };
   },
 };

package/components/formatter/__tests__/ClusterProvider.test.ts

@@ -3,15 +3,19 @@ import ClusterProvider from '@shell/components/formatter/ClusterProvider.vue';
 
 describe('component: ClusterProvider', () => {
   const importedGkeClusterInfo = { mgmt: { spec: { gkeConfig: { imported: true } } } };
+  const importedAksClusterInfo = { mgmt: { spec: { aksConfig: { imported: true } } } };
+  const importedEksClusterInfo = { mgmt: { spec: { eksConfig: { imported: true } } } };
   const notImportedGkeClusterInfo = { mgmt: { spec: { gkeConfig: { imported: false } } } };
   const importedClusterInfoWithProviderForEmberParam = { mgmt: { providerForEmberParam: 'import' } };
 
   describe('isImported', () => {
     const testCases = [
       [importedGkeClusterInfo, true],
+      [importedAksClusterInfo, true],
+      [importedEksClusterInfo, true],
       [notImportedGkeClusterInfo, false],
       [importedClusterInfoWithProviderForEmberParam, true],
-      [{}, undefined],
+      [{}, false],
     ];
 
     it.each(testCases)('should return the isImported value properly based on the props data', (row, expected) => {

package/components/nav/Header.vue

@@ -335,6 +335,7 @@ export default {
 <template>
   <header
     ref="header"
+    data-testid="header"
   >
     <div>
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />

package/config/settings.ts

@@ -1,5 +1,5 @@
 // Settings
-import { GC_DEFAULTS } from '../utils/gc/gc-types';
+import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -148,7 +148,47 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.HIDE_LOCAL_CLUSTER]: { kind: 'boolean' },
 };
 
-export const DEFAULT_PERF_SETTING = {
+/**
+ * Settings on how to handle warnings returning in api responses, specifically which to show as growls
+ */
+export interface PerfSettingsWarningHeaders {
+  /**
+   * Warning is a string containing multiple entries. This determines how they are split up
+   *
+   * See https://github.com/kubernetes/enhancements/tree/master/keps/sig-api-machinery/1693-warnings#design-details
+   */
+  separator: string,
+  /**
+   * Show warnings in a notification if they're not in this block list
+   */
+  notificationBlockList: string[]
+}
+
+export interface PerfSettingsKubeApi {
+  /**
+   * Settings related to the response header `warnings` value
+   */
+  warningHeader: PerfSettingsWarningHeaders
+}
+
+export interface PerfSettings {
+  inactivity: {
+      enabled: boolean;
+      threshold: number;
+  };
+  incrementalLoading: {
+      enabled: boolean;
+      threshold: number;
+  };
+  manualRefresh: {};
+  disableWebsocketNotification: boolean;
+  garbageCollection: GC_PREFERENCES;
+  forceNsFilterV2: any;
+  advancedWorker: {};
+  kubeAPI: PerfSettingsKubeApi;
+}
+
+export const DEFAULT_PERF_SETTING: PerfSettings = {
   inactivity: {
     enabled:   false,
     threshold: 900,
@@ -165,4 +205,21 @@ export const DEFAULT_PERF_SETTING = {
   garbageCollection:            GC_DEFAULTS,
   forceNsFilterV2:              { enabled: false },
   advancedWorker:               { enabled: false },
+  kubeAPI:                      {
+    /**
+     * Settings related to the response header `warnings` value
+     */
+    warningHeader: {
+      /**
+       * Warning is a string containing multiple entries. This determines how they are split up
+       *
+       * See https://github.com/kubernetes/enhancements/tree/master/keps/sig-api-machinery/1693-warnings#design-details
+       */
+      separator:             '299 - ',
+      /**
+       * Show warnings in a notification if they're not in this block list
+       */
+      notificationBlockList: ['299 - unknown field']
+    }
+  }
 };

package/config/types.js

@@ -311,3 +311,5 @@ export const AUTH_TYPE = {
   _SSH:   '_ssh',
   _S3:    '_S3'
 };
+
+export const LOCAL_CLUSTER = 'local';

package/creators/pkg/files/.github/workflows/build-extension-catalog.yml

@@ -0,0 +1,28 @@
+name: Build and Release Extension Catalog
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./
+
+jobs:
+  build-extension-catalog:
+    uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@master
+    permissions:
+      actions: write
+      contents: read
+      packages: write
+    with:
+      registry_target: ghcr.io
+      registry_user: ${{ github.actor }}
+    secrets: 
+      registry_token: ${{ secrets.GITHUB_TOKEN }}

package/creators/pkg/files/.github/workflows/build-extension-charts.yml

@@ -0,0 +1,26 @@
+name: Build and Release Extension Charts
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./
+
+jobs:
+  build-extension-charts:
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
+    permissions:
+      actions: write
+      contents: write
+      deployments: write
+      pages: write
+    with:
+      target_branch: gh-pages

package/creators/pkg/init

@@ -2,6 +2,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const https = require('https');
 
 const targets = {
   dev:  './node_modules/.bin/nuxt dev',
@@ -16,9 +17,10 @@ const files = [
 ];
 
 const topLevelScripts = {
-  'build-pkg':    './node_modules/@rancher/shell/scripts/build-pkg.sh',
-  'serve-pkgs':   './node_modules/@rancher/shell/scripts/serve-pkgs',
-  'publish-pkgs': './node_modules/@rancher/shell/scripts/extension/publish',
+  'build-pkg':      './node_modules/@rancher/shell/scripts/build-pkg.sh',
+  'serve-pkgs':     './node_modules/@rancher/shell/scripts/serve-pkgs',
+  'publish-pkgs':   './node_modules/@rancher/shell/scripts/extension/publish',
+  'parse-tag-name': './node_modules/@rancher/shell/scripts/extension/parse-tag-name'
 };
 
 const typeFolders = [
@@ -88,11 +90,68 @@ Object.keys(targets).forEach((target) => {
   }
 });
 
+// Add annotation for the latest Rancher version by default
+function fetchLatestVersion() {
+  console.log('  Fetching latest Rancher Version');
+  const options = { headers: { 'User-Agent': 'nodejs' } };
+
+  https.get('https://api.github.com/repos/rancher/rancher/releases/latest', options, (res) => {
+    const { statusCode } = res;
+    const contentType = res.headers['content-type'];
+
+    let error;
+
+    if ( statusCode !== 200 ) {
+      error = new Error('  Request Failed.\n' +
+                        `  Status Code: ${ statusCode }`);
+    } else if ( !/^application\/json/.test(contentType) ) {
+      error = new Error('  Invalid content-type.\n' +
+                        `  Expected application/json but received ${ contentType }`);
+    }
+
+    if ( error ) {
+      console.log(error.message);
+
+      res.resume();
+
+      return;
+    }
+
+    res.setEncoding('utf8');
+    let rawData = '';
+
+    res.on('data', (chunk) => {
+      rawData += chunk;
+    });
+    res.on('end', () => {
+      try {
+        const release = JSON.parse(rawData);
+
+        if ( release.tag_name ) {
+          console.log(`  Adding rancher-version annotation '>= ${ release.tag_name }' to package.json`);
+
+          pkg.rancher = { annotations: { 'catalog.cattle.io/rancher-version': `>= ${ release.tag_name }` } };
+          writePackageJson();
+        }
+      } catch (e) {
+        console.log('  Error parsing release data', e);
+      }
+    });
+  }).on('error', (e) => {
+    console.log('  Error fetching latest Rancher Version', e);
+  });
+}
+
+fetchLatestVersion();
+writePackageJson();
+
 // Add dependencies
 // pkg.dependencies['@rancher/shell'] = '^0.6.2';
 // pkg.dependencies['core-js'] = '3.18.3';
 
-fs.writeFileSync(path.join(pkgFolder, 'package.json'), JSON.stringify(pkg, null, 2));
+function writePackageJson() {
+  fs.writeFileSync(path.join(pkgFolder, 'package.json'), JSON.stringify(pkg, null, 2));
+}
 
 // Create type folders if needed
 if (addTypeFolders) {

package/detail/provisioning.cattle.io.cluster.vue

@@ -250,8 +250,10 @@ export default {
 
   computed: {
     defaultTab() {
-      if (this.showRegistration && !this.machines?.length) {
-        return 'registration';
+      if (this.showRegistration) {
+        if (this.value.isRke2 ? !this.machines?.length : !this.nodes?.length) {
+          return 'registration';
+        }
       }
 
       if (this.showMachines) {

package/edit/fleet.cattle.io.gitrepo.vue

@@ -569,6 +569,7 @@ export default {
       />
 
       <SelectOrCreateAuthSecret
+        data-testid="gitrepo-helm-auth"
         :value="value.spec.helmSecretName"
         :register-before-hook="registerBeforeHook"
         :namespace="value.metadata.namespace"

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

@@ -792,10 +792,10 @@ export default {
       const names = [];
       const cni = this.serverConfig.cni;
 
-      if ( cni ) {
-        const parts = cni.split(',').map((x) => `rke2-${ x }`);
-
-        names.push(...parts);
+      if (typeof cni === 'string') {
+        names.push(...cni.split(',').map((x) => `rke2-${ x }`));
+      } else if (Array.isArray(cni)) {
+        names.push(...cni.map((x) => `rke2-${ x }`));
       }
 
       if (this.showCloudProvider) { // Shouldn't be removed such that changes to it will re-trigger this watch