@rancher/shell 0.2.5 → 0.3.1

package/config/product/manager.js

@@ -3,7 +3,8 @@ import {
   CAPI,
   CATALOG,
   NORMAN,
-  HCI
+  HCI,
+  MANAGEMENT
 } from '@shell/config/types';
 import { MULTI_CLUSTER } from '@shell/store/features';
 import { DSL } from '@shell/store/type-map';
@@ -29,7 +30,7 @@ export function init(store) {
     icon:                'cluster-management',
     removable:           false,
     showClusterSwitcher: false,
-    to:                   {
+    to:                  {
       name:   'c-cluster-product-resource',
       params: {
         cluster:  BLANK_CLUSTER,
@@ -40,24 +41,24 @@ export function init(store) {
   });
 
   virtualType({
-    name:        'cloud-credentials',
-    labelKey:    'manager.cloudCredentials.label',
+    name:       'cloud-credentials',
+    labelKey:   'manager.cloudCredentials.label',
     group:      'Root',
-    namespaced:  false,
+    namespaced: false,
     icon:       'globe',
-    weight:      99,
-    route:       { name: 'c-cluster-manager-cloudCredential' },
+    weight:     99,
+    route:      { name: 'c-cluster-manager-cloudCredential' },
   });
 
   virtualType({
-    labelKey:       'legacy.psps',
-    name:           'pod-security-policies',
-    group:          'Root',
-    namespaced:     false,
-    weight:         0,
-    icon:           'folder',
-    route:          { name: 'c-cluster-manager-pages-page', params: { cluster: 'local', page: 'pod-security-policies' } },
-    exact:          true
+    labelKey:   'legacy.psps',
+    name:       'pod-security-policies',
+    group:      'Root',
+    namespaced: false,
+    weight:     5,
+    icon:       'folder',
+    route:      { name: 'c-cluster-manager-pages-page', params: { cluster: 'local', page: 'pod-security-policies' } },
+    exact:      true
   });
 
   basicType([
@@ -119,12 +120,15 @@ export function init(store) {
   weightType(CAPI.MACHINE_SET, 2, true);
   weightType(CAPI.MACHINE, 1, true);
   weightType(CATALOG.CLUSTER_REPO, 0, true);
+  weightType(MANAGEMENT.PSA, 5, true);
 
   basicType([
     CAPI.MACHINE_DEPLOYMENT,
     CAPI.MACHINE_SET,
     CAPI.MACHINE,
     CATALOG.CLUSTER_REPO,
+    'pod-security-policies',
+    MANAGEMENT.PSA
   ], 'advanced');
 
   weightGroup('advanced', -1, true);

package/config/product/monitoring.js

@@ -51,9 +51,9 @@ export function init(store) {
   });
 
   spoofedType({
-    label:      'Receivers',
-    type:       RECEIVER,
-    schemas:     [
+    label:   'Receivers',
+    type:    RECEIVER,
+    schemas: [
       {
         id:                RECEIVER,
         type:              'schema',
@@ -61,9 +61,9 @@ export function init(store) {
         resourceFields:    { spec: { type: RECEIVER_SPEC } }
       },
       {
-        id:                RECEIVER_SPEC,
-        type:              'schema',
-        resourceFields:    {
+        id:             RECEIVER_SPEC,
+        type:           'schema',
+        resourceFields: {
           name:              { type: 'string' },
           email_configs:     { type: `array[${ RECEIVER_EMAIL }]` },
           slack_configs:     { type: `array[${ RECEIVER_SLACK }]` },
@@ -73,9 +73,9 @@ export function init(store) {
         }
       },
       {
-        id:               RECEIVER_EMAIL,
-        type:            'schema',
-        resourceFields:  {
+        id:             RECEIVER_EMAIL,
+        type:           'schema',
+        resourceFields: {
           to:            { type: 'string' },
           send_resolved: { type: 'boolean' },
           from:          { type: 'string' },
@@ -86,9 +86,9 @@ export function init(store) {
         }
       },
       {
-        id:              RECEIVER_SLACK,
-        type:            'schema',
-        resourceFields:  {
+        id:             RECEIVER_SLACK,
+        type:           'schema',
+        resourceFields: {
           text:          { type: 'string' },
           api_url:       { type: 'string' },
           channel:       { type: 'string' },
@@ -97,9 +97,9 @@ export function init(store) {
         }
       },
       {
-        id:              RECEIVER_PAGERDUTY,
-        type:            'schema',
-        resourceFields:  {
+        id:             RECEIVER_PAGERDUTY,
+        type:           'schema',
+        resourceFields: {
           routing_key:   { type: 'string' },
           service_key:   { type: 'string' },
           http_config:   { type: RECEIVER_HTTP_CONFIG },
@@ -107,9 +107,9 @@ export function init(store) {
         }
       },
       {
-        id:              RECEIVER_OPSGENIE,
-        type:            'schema',
-        resourceFields:  {
+        id:             RECEIVER_OPSGENIE,
+        type:           'schema',
+        resourceFields: {
           api_key:       { type: 'string' },
           http_config:   { type: RECEIVER_HTTP_CONFIG },
           send_resolved: { type: 'boolean' },
@@ -117,9 +117,9 @@ export function init(store) {
         }
       },
       {
-        id:              RECEIVER_WEBHOOK,
-        type:            'schema',
-        resourceFields:  {
+        id:             RECEIVER_WEBHOOK,
+        type:           'schema',
+        resourceFields: {
           url:           { type: 'string' },
           http_config:   { type: RECEIVER_HTTP_CONFIG },
           send_resolved: { type: 'boolean' }
@@ -146,9 +146,9 @@ export function init(store) {
   });
 
   spoofedType({
-    label:      'Routes',
-    type:       ROUTE,
-    schemas:     [
+    label:   'Routes',
+    type:    ROUTE,
+    schemas: [
       {
         id:                ROUTE,
         type:              'schema',
@@ -156,9 +156,9 @@ export function init(store) {
         resourceFields:    { spec: { type: ROUTE_SPEC } }
       },
       {
-        id:                ROUTE_SPEC,
-        type:              'schema',
-        resourceFields:    {
+        id:             ROUTE_SPEC,
+        type:           'schema',
+        resourceFields: {
           receiver:        { type: 'string' },
           group_by:        { type: 'array[string]' },
           group_wait:      { type: 'string' },
@@ -173,21 +173,21 @@ export function init(store) {
   });
 
   virtualType({
-    label:         'Routes and Receivers',
-    group:         'monitoring',
-    name:     'route-receiver',
-    icon:     'globe',
+    label:  'Routes and Receivers',
+    group:  'monitoring',
+    name:   'route-receiver',
+    icon:   'globe',
     route:  { name: 'c-cluster-monitoring-route-receiver' },
     weight: 1
   });
 
   virtualType({
-    label:         'Monitors',
-    group:         'monitoring',
-    name:     'monitor',
-    icon:     'globe',
+    label:  'Monitors',
+    group:  'monitoring',
+    name:   'monitor',
+    icon:   'globe',
     route:  { name: 'c-cluster-monitoring-monitor' },
-    weight:         1,
+    weight: 1,
   });
 
   configureType('route-receiver', { showListMasthead: false });

package/config/product/multi-cluster-apps.js

@@ -21,36 +21,36 @@ export function init(store) {
   });
 
   virtualType({
-    labelKey:       'legacy.catalogs',
-    name:           'mc-catalogs',
-    group:          'Root',
-    namespaced:     false,
-    weight:         111,
-    icon:           'folder',
-    route:          { name: 'c-cluster-mcapps-pages-page', params: { cluster: 'local', page: 'catalogs' } },
-    exact:          true
+    labelKey:   'legacy.catalogs',
+    name:       'mc-catalogs',
+    group:      'Root',
+    namespaced: false,
+    weight:     111,
+    icon:       'folder',
+    route:      { name: 'c-cluster-mcapps-pages-page', params: { cluster: 'local', page: 'catalogs' } },
+    exact:      true
   });
 
   virtualType({
-    labelKey:       'legacy.globalDnsEntries',
-    name:           'global-dns-entries',
-    group:          'Root',
-    namespaced:     false,
-    weight:         110,
-    icon:           'folder',
-    route:          { name: 'c-cluster-mcapps-pages-page', params: { cluster: 'local', page: 'global-dns-entries' } },
-    exact:          true
+    labelKey:   'legacy.globalDnsEntries',
+    name:       'global-dns-entries',
+    group:      'Root',
+    namespaced: false,
+    weight:     110,
+    icon:       'folder',
+    route:      { name: 'c-cluster-mcapps-pages-page', params: { cluster: 'local', page: 'global-dns-entries' } },
+    exact:      true
   });
 
   virtualType({
-    labelKey:       'legacy.globalDnsProviders',
-    name:           'global-dns-providers',
-    group:          'Root',
-    namespaced:     false,
-    weight:         109,
-    icon:           'folder',
-    route:          { name: 'c-cluster-mcapps-pages-page', params: { cluster: 'local', page: 'global-dns-providers' } },
-    exact:          true
+    labelKey:   'legacy.globalDnsProviders',
+    name:       'global-dns-providers',
+    group:      'Root',
+    namespaced: false,
+    weight:     109,
+    icon:       'folder',
+    route:      { name: 'c-cluster-mcapps-pages-page', params: { cluster: 'local', page: 'global-dns-providers' } },
+    exact:      true
   });
 
   basicType([

package/config/product/settings.js

@@ -30,13 +30,13 @@ export function init(store) {
   });
 
   virtualType({
-    ifHaveType:     MANAGEMENT.SETTING,
-    labelKey:       'advancedSettings.label',
-    name:           'settings',
-    namespaced:     false,
-    weight:         100,
-    icon:           'folder',
-    route:          {
+    ifHaveType: MANAGEMENT.SETTING,
+    labelKey:   'advancedSettings.label',
+    name:       'settings',
+    namespaced: false,
+    weight:     100,
+    icon:       'folder',
+    route:      {
       name:   'c-cluster-product-resource',
       params: {
         product:  NAME,
@@ -46,13 +46,13 @@ export function init(store) {
   });
 
   virtualType({
-    ifHaveType:     MANAGEMENT.FEATURE,
-    labelKey:       'featureFlags.label',
-    name:           'features',
-    namespaced:     false,
-    weight:         99,
-    icon:           'folder',
-    route:          {
+    ifHaveType: MANAGEMENT.FEATURE,
+    labelKey:   'featureFlags.label',
+    name:       'features',
+    namespaced: false,
+    weight:     99,
+    icon:       'folder',
+    route:      {
       name:   'c-cluster-product-resource',
       params: {
         product:  NAME,
@@ -62,43 +62,43 @@ export function init(store) {
   });
 
   virtualType({
-    ifHaveType:     MANAGEMENT.SETTING,
-    labelKey:       'branding.label',
-    name:           'brand',
-    namespaced:     false,
-    weight:         98,
-    icon:           'folder',
-    route:          { name: 'c-cluster-settings-brand' }
+    ifHaveType: MANAGEMENT.SETTING,
+    labelKey:   'branding.label',
+    name:       'brand',
+    namespaced: false,
+    weight:     98,
+    icon:       'folder',
+    route:      { name: 'c-cluster-settings-brand' }
   });
 
   virtualType({
-    ifHaveType:     MANAGEMENT.SETTING,
-    labelKey:       'banner.settingName',
-    name:           'banners',
-    namespaced:     false,
-    weight:         98,
-    icon:           'folder',
-    route:          { name: 'c-cluster-settings-banners' }
+    ifHaveType: MANAGEMENT.SETTING,
+    labelKey:   'banner.settingName',
+    name:       'banners',
+    namespaced: false,
+    weight:     98,
+    icon:       'folder',
+    route:      { name: 'c-cluster-settings-banners' }
   });
 
   virtualType({
-    ifHaveType:     MANAGEMENT.SETTING,
-    labelKey:       'performance.settingName',
-    name:           'performance',
-    namespaced:     false,
-    weight:         97,
-    icon:           'folder',
-    route:          { name: 'c-cluster-settings-performance' }
+    ifHaveType: MANAGEMENT.SETTING,
+    labelKey:   'performance.settingName',
+    name:       'performance',
+    namespaced: false,
+    weight:     97,
+    icon:       'folder',
+    route:      { name: 'c-cluster-settings-performance' }
   });
 
   virtualType({
-    ifHaveType:     MANAGEMENT.SETTING,
-    labelKey:       'customLinks.label',
-    name:           'links',
-    namespaced:     false,
-    weight:         96,
-    icon:           'folder',
-    route:          { name: 'c-cluster-settings-links' }
+    ifHaveType: MANAGEMENT.SETTING,
+    labelKey:   'customLinks.label',
+    name:       'links',
+    namespaced: false,
+    weight:     96,
+    icon:       'folder',
+    route:      { name: 'c-cluster-settings-links' }
   });
 
   basicType([

package/config/secret.js

@@ -1,7 +1,6 @@
 export const SECRET_TYPES = {
   OPAQUE:           'Opaque',
   SERVICE_ACCT:     'kubernetes.io/service-account-token',
-  DOCKER:           'kubernetes.io/dockercfg',
   DOCKER_JSON:      'kubernetes.io/dockerconfigjson',
   BASIC:            'kubernetes.io/basic-auth',
   SSH:              'kubernetes.io/ssh-auth',

package/config/settings.ts

@@ -4,7 +4,7 @@ import { GC_DEFAULTS } from '../utils/gc/gc-types';
 interface GlobalSettingRuleset {
   name: string,
   key?: string | number,
-  arg?: string | number | (string | number)[]
+  factoryArg?: string | number | (string | number)[]
 }
 
 interface GlobalSetting {
@@ -26,17 +26,17 @@ interface GlobalSetting {
 // Adapted from: https://github.com/rancher/ui/blob/08c379a9529f740666a704b52522a468986c3520/lib/shared/addon/utils/constants.js#L564
 // Setting IDs
 export const SETTING = {
-  VERSION_RANCHER:                  'server-version',
-  VERSION_CLI:                      'cli-version',
-  VERSION_MACHINE:                  'machine-version',
-  VERSION_HELM:                     'helm-version',
-  CLI_URL:                          {
-    DARWIN:                         'cli-url-darwin',
-    WINDOWS:                        'cli-url-windows',
-    LINUX:                          'cli-url-linux',
+  VERSION_RANCHER: 'server-version',
+  VERSION_CLI:     'cli-version',
+  VERSION_MACHINE: 'machine-version',
+  VERSION_HELM:    'helm-version',
+  CLI_URL:         {
+    DARWIN:  'cli-url-darwin',
+    WINDOWS: 'cli-url-windows',
+    LINUX:   'cli-url-linux',
   },
-  API_HOST:                         'api-host',
-  CA_CERTS:                         'cacerts',
+  API_HOST: 'api-host',
+  CA_CERTS: 'cacerts',
 
   // Allow the local cluster to be hidden
   HIDE_LOCAL_CLUSTER:                   'hide-local-cluster',
@@ -56,7 +56,7 @@ export const SETTING = {
   AUTH_USER_SESSION_TTL_MINUTES:        'auth-user-session-ttl-minutes',
   AUTH_USER_INFO_RESYNC_CRON:           'auth-user-info-resync-cron',
   AUTH_LOCAL_VALIDATE_DESC:             'auth-password-requirements-description',
-  CATTLE_PASSWORD_MIN_LENGTH:           'password-min-length',
+  PASSWORD_MIN_LENGTH:                  'password-min-length', // CATTLE_PASSWORD_MIN_LENGTH
   CLUSTER_TEMPLATE_ENFORCEMENT:         'cluster-template-enforcement',
   UI_INDEX:                             'ui-index',
   UI_DASHBOARD_INDEX:                   'ui-dashboard-index',
@@ -88,16 +88,28 @@ export const SETTING = {
 
 // These are the settings that are allowed to be edited via the UI
 export const ALLOWED_SETTINGS: GlobalSetting = {
-  [SETTING.CA_CERTS]:                             { kind: 'multiline', readOnly: true },
-  [SETTING.ENGINE_URL]:                           {},
-  [SETTING.ENGINE_ISO_URL]:                       {},
-  [SETTING.CATTLE_PASSWORD_MIN_LENGTH]: {
-    kind:       'integer',
+  [SETTING.CA_CERTS]:            { kind: 'multiline', readOnly: true },
+  [SETTING.ENGINE_URL]:          {},
+  [SETTING.ENGINE_ISO_URL]:      {},
+  [SETTING.PASSWORD_MIN_LENGTH]: {
+    kind:    'integer',
     ruleSet: [
       {
-        name: 'betweenValues',
+        name:       'betweenValues',
+        key:        'Password',
+        factoryArg: [2, 256]
+      },
+      {
+        name: 'isInteger',
+        key:  'Password',
+      },
+      {
+        name: 'isPositive',
+        key:  'Password',
+      },
+      {
+        name: 'isOctal',
         key:  'Password',
-        arg:  [2, 256]
       }
     ],
   },
@@ -118,8 +130,8 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
     kind:    'enum',
     options: ['dynamic', 'true', 'false']
   },
-  [SETTING.BRAND]:                          { canReset: true },
-  [SETTING.CLUSTER_TEMPLATE_ENFORCEMENT]:   { kind: 'boolean' },
+  [SETTING.BRAND]:                        { canReset: true },
+  [SETTING.CLUSTER_TEMPLATE_ENFORCEMENT]: { kind: 'boolean' },
   [SETTING.TELEMETRY]:                    {
     kind:    'enum',
     options: ['prompt', 'in', 'out']
@@ -137,5 +149,10 @@ export const DEFAULT_PERF_SETTING = {
     threshold: 1500,
   },
   disableWebsocketNotification: true,
-  garbageCollection:            GC_DEFAULTS
+  garbageCollection:            GC_DEFAULTS,
+  forceNsFilter:                {
+    enabled:   false,
+    threshold: 1500,
+  },
+  advancedWorker: { enabled: false },
 };