@rancher/shell 0.1.0 → 0.1.1

package/components/nav/TopLevelMenu.vue

@@ -3,7 +3,7 @@ import BrandImage from '@shell/components/BrandImage';
 import ClusterProviderIcon from '@shell/components/ClusterProviderIcon';
 import { mapGetters } from 'vuex';
 import $ from 'jquery';
-import { MANAGEMENT } from '@shell/config/types';
+import { CAPI, MANAGEMENT } from '@shell/config/types';
 import { mapPref, DEV, MENU_MAX_CLUSTERS } from '@shell/store/prefs';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
@@ -23,6 +23,7 @@ export default {
 
   data() {
     const { displayVersion, fullVersion } = getVersionInfo(this.$store);
+    const hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
 
     return {
       shown:          false,
@@ -31,9 +32,16 @@ export default {
       uiCommit:       UI_COMMIT,
       uiVersion:      UI_VERSION,
       clusterFilter:  '',
+      hasProvCluster,
     };
   },
 
+  fetch() {
+    if (this.hasProvCluster) {
+      this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
+    }
+  },
+
   computed: {
     ...mapGetters(['clusterId']),
     ...mapGetters(['clusterReady', 'isRancher', 'currentCluster', 'currentProduct']),
@@ -57,7 +65,21 @@ export default {
 
     clusters() {
       const all = this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
-      const kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all), this.$store);
+      let kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all), this.$store);
+
+      if (this.hasProvCluster) {
+        const pClusters = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
+        const available = pClusters.reduce((p, c) => {
+          p[c.mgmt] = true;
+
+          return p;
+        }, {});
+
+        // Filter to only show mgmt clusters that exist for the available provisionning clusters
+        // Addresses issue where a mgmt cluster can take some time to get cleaned up after the corresponding
+        // provisionning cluster has been deleted
+        kubeClusters = kubeClusters.filter(c => !!available[c]);
+      }
 
       return kubeClusters.map((x) => {
         return {
@@ -91,7 +113,7 @@ export default {
     },
 
     showNone() {
-      return this.dev;
+      return !!process.env.dev && this.dev;
     },
 
     multiClusterApps() {
@@ -112,14 +134,17 @@ export default {
       const items = options.filter(opt => opt.category === 'configuration');
 
       // Add plugin page
-      items.push({
-        label:   'Plugins',
-        inStore: 'management',
-        icon:    'icon-gear',
-        value:   'plugins',
-        weight:  1,
-        to:      { name: 'plugins' },
-      });
+      // Ony when developing for now
+      if (process.env.dev) {
+        items.push({
+          label:   'Plugins',
+          inStore: 'management',
+          icon:    'icon-gear',
+          value:   'plugins',
+          weight:  1,
+          to:      { name: 'plugins' },
+        });
+      }
 
       return items;
     },
@@ -216,12 +241,22 @@ export default {
 </script>
 <template>
   <div>
-    <div class="menu" :class="{'raised': shown, 'unraised':!shown}" @click="toggle()">
+    <div
+      data-testid="top-level-menu"
+      class="menu"
+      :class="{'raised': shown, 'unraised':!shown}"
+      @click="toggle()"
+    >
       <svg class="menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none" /><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" /></svg>
     </div>
     <div v-if="shown" class="side-menu-glass" @click="hide()"></div>
     <transition name="fade">
-      <div v-if="shown" class="side-menu" tabindex="-1">
+      <div
+        v-if="shown"
+        data-testid="side-menu"
+        class="side-menu"
+        tabindex="-1"
+      >
         <div class="title">
           <div class="menu-spacer"></div>
           <div class="side-menu-logo">
@@ -330,7 +365,10 @@ export default {
               placement="top"
               trigger="click"
             >
-              <a class="locale-chooser">
+              <a
+                data-testid="locale-selector"
+                class="locale-chooser"
+              >
                 {{ selectedLocaleLabel }}
               </a>
 

package/components/nav/WindowManager/ContainerLogs.vue

@@ -7,7 +7,7 @@ import {
   LOGS_RANGE, LOGS_TIME, LOGS_WRAP, DATE_FORMAT, TIME_FORMAT
 } from '@shell/store/prefs';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-import Checkbox from '@shell/components/form/Checkbox';
+import { Checkbox } from '@components/Form/Checkbox';
 import AsyncButton from '@shell/components/AsyncButton';
 import Select from '@shell/components/form/Select';
 import day from 'dayjs';
@@ -77,7 +77,6 @@ export default {
       isFollowing: true,
       timestamps:  this.$store.getters['prefs/get'](LOGS_TIME),
       wrap:        this.$store.getters['prefs/get'](LOGS_WRAP),
-      range:       this.$store.getters['prefs/get'](LOGS_RANGE),
       previous:    false,
       search:      '',
       backlog:     [],
@@ -86,6 +85,18 @@ export default {
     };
   },
 
+  fetch() {
+    // See https://github.com/rancher/dashboard/issues/6122. At some point prior to 2.6.5 LOGS_RANGE has become polluted with something
+    // invalid. To avoid everyone having to manually remove invalid user preferences fix it automatically here
+    const originalRange = this.$store.getters['prefs/get'](LOGS_RANGE);
+
+    this.range = originalRange.value || originalRange;
+
+    if (originalRange !== this.range) { // Rancher was broken, so persist the fix
+      this.$store.dispatch('prefs/set', { key: LOGS_RANGE, value: this.range });
+    }
+  },
+
   computed: {
     containerChoices() {
       const isHarvester = this.$store.getters['currentProduct'].inStore === VIRTUAL;
@@ -138,6 +149,7 @@ export default {
         label: t('wm.containerLogs.range.all'),
         value: 'all'
       });
+      updateFound('all');
 
       if ( !found && current ) {
         out.push({

package/components/nav/WorkspaceSwitcher.vue

@@ -16,7 +16,7 @@ export default {
 
       set(value) {
         if (value !== this.value) {
-          this.$store.commit('updateWorkspace', { value });
+          this.$store.commit('updateWorkspace', { value, getters: this.$store.getters });
           this.$store.dispatch('prefs/set', { key: WORKSPACE, value });
         }
       },

package/components/novnc/NovncConsoleItem.vue

@@ -0,0 +1,89 @@
+<script>
+export default {
+  name: 'NovncConsoleItem',
+
+  props: {
+    items: {
+      type:     Object,
+      required: true,
+      default:  () => {
+        return {};
+      }
+    },
+
+    path: {
+      type:     Array,
+      required: true,
+      default:  () => {
+        return [];
+      }
+    },
+
+    pos: {
+      type:     Number,
+      required: true,
+      default:  0,
+    }
+  },
+
+  methods: {
+    keysDown(key, pos) {
+      this.addKeys({ key, pos });
+      this.$emit('sendKeys');
+    },
+
+    addKeys({ key, pos }) {
+      this.$emit('update', { key, pos });
+    },
+
+    sendKeys() {
+      this.$emit('sendKeys');
+    },
+
+    getOpenStatus(key, pos) {
+      return this.path[pos] === key;
+    }
+  }
+};
+</script>
+
+<template>
+  <ul class="list-unstyled dropdown combination-keys__container">
+    <li v-for="(item, key) in items" :key="key">
+      <v-popover
+        v-if="!!item.keys"
+        placement="right-start"
+        trigger="click"
+        :container="false"
+      >
+        <span :class="{ open: getOpenStatus(key, pos) }" class="p-10 hand" @click="addKeys({ key, pos })">{{ item.label }}</span>
+
+        <template slot="popover">
+          <novnc-console-item :items="item.keys" :path="path" :pos="pos+1" @update="addKeys" @sendKeys="sendKeys" />
+        </template>
+      </v-popover>
+
+      <span v-else class="p-10 hand" @click="keysDown(key, pos)">{{ item.label }}</span>
+    </li>
+  </ul>
+</template>
+
+<style lang="scss" scoped>
+  .combination-keys__container {
+    max-width: 60px;
+
+    DIV, SPAN {
+      display: block;
+      text-align: center;
+    }
+
+    SPAN {
+      border-radius: 3px;
+
+      &:hover, &.open {
+        color: var(--primary-hover-text);
+        background: var(--primary-hover-bg);
+      }
+    }
+  }
+</style>

package/components/novnc/NovncConsoleWrapper.vue

@@ -0,0 +1,243 @@
+<script>
+import KeyTable from '@novnc/novnc/core/input/keysym';
+import NovncConsole from '@shell/components/novnc/NovncConsole';
+import NovncConsoleItem from '@shell/components/novnc/NovncConsoleItem';
+import { HCI } from '@shell/config/types';
+
+const SHORT_KEYS = {
+  ControlLeft: {
+    label: 'Ctrl',
+    value: KeyTable.XK_Control_L,
+  },
+  AltLeft: {
+    label: 'Alt',
+    value: KeyTable.XK_Alt_L,
+  }
+};
+
+const FUNCTION_KEYS = {
+  Delete: {
+    label: 'Del',
+    value: KeyTable.XK_Delete,
+  },
+  PrintScreen: {
+    label: 'Print Screen',
+    value: KeyTable.XK_Print,
+  },
+};
+
+const NORMAL_KEYS = {
+  KeyN: {
+    label: 'N',
+    value: KeyTable.XK_n,
+  },
+  KeyT: {
+    label: 'T',
+    value: KeyTable.XK_t,
+  },
+  KeyW: {
+    label: 'W',
+    value: KeyTable.XK_w,
+  },
+  KeyY: {
+    label: 'Y',
+    value: KeyTable.XK_y,
+  },
+};
+
+const F_KEYS = {
+  F1: {
+    label: 'F1',
+    value: KeyTable.XK_F1,
+  },
+  F2: {
+    label: 'F2',
+    value: KeyTable.XK_F2,
+  },
+  F3: {
+    label: 'F3',
+    value: KeyTable.XK_F3,
+  },
+  F4: {
+    label: 'F4',
+    value: KeyTable.XK_F4,
+  },
+  F5: {
+    label: 'F5',
+    value: KeyTable.XK_F5,
+  },
+  F6: {
+    label: 'F6',
+    value: KeyTable.XK_F6,
+  },
+  F7: {
+    label: 'F7',
+    value: KeyTable.XK_F7,
+  },
+  F8: {
+    label: 'F8',
+    value: KeyTable.XK_F8,
+  },
+  F9: {
+    label: 'F9',
+    value: KeyTable.XK_F9,
+  },
+  F10: {
+    label: 'F10',
+    value: KeyTable.XK_F10,
+  },
+  F11: {
+    label: 'F11',
+    value: KeyTable.XK_F11,
+  },
+  F12: {
+    label: 'F12',
+    value: KeyTable.XK_F12,
+  },
+};
+
+export default {
+  components: { NovncConsole, NovncConsoleItem },
+
+  async fetch() {
+    this.vmResource = await this.$store.dispatch('harvester/find', { type: HCI.VM, id: this.value.id });
+  },
+
+  data() {
+    return {
+      keysRecord: [],
+      vmResource: {},
+    };
+  },
+
+  props: {
+    value: {
+      type:     Object,
+      required: true,
+      default:  () => {
+        return {};
+      }
+    }
+  },
+
+  computed: {
+    isDown() {
+      return this.isEmpty(this.value);
+    },
+
+    url() {
+      const ip = `${ window.location.hostname }:${ window.location.port }`;
+
+      return `wss://${ ip }${ this.value?.getVMIApiPath }`;
+    },
+
+    allKeys() {
+      return {
+        ...SHORT_KEYS,
+        ...FUNCTION_KEYS,
+        ...NORMAL_KEYS,
+        ...F_KEYS,
+      };
+    },
+
+    keymap() {
+      const out = {
+        ...SHORT_KEYS,
+        PrintScreen: FUNCTION_KEYS.PrintScreen,
+        ...F_KEYS,
+      };
+
+      out.AltLeft.keys = { PrintScreen: FUNCTION_KEYS.PrintScreen, ...F_KEYS };
+      out.ControlLeft.keys = {
+        AltLeft: {
+          ...Object.assign(SHORT_KEYS.AltLeft, {}),
+          keys: { Delete: FUNCTION_KEYS.Delete }
+        },
+        ...NORMAL_KEYS,
+      };
+
+      return out;
+    },
+
+    hasSoftRebootAction() {
+      return !!this.vmResource?.actions?.softreboot;
+    }
+  },
+
+  methods: {
+    isEmpty(o) {
+      return o !== undefined && Object.keys(o).length === 0;
+    },
+
+    close() {
+      this.$refs.novncConsole.disconnect();
+    },
+
+    update({ key, pos }) {
+      this.keysRecord.splice(pos, this.keysRecord.length - pos, key);
+    },
+
+    // Send function key, e.g. ALT + F
+    sendKeys() {
+      this.keysRecord.forEach((key) => {
+        this.$refs.novncConsole.sendKey(this.allKeys[key].value, key, true);
+      });
+
+      this.keysRecord.reverse().forEach((key) => {
+        this.$refs.novncConsole.sendKey(this.allKeys[key].value, key, false);
+      });
+
+      this.$refs.popover.isOpen = false;
+      this.keysRecord = [];
+    },
+
+    softReboot() {
+      this.vmResource.softrebootVM();
+    },
+  }
+};
+</script>
+
+<template>
+  <div id="app">
+    <div class="vm-console">
+      <div class="combination-keys">
+        <v-popover
+          ref="popover"
+          placement="top"
+          trigger="click"
+          :container="false"
+          @auto-hide="keysRecord = []"
+        >
+          <button class="btn btn-sm bg-primary">
+            {{ t("harvester.virtualMachine.detail.console.shortKeys") }}
+          </button>
+
+          <template slot="popover">
+            <novnc-console-item :items="keymap" :path="keysRecord" :pos="0" @update="update" @sendKeys="sendKeys" />
+          </template>
+        </v-popover>
+
+        <button v-if="hasSoftRebootAction" class="btn btn-sm bg-primary" @click="softReboot">
+          {{ t("harvester.action.softreboot") }}
+        </button>
+      </div>
+      <NovncConsole v-if="url && !isDown" ref="novncConsole" :url="url" />
+      <p v-if="isDown">
+        {{ t("harvester.virtualMachine.detail.console.down") }}
+      </p>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .vm-console {
+    height: 100%;
+    display: grid;
+    grid-template-rows: 30px auto;
+  }
+
+  .combination-keys {
+    background: rgb(40, 40, 40);
+  }
+</style>

package/config/labels-annotations.js

@@ -12,6 +12,7 @@ export const TARGET_WORKLOADS = 'field.cattle.io/targetWorkloadIds';
 export const UI_MANAGED = 'management.cattle.io/ui-managed';
 export const CREATOR_ID = 'field.cattle.io/creatorId';
 export const RESOURCE_QUOTA = 'field.cattle.io/resourceQuota';
+export const AZURE_MIGRATED = 'auth.cattle.io/azuread-endpoint-migrated';
 
 export const KUBERNETES = {
   SERVICE_ACCOUNT_UID:  'kubernetes.io/service-account.uid',
@@ -50,7 +51,9 @@ export const CAPI = {
   FORCE_MACHINE_REMOVE: 'provisioning.cattle.io/force-machine-remove',
   MACHINE_NAME:         'cluster.x-k8s.io/machine',
   DELETE_MACHINE:       'cluster.x-k8s.io/delete-machine',
-  PROVIDER:             'provider.cattle.io'
+  PROVIDER:             'provider.cattle.io',
+  SECRET_AUTH:          'v2prov-secret-authorized-for-cluster',
+  SECRET_WILL_DELETE:   'v2prov-authorized-secret-deletes-on-cluster-removal'
 };
 
 export const CATALOG = {
@@ -165,7 +168,8 @@ export const HCI = {
   DYNAMIC_SSHKEYS_USERS:        'harvesterhci.io/dynamic-ssh-key-users',
   VM_VOLUME_STATUS:             'harvesterhci.io/volume-status',
   IMAGE_SUFFIX:                 'harvesterhci.io/image-type',
-  OS_TYPE:                      'harvesterhci.io/os-type'
+  OS_TYPE:                      'harvesterhci.io/os-type',
+  HOST_REQUEST:                 'management.cattle.io/pod-requests',
 };
 
 // Annotations that can be on management.cattle.io.cluster to configure a custom badge

package/config/product/explorer.js

@@ -12,7 +12,7 @@ import {
 
 import {
   STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, KEYS,
-  INGRESS_DEFAULT_BACKEND, INGRESS_TARGET,
+  INGRESS_DEFAULT_BACKEND, INGRESS_TARGET, INGRESS_CLASS,
   SPEC_TYPE, TARGET_PORT, SELECTOR, NODE as NODE_COL, TYPE, WORKLOAD_IMAGES, POD_IMAGES,
   USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT,
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
@@ -88,10 +88,13 @@ export function init(store) {
   weightGroup('storage', 95, true);
   weightType(POD, -1, true);
 
+  // here is where we define the usage of the WORKLOAD custom list view for
+  // all the workload types (ex: deployments, cron jobs, daemonsets, etc)
   for (const key in WORKLOAD_TYPES) {
     componentForType(WORKLOAD_TYPES[key], WORKLOAD);
   }
 
+  ignoreType(MANAGEMENT.GLOBAL_DNS_PROVIDER); // Old, managed in multi-cluster-apps
   ignoreType('events.k8s.io.event'); // Old, moved into core
   ignoreType('extensions.ingress'); // Old, moved into networking
   ignoreType(MANAGEMENT.PROJECT);
@@ -116,7 +119,8 @@ export function init(store) {
   mapGroup(/^(.*\.)?tigera\.io$/, 'Tigera');
   mapGroup(/^(.*\.)?longhorn(\.rancher)?\.io$/, 'Longhorn');
   mapGroup(/^(.*\.)?(fleet|gitjob)\.cattle\.io$/, 'Fleet');
-  mapGroup(/^(.*\.)?(helm|k3s)\.cattle\.io$/, 'K3s');
+  mapGroup(/^(.*\.)?(k3s)\.cattle\.io$/, 'K3s');
+  mapGroup(/^(.*\.)?(helm)\.cattle\.io$/, 'Helm');
   mapGroup(/^(.*\.)?upgrade\.cattle\.io$/, 'Upgrade Controller');
   mapGroup(/^(.*\.)?cis\.cattle\.io$/, 'CIS');
   mapGroup(/^(.*\.)?traefik\.containo\.us$/, 'Træfik');
@@ -178,7 +182,7 @@ export function init(store) {
     },
     AGE
   ]);
-  headers(INGRESS, [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, AGE]);
+  headers(INGRESS, [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE]);
   headers(SERVICE, [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE]);
   headers(HPA, [STATE, NAME_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE]);
 

package/config/product/fleet.js

@@ -2,6 +2,7 @@ import { DSL } from '@shell/store/type-map';
 import { FLEET } from '@shell/config/types';
 import { STATE, NAME as NAME_COL, AGE } from '@shell/config/table-headers';
 import { FLEET as FLEET_FEATURE } from '@shell/store/features';
+import { gitRepoGraphConfig } from '@shell/pages/c/_cluster/fleet/GitRepoGraphConfig';
 
 export const NAME = 'fleet';
 export const CHART_NAME = 'fleet';
@@ -49,7 +50,9 @@ export function init(store) {
   ]);
 
   configureType(FLEET.CLUSTER, { isCreatable: false });
-  configureType(FLEET.GIT_REPO, { showListMasthead: false });
+  configureType(FLEET.GIT_REPO, {
+    showListMasthead: false, hasGraph: true, graphConfig: gitRepoGraphConfig
+  });
 
   weightType(FLEET.GIT_REPO, 109, true);
   weightType(FLEET.CLUSTER, 108, true);

package/config/product/manager.js

@@ -2,7 +2,6 @@ import { AGE, NAME as NAME_COL, STATE } from '@shell/config/table-headers';
 import {
   CAPI,
   CATALOG,
-  MANAGEMENT,
   NORMAN,
   HCI
 } from '@shell/config/types';
@@ -115,7 +114,6 @@ export function init(store) {
   configureType(CATALOG.CLUSTER_REPO, { showListMasthead: false });
 
   basicType([
-    MANAGEMENT.CLUSTER,
     CAPI.MACHINE_DEPLOYMENT,
     CAPI.MACHINE_SET,
     CAPI.MACHINE,
@@ -152,10 +150,11 @@ export function init(store) {
       search:   'kubernetesVersion',
     },
     {
-      name:     'provider',
-      labelKey: 'tableHeaders.provider',
-      value:    'machineProvider',
-      sort:     ['machineProvider', 'provisioner'],
+      name:      'provider',
+      labelKey:  'tableHeaders.provider',
+      value:     'machineProvider',
+      sort:      ['machineProvider', 'provisioner'],
+      formatter: 'ClusterProvider',
     },
     MACHINE_SUMMARY,
     AGE,

package/config/product/settings.js

@@ -80,11 +80,22 @@ export function init(store) {
     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' }
+  });
+
   basicType([
     'settings',
     'features',
     'brand',
-    'banners'
+    'banners',
+    'performance'
   ]);
 
   configureType(MANAGEMENT.SETTING, {

package/config/query-params.js

@@ -38,6 +38,8 @@ export const AS = 'as';
 export const _DETAIL = 'detail';
 export const _CONFIG = 'config';
 export const _YAML = 'yaml';
+export const _GRAPH = 'graph';
+export const FOCUS = 'focus';
 
 export const PREVIEW = 'preview';
 

package/config/roles.ts

@@ -266,6 +266,11 @@ export const SCOPED_RESOURCES = {
         'Events',
       ]
     },
+    'helm.cattle.io': {
+      resources: [
+        'ProjectHelmCharts',
+      ]
+    },
     'monitoring.coreos.com': {
       resources: [
         'Alertmanagers',