@rancher/shell 0.3.21 → 0.3.23

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

package/edit/resources.cattle.io.backup.vue

@@ -16,6 +16,8 @@ import { allHash } from '@shell/utils/promise';
 import { NAMESPACE, _VIEW } from '@shell/config/query-params';
 import { sortBy } from '@shell/utils/sort';
 import { get } from '@shell/utils/object';
+import { formatEncryptionSecretNames } from '@shell/utils/formatter';
+
 export default {
 
   components: {
@@ -108,7 +110,7 @@ export default {
     },
 
     encryptionSecretNames() {
-      return this.allSecrets.filter((secret) => (secret.data || {})['encryption-provider-config.yaml'] && secret.metadata.namespace === this.chartNamespace && !secret.metadata?.state?.error).map((secret) => secret.metadata.name);
+      return formatEncryptionSecretNames(this.allSecrets, this.chartNamespace);
     },
 
     storageOptions() {

package/edit/resources.cattle.io.restore.vue

@@ -13,6 +13,8 @@ import { SECRET, BACKUP_RESTORE, CATALOG } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { get } from '@shell/utils/object';
 import { _CREATE } from '@shell/config/query-params';
+import { formatEncryptionSecretNames } from '@shell/utils/formatter';
+
 export default {
 
   components: {
@@ -93,7 +95,7 @@ export default {
     },
 
     encryptionSecretNames() {
-      return this.allSecrets.filter((secret) => !!(secret.data || {})['encryption-provider-config.yaml'] && secret.metadata.namespace === this.chartNamespace && !secret.metadata?.state?.error).map((secret) => secret.metadata.name);
+      return formatEncryptionSecretNames(this.allSecrets, this.chartNamespace);
     },
 
     isEncrypted() {

package/mixins/__tests__/chart.test.ts

@@ -0,0 +1,40 @@
+import { createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import ChartMixin from '@shell/mixins/chart';
+import { OPA_GATE_KEEPER_ID } from '@shell/pages/c/_cluster/gatekeeper/index.vue';
+
+describe('chartMixin', () => {
+  const testCases = [[null, 0], [OPA_GATE_KEEPER_ID, 1], ['any_other_id', 0]];
+
+  it.each(testCases)(
+    'should add OPA deprecation warning properly', (chartId, expected) => {
+      const localVue = createLocalVue();
+
+      localVue.use(Vuex);
+      localVue.mixin(ChartMixin);
+
+      const store = new Vuex.Store({
+        getters: {
+          currentCluster: () => {},
+          isRancher:      () => true,
+          'catalog/repo': () => {
+            return () => 'repo';
+          },
+          'catalog/chart': () => {
+            return () => ({ id: chartId });
+          },
+          'i18n/t': () => jest.fn()
+        }
+      });
+
+      const vm = localVue.extend({});
+      const instance = new vm({ store });
+
+      instance.$route = { query: { chart: 'chart_name' } };
+
+      const warnings = instance.warnings;
+
+      expect(warnings).toHaveLength(expected);
+    }
+  );
+});

package/mixins/chart.js

@@ -8,6 +8,7 @@ import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations
 import { SHOW_PRE_RELEASE, mapPref } from '@shell/store/prefs';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { NAME as MANAGER } from '@shell/config/product/manager';
+import { OPA_GATE_KEEPER_ID } from '@shell/pages/c/_cluster/gatekeeper/index.vue';
 
 import { formatSi, parseSi } from '@shell/utils/units';
 import { CAPI, CATALOG } from '@shell/config/types';
@@ -185,6 +186,10 @@ export default {
         }
       }
 
+      if (this.chart?.id === OPA_GATE_KEEPER_ID) {
+        warnings.unshift(this.t('gatekeeperIndex.deprecated', {}, true));
+      }
+
       return warnings;
     },
 

package/models/catalog.cattle.io.clusterrepo.js

@@ -29,11 +29,15 @@ export default class ClusterRepo extends SteveModel {
     return out;
   }
 
-  refresh() {
+  async refresh() {
     const now = (new Date()).toISOString().replace(/\.\d+Z$/, 'Z');
 
     this.spec.forceUpdate = now;
-    this.save();
+    await this.save();
+
+    await this.waitForState('active', 10000, 1000);
+
+    this.$dispatch('catalog/load', { force: true, reset: true }, { root: true });
   }
 
   get isGit() {

package/models/fleet.cattle.io.cluster.js

@@ -1,4 +1,4 @@
-import { MANAGEMENT, NORMAN } from '@shell/config/types';
+import { LOCAL_CLUSTER, MANAGEMENT, NORMAN } from '@shell/config/types';
 import { CAPI, FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
 import { _RKE2 } from '@shell/store/prefs';
 import SteveModel from '@shell/plugins/steve/steve-class';
@@ -34,7 +34,7 @@ export default class FleetCluster extends SteveModel {
       enabled:  !!this.links.update
     });
 
-    if (!this.isRke2) {
+    if (this.canChangeWorkspace) {
       insertAt(out, 3, {
         action:     'assignTo',
         label:      'Change workspace',
@@ -79,6 +79,14 @@ export default class FleetCluster extends SteveModel {
     return false;
   }
 
+  get canChangeWorkspace() {
+    return !this.isRke2 && !this.isLocal;
+  }
+
+  get isLocal() {
+    return this.metadata.name === LOCAL_CLUSTER || this.metadata?.labels?.[FLEET_LABELS.CLUSTER_NAME] === LOCAL_CLUSTER;
+  }
+
   get isRke2() {
     const provider = this?.metadata?.labels?.[CAPI.PROVIDER] || this?.status?.provider;
 

package/package.json

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

package/pages/c/_cluster/gatekeeper/index.vue

@@ -3,10 +3,16 @@ import { NAME, CHART_NAME } from '@shell/config/product/gatekeeper';
 import InstallRedirect from '@shell/utils/install-redirect';
 import ChartHeading from '@shell/components/ChartHeading';
 import SortableTable from '@shell/components/SortableTable';
+import { Banner } from '@components/Banner';
 import { CONSTRAINT_VIOLATION_CONSTRAINT_LINK, CONSTRAINT_VIOLATION_COUNT, CONSTRAINT_VIOLATION_TEMPLATE_LINK } from '@shell/config/table-headers';
 import { GATEKEEPER } from '@shell/config/types';
+
+export const OPA_GATE_KEEPER_ID = 'cluster/rancher-charts/rancher-gatekeeper';
+
 export default {
-  components: { ChartHeading, SortableTable },
+  components: {
+    ChartHeading, SortableTable, Banner
+  },
   middleware: InstallRedirect(NAME, CHART_NAME),
   async fetch() {
     const constraints = this.constraint ? [this.constraint] : await this.$store.dispatch('cluster/findAll', { type: GATEKEEPER.SPOOFED.CONSTRAINT });
@@ -49,6 +55,9 @@ export default {
       :label="t('gatekeeperIndex.poweredBy')"
       url="https://github.com/open-policy-agent/gatekeeper"
     />
+    <Banner color="warning">
+      <span v-clean-html="t('gatekeeperIndex.deprecated', {}, true)" />
+    </Banner>
     <div class="spacer" />
     <div class="mb-10">
       <h2><t k="gatekeeperIndex.violations" /></h2>

package/plugins/steve/__tests__/header-warnings.spec.ts

@@ -0,0 +1,238 @@
+import { handleKubeApiHeaderWarnings } from '@shell/plugins/steve/header-warnings';
+import { DEFAULT_PERF_SETTING } from '@shell/config/settings';
+
+describe('steve: header-warnings', () => {
+  // eslint-disable-next-line jest/no-hooks
+
+  function setupMocks(settings = {
+    separator:             '299 - ',
+    notificationBlockList: ['299 - unknown field']
+  }) {
+    return {
+      dispatch:     jest.fn(),
+      consoleWarn:  jest.spyOn(console, 'warn').mockImplementation(),
+      consoleDebug: jest.spyOn(console, 'debug').mockImplementation(),
+      rootGetter:   {
+        'management/byId': (resource: string, id: string): { value: string} => {
+          return {
+            value: JSON.stringify({
+              ...DEFAULT_PERF_SETTING,
+              kubeAPI: { warningHeader: settings }
+            })
+          };
+        },
+        'i18n/t': (key: string, { resourceType }: any) => {
+          return `${ key }_${ resourceType }`;
+        }
+      }
+    };
+  }
+
+  function createMockRes( headers = {}, data = { type: inputResourceType }) {
+    return {
+      headers, config: { url: 'unit/test' }, data
+    };
+  }
+
+  function createGrowlResponse(message: string, action = updateKey) {
+    return [
+      'growl/warning',
+      {
+        message, timeout: 0, title: `${ action }_${ inputResourceType }`
+      },
+      { root: true }
+    ];
+  }
+
+  function createConsoleResponse(warnings: string) {
+    return `Validation Warnings for unit/test\n\n${ warnings }`;
+  }
+
+  const inputResourceType = 'abc';
+  const updateKey = 'growl.kubeApiHeaderWarning.titleUpdate';
+  const createKey = 'growl.kubeApiHeaderWarning.titleCreate';
+  const podSecurity = '299 - would violate PodSecurity "restricted:latest": unrestricted capabilities (container "container-0" must set securityContext.capabilities.drop=["ALL"]), runAsNonRoot != true (container "container-0" must not set securityContext.runAsNonRoot=false), seccompProfile (pod or container "container-0" must set securityContext.seccompProfile.type to "RuntimeDefault" or "Localhost")';
+  const deprecated = "299 - i'm deprecated";
+  const validation = '299 - unknown field "spec.containers[0].__active"';
+
+  describe('no warnings', () => {
+    it('put, no header warning', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(createMockRes(),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'put',
+        true,
+      );
+
+      expect(mocks.dispatch).not.toHaveBeenCalled();
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).not.toHaveBeenCalled();
+    });
+
+    it('post, no header warning', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(createMockRes(),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'post',
+        true,
+      );
+
+      expect(mocks.dispatch).not.toHaveBeenCalled();
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).not.toHaveBeenCalled();
+    });
+
+    it('patch, no header warning', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(createMockRes(),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'patch',
+        true,
+      );
+
+      expect(mocks.dispatch).not.toHaveBeenCalled();
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).not.toHaveBeenCalled();
+    });
+
+    it('get, no header warning', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(createMockRes(),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'get',
+        true,
+      );
+
+      expect(mocks.dispatch).not.toHaveBeenCalled();
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).not.toHaveBeenCalled();
+    });
+
+    it('get, warnings', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(createMockRes( { warnings: ['erg'] }),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'get',
+        true,
+      );
+
+      expect(mocks.dispatch).not.toHaveBeenCalled();
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).not.toHaveBeenCalled();
+    });
+
+    it('blocked (via default config)', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(
+        createMockRes({ warning: validation }),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'put',
+        true
+      );
+
+      expect(mocks.dispatch).not.toHaveBeenCalled();
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).toHaveBeenCalledWith(createConsoleResponse(validation));
+    });
+
+    it('blocked (via custom config)', () => {
+      const mocks = setupMocks({
+        separator:             '299 - ',
+        notificationBlockList: [deprecated]
+      });
+
+      handleKubeApiHeaderWarnings(
+        createMockRes({ warning: deprecated }),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'put',
+        true
+      );
+
+      expect(mocks.dispatch).not.toHaveBeenCalled();
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).toHaveBeenCalledWith(createConsoleResponse(deprecated));
+    });
+
+    it('multi blocked (via custom config)', () => {
+      const mocks = setupMocks({
+        separator:             '299 - ',
+        notificationBlockList: [deprecated, podSecurity]
+      });
+
+      handleKubeApiHeaderWarnings(
+        createMockRes({ warning: `${ deprecated },${ podSecurity }` }),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'put',
+        true
+      );
+
+      expect(mocks.dispatch).not.toHaveBeenCalled();
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).toHaveBeenCalledWith(createConsoleResponse(`${ deprecated }\n${ podSecurity }`));
+    });
+  });
+
+  describe('warnings', () => {
+    it('deprecated', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(
+        createMockRes({ warning: deprecated }),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'put',
+        true,
+      );
+
+      expect(mocks.dispatch).toHaveBeenCalledWith(...createGrowlResponse(deprecated));
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).toHaveBeenCalledWith(createConsoleResponse(deprecated));
+    });
+
+    it('pod security', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(
+        createMockRes({ warning: podSecurity }),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'post',
+        true,
+      );
+
+      expect(mocks.dispatch).toHaveBeenCalledWith(...createGrowlResponse(podSecurity, createKey));
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).toHaveBeenCalledWith(createConsoleResponse(podSecurity));
+    });
+
+    it('deprecated & pod security', () => {
+      const mocks = setupMocks();
+
+      handleKubeApiHeaderWarnings(
+        createMockRes({ warning: `${ deprecated },${ podSecurity }` }),
+        mocks.dispatch,
+        mocks.rootGetter,
+        'put',
+        true,
+      );
+
+      expect(mocks.dispatch).toHaveBeenCalledWith(...createGrowlResponse(`${ deprecated }, ${ podSecurity }` ));
+      expect(mocks.consoleWarn).not.toHaveBeenCalled();
+      expect(mocks.consoleDebug).toHaveBeenCalledWith(createConsoleResponse(`${ deprecated }\n${ podSecurity }`));
+    });
+  });
+});

package/plugins/steve/actions.js

@@ -8,6 +8,7 @@ import isObject from 'lodash/isObject';
 import { classify } from '@shell/plugins/dashboard-store/classify';
 import { NAMESPACE } from '@shell/config/types';
 import jsyaml from 'js-yaml';
+import { handleKubeApiHeaderWarnings } from '@shell/plugins/steve/header-warnings';
 
 export default {
 
@@ -85,7 +86,7 @@ export default {
 
     while (true) {
       try {
-        const out = await makeRequest(this, opt);
+        const out = await makeRequest(this, opt, rootGetters);
 
         if (!opt.depaginate) {
           return out;
@@ -116,7 +117,7 @@ export default {
       }
     }
 
-    function makeRequest(that, opt) {
+    function makeRequest(that, opt, rootGetters) {
       return that.$axios(opt).then((res) => {
         let out;
 
@@ -128,9 +129,7 @@ export default {
 
         finishDeferred(key, 'resolve', out);
 
-        if (opt.method === 'post' || opt.method === 'put') {
-          handleValidationWarnings(res);
-        }
+        handleKubeApiHeaderWarnings(res, dispatch, rootGetters, opt.method);
 
         return out;
       });
@@ -196,24 +195,6 @@ export default {
 
       return Promise.reject(out);
     }
-
-    function handleValidationWarnings(res) {
-      const warnings = (res.headers?.warning || '').split(',');
-
-      if (!warnings.length || !warnings[0]) {
-        return;
-      }
-
-      const message = warnings.reduce((message, warning) => {
-        return `${ message }\n${ warning.trim() }`;
-      }, `Validation Warnings for ${ opt.url }\n`);
-
-      if (process.env.dev) {
-        console.warn(`${ message }\n\n`, res.data); // eslint-disable-line no-console
-      } else {
-        console.debug(message); // eslint-disable-line no-console
-      }
-    }
   },
 
   promptMove({ commit, state }, resources) {