@rancher/shell 3.0.12-rc.4 → 3.0.12-rc.6

package/components/form/__tests__/SelectOrCreateAuthSecret.test.ts

@@ -66,4 +66,126 @@ describe('component: SelectOrCreateAuthSecret', () => {
 
     expect(passwordLabeledInput!.props('labelKey')).toBe(expectedLabelKey);
   });
+
+  describe('GitHub App auth', () => {
+    const githubAppSetup = () => mount(SelectOrCreateAuthSecret, {
+      ...requiredSetup(),
+      props: {
+        mode:               _EDIT,
+        namespace:          'default',
+        value:              {},
+        allowGithubApp:     true,
+        registerBeforeHook: () => {},
+      },
+      data() {
+        return { selected: AUTH_TYPE._GITHUB_APP } as any;
+      }
+    });
+
+    it('should render the three GitHub App fields when selected', () => {
+      const wrapper = githubAppSetup();
+
+      expect(wrapper.find('[data-testid="auth-secret-github-app-id"]').exists()).toBe(true);
+      expect(wrapper.find('[data-testid="auth-secret-github-app-installation-id"]').exists()).toBe(true);
+      expect(wrapper.find('[data-testid="auth-secret-github-app-private-key"]').exists()).toBe(true);
+      expect(wrapper.find('[data-testid="auth-secret-github-app-private-key-file"]').exists()).toBe(true);
+    });
+
+    it('should not narrow the select column for GitHub App (keeps span-6)', () => {
+      const wrapper = githubAppSetup();
+
+      expect((wrapper.vm as any).firstCol).toBe('col span-6');
+    });
+
+    it('should emit inputauthval with the GitHub App field values', async() => {
+      const wrapper = githubAppSetup();
+
+      await wrapper.setData({
+        githubAppId:             'app-id',
+        githubAppInstallationId: 'installation-id',
+        githubAppPrivateKey:     'private-key',
+      });
+
+      const emitted = wrapper.emitted('inputauthval') as any[];
+      const last = emitted[emitted.length - 1][0];
+
+      expect(last).toStrictEqual({
+        selected:                AUTH_TYPE._GITHUB_APP,
+        publicKey:               '',
+        privateKey:              '',
+        githubAppId:             'app-id',
+        githubAppInstallationId: 'installation-id',
+        githubAppPrivateKey:     'private-key',
+      });
+    });
+
+    it('should populate the private key when a file is read', async() => {
+      const wrapper = githubAppSetup();
+
+      const fileSelector = wrapper.findComponent({ name: 'FileSelector' });
+
+      await fileSelector.vm.$emit('selected', 'key-from-file');
+
+      expect((wrapper.vm as any).githubAppPrivateKey).toBe('key-from-file');
+    });
+
+    it.each([
+      ['offer', true],
+      ['not offer', false],
+    ])('should %s the GitHub App create option when allowGithubApp is %p', (_, allowGithubApp) => {
+      const wrapper = mount(SelectOrCreateAuthSecret, {
+        ...requiredSetup(),
+        props: {
+          mode:               _EDIT,
+          namespace:          'default',
+          value:              {},
+          allowGithubApp,
+          registerBeforeHook: () => {},
+        },
+      });
+
+      const hasGithubAppOption = (wrapper.vm as any).options
+        .some((o: any) => o.value === AUTH_TYPE._GITHUB_APP);
+
+      expect(hasGithubAppOption).toBe(allowGithubApp);
+    });
+
+    it('should list existing GitHub App secrets but exclude plain Opaque secrets', () => {
+      const githubAppSecret = {
+        _type:          'Opaque',
+        isGithubApp:    true,
+        id:             'default/gh-app',
+        dataPreview:    '3 keys',
+        subTypeDisplay: 'Opaque',
+        metadata:       { name: 'gh-app', namespace: 'default' },
+      };
+      const plainOpaqueSecret = {
+        _type:          'Opaque',
+        isGithubApp:    false,
+        id:             'default/plain',
+        dataPreview:    '1 key',
+        subTypeDisplay: 'Opaque',
+        metadata:       { name: 'plain', namespace: 'default' },
+      };
+
+      const wrapper = mount(SelectOrCreateAuthSecret, {
+        ...requiredSetup(),
+        props: {
+          mode:               _EDIT,
+          namespace:          'default',
+          value:              {},
+          allowGithubApp:     true,
+          registerBeforeHook: () => {},
+        },
+        data() {
+          return { allSecrets: [githubAppSecret, plainOpaqueSecret] } as any;
+        }
+      });
+
+      const optionValues = (wrapper.vm as any).options.map((o: any) => o.value);
+
+      expect(optionValues).toContain('default/gh-app');
+      expect(optionValues).not.toContain('default/plain');
+    });
+  });
 });

package/components/formatter/EtcdSnapshotName.vue

@@ -0,0 +1,73 @@
+<script>
+import { get } from '@shell/utils/object';
+
+export default {
+  props: {
+    value: {
+      type:    String,
+      default: ''
+    },
+    row: {
+      type:     Object,
+      required: true
+    },
+    col: {
+      type:    Object,
+      default: () => ({})
+    },
+    reference: {
+      type:    String,
+      default: null,
+    },
+    getCustomDetailLink: {
+      type:    Function,
+      default: null
+    }
+  },
+
+  computed: {
+    to() {
+      if (this.getCustomDetailLink) {
+        return this.getCustomDetailLink(this.row);
+      }
+      if ( this.row && this.reference ) {
+        return get(this.row, this.reference);
+      }
+
+      return this.row?.detailLocation;
+    },
+
+    showPredatesImportIcon() {
+      return !!this.row?.isSnapshotTooOld;
+    },
+
+    predatesImportMessage() {
+      return this.t('cluster.snapshot.predatesImportTooltip');
+    },
+  }
+};
+</script>
+
+<template>
+  <span>
+    <router-link
+      v-if="to"
+      :to="to"
+    >
+      {{ value }}
+    </router-link>
+    <span v-else>
+      {{ value }}
+      <template v-if="!value && col.dashIfEmpty">
+        <span class="text-muted">&mdash;</span>
+      </template>
+    </span>
+    <i
+      v-if="showPredatesImportIcon"
+      v-clean-tooltip="{ content: predatesImportMessage, triggers: ['hover', 'touch', 'focus'] }"
+      v-stripped-aria-label="predatesImportMessage"
+      tabindex="0"
+      class="icon icon-error text-error ml-5"
+    />
+  </span>
+</template>

package/components/formatter/Translate.vue

@@ -1,4 +1,6 @@
 <script>
+import { get } from '@shell/utils/object';
+
 export default {
   props: {
     row: {
@@ -6,6 +8,11 @@ export default {
       required: true,
     },
 
+    fallbackPath: {
+      type:    String,
+      default: '',
+    },
+
     prefix: {
       type:    String,
       default: '',
@@ -18,8 +25,22 @@ export default {
   },
 
   computed: {
+    l10nId() {
+      return `${ this.prefix ? `${ this.prefix }.` : '' }${ this.value || this.row.id }`;
+    },
+
+    l10nFallback() {
+      const fallback = this.value;
+
+      if (this.fallbackPath) {
+        return get(this.row, this.fallbackPath) || fallback;
+      }
+
+      return fallback;
+    },
+
     text() {
-      return this.$store.getters['i18n/withFallback'](`${ this.prefix }.${ this.value || this.row.id }`, null, this.value);
+      return this.$store.getters['i18n/withFallback'](this.l10nId, null, this.l10nFallback);
     },
   },
 };

package/components/nav/Group.vue

@@ -384,14 +384,12 @@ export default {
       user-select: none;
       text-transform: none;
       font-size: 14px;
+      height: 100%;
+      padding: 8px 0 8px 16px;
+      display: inline-flex;
+      align-items: center;
     }
 
-    > H6 {
-        text-transform: none;
-        height: 100%;
-        padding: 8px 0 8px 16px;
-      }
-
     > A {
       display: block;
       box-sizing:border-box;
@@ -403,10 +401,6 @@ export default {
       &:focus{
         outline:none;
       }
-      > H6 {
-        text-transform: none;
-        padding: 8px 0 8px 16px;
-      }
     }
   }
 
@@ -574,6 +568,7 @@ export default {
       padding-left: 24px;
       display: flex;
       justify-content: space-between;
+      align-items: center;
     }
 
     A:focus {

package/components/nav/Header.vue

@@ -30,6 +30,7 @@ import {
   RcDropdownTrigger
 } from '@components/RcDropdown';
 import { SLO_AUTH_PROVIDERS } from '@shell/store/auth';
+import { CLUSTER_SHELL } from '@shell/store/features';
 
 export default {
 
@@ -147,10 +148,16 @@ export default {
       return true;
     },
 
+    // Does the user have permissions to use the shell
     shellEnabled() {
       return !!this.currentCluster?.links?.shell;
     },
 
+    // Is the feature flag enabled for cluster shell access?
+    shellFeatureEnabled() {
+      return !!this.$store.getters['features/get'](CLUSTER_SHELL);
+    },
+
     showKubeShell() {
       return !this.rootProduct?.hideKubeShell;
     },
@@ -629,7 +636,7 @@ export default {
           </button>
 
           <button
-            v-if="showKubeShell"
+            v-if="showKubeShell && shellFeatureEnabled"
             id="btn-kubectl"
             v-clean-tooltip="t('nav.shellShortcut', {key: shellShortcut})"
             v-shortkey="{windows: ['ctrl', '`'], mac: ['meta', '`']}"

package/components/nav/TopLevelMenu.vue

@@ -955,19 +955,6 @@ export default {
         <div
           class="footer"
         >
-          <div
-            v-if="canEditSettings"
-            class="support"
-            @click="hide()"
-          >
-            <router-link
-              :to="{name: 'support'}"
-              role="link"
-              :aria-label="t('nav.ariaLabel.support')"
-            >
-              {{ t('nav.support', {hasSupport}) }}
-            </router-link>
-          </div>
           <div
             class="version"
             :class="{'version-small': largeAboutText}"
@@ -1574,10 +1561,6 @@ export default {
         margin: 20px 10px;
         width: 50px;
 
-        .support {
-          display: none;
-        }
-
         .version{
           text-align: center;
 
@@ -1597,19 +1580,7 @@ export default {
       > * {
         flex: 1;
         color: var(--link);
-
-        &:first-child {
-          text-align: left;
-        }
-        &:last-child {
-          text-align: right;
-        }
-        text-align: center;
-      }
-
-      .support a:focus-visible {
-        @include focus-outline;
-        outline-offset: 4px;
+        text-align: left;
       }
 
       .version {

package/components/nav/__tests__/Group.test.ts

@@ -64,4 +64,65 @@ describe('component: Group', () => {
 
     expect((wrapper.vm as any).hasActiveRoute()).toBe(true);
   });
+
+  describe('group header label', () => {
+    const mountGroup = (group: any) => shallowMount(Group as any, {
+      props: {
+        group, canCollapse: true, idPrefix: ''
+      },
+      global: {
+        stubs: { 'router-link': { template: '<a><slot /></a>' } },
+        mocks: {
+          $route: {
+            params: {}, path: '/test/route', fullPath: '/test/route', matched: []
+          },
+          $router: {
+            resolve:   jest.fn().mockReturnValue({ path: '/test/route', fullPath: '/test/route' }),
+            getRoutes: jest.fn().mockReturnValue([])
+          },
+          t: (key: string) => key
+        }
+      }
+    });
+
+    it('renders the label in an h6 for a non-linked group header', () => {
+      const group = {
+        name:     'test',
+        label:    'My Group',
+        children: [
+          { route: { name: 'child-route', params: {} } }
+        ]
+      };
+
+      const wrapper = mountGroup(group);
+      const header = wrapper.find('.header');
+      const h6 = header.find('h6');
+
+      // Non-linked header: the label sits in a bare h6, not wrapped in a router-link
+      expect(header.find('a').exists()).toBe(false);
+      expect(h6.exists()).toBe(true);
+      expect(h6.find('span').html()).toContain('My Group');
+    });
+
+    it('renders the label in an h6 wrapped in a router-link for a group header with overview', () => {
+      const group = {
+        name:     'test',
+        label:    'My Group',
+        children: [
+          {
+            route: { name: 'overview-route' }, overview: true, exact: true
+          }
+        ]
+      };
+
+      const wrapper = mountGroup(group);
+      const link = wrapper.find('.header a');
+      const h6 = link.find('h6');
+
+      // Linked header: the same h6 label markup is wrapped in a router-link
+      expect(link.exists()).toBe(true);
+      expect(h6.exists()).toBe(true);
+      expect(h6.find('span').html()).toContain('My Group');
+    });
+  });
 });

package/components/templates/default.vue

@@ -25,6 +25,7 @@ import { getClusterFromRoute, getProductFromRoute } from '@shell/utils/router';
 import SideNav from '@shell/components/SideNav';
 import { Layout } from '@shell/types/window-manager';
 import { RcButton } from '@components/RcButton';
+import { CLUSTER_SHELL } from '@shell/store/features';
 
 const SET_LOGIN_ACTION = 'set-as-login';
 
@@ -140,6 +141,7 @@ export default {
       debugger;
     },
 
+    // Open the shell for the current cluster if the user has permissions and the feature is enabled (invoked via keyboard shortcut)
     async toggleShell() {
       const clusterId = this.$route.params.cluster;
 
@@ -147,6 +149,11 @@ export default {
         return;
       }
 
+      // Cluster shell is disabled via feature flag
+      if (!this.$store.getters['features/get'](CLUSTER_SHELL)) {
+        return;
+      }
+
       const cluster = await this.$store.dispatch('management/find', {
         type: MANAGEMENT.CLUSTER,
         id:   clusterId,

package/config/features.js

@@ -4,3 +4,4 @@ export const ONE_WAY = [
 
 export const HARVESTER_NAME = 'harvester';
 export const SCHEDULING_CUSTOMIZATION = 'cluster-agent-scheduling-customization';
+export const IMPORTED_DAY_2_OPS = 'imported-day-2-ops';

package/config/labels-annotations.js

@@ -20,6 +20,7 @@ export const IMPORTED_CLUSTER_VERSION_MANAGEMENT = 'rancher.io/imported-cluster-
 export const UI_PROJECT_SECRET = 'management.cattle.io/project-scoped-secret';
 export const UI_PROJECT_SECRET_COPY = 'management.cattle.io/project-scoped-secret-copy';
 export const SERVICE_LINKS = 'ui.rancher/service-links';
+export const NODE_DRIVER_FIELD_HINTS = 'io.cattle.nodedriver/ui-field-hints';
 
 export const KUBERNETES = {
   SERVICE_ACCOUNT_UID:  'kubernetes.io/service-account.uid',
@@ -150,6 +151,8 @@ export const RKE = { EXTERNAL_IP: 'rke.cattle.io/external-ip' };
 
 export const SNAPSHOT = { CLUSTER_NAME: 'rke.cattle.io/cluster-name' };
 
+export const OPERATION_ANNOTATIONS = { ENABLED: 'operations.cattle.io/ops-enabled' };
+
 export const ISTIO = { AUTO_INJECTION: 'istio-injection' };
 
 const CATTLE_REGEX = /cattle\.io\//;

package/config/product/manager.js

@@ -10,6 +10,7 @@ import {
   HCI,
   MANAGEMENT,
   SNAPSHOT,
+  OPERATION,
   VIRTUAL_TYPES,
   HOSTED_PROVIDER,
   SAVED_COUNTS
@@ -80,6 +81,11 @@ export function init(store) {
   configureType(SNAPSHOT, { depaginate: true });
   configureType(CATALOG.CLUSTER_REPO, { listCreateButtonLabelKey: 'catalog.repo.add' });
 
+  // Day 2 operation CRDs - read-only, not user-creatable or editable
+  configureType(OPERATION.ETCD_SNAPSHOT, { isCreatable: false, isEditable: false });
+  configureType(OPERATION.ETCD_SNAPSHOT_RESTORE, { isCreatable: false, isEditable: false });
+  configureType(OPERATION.ENCRYPTION_KEY_ROTATE, { isCreatable: false, isEditable: false });
+
   configureType(CAPI.RANCHER_CLUSTER, {
     showListMasthead: false, namespaced: false, alias: [HCI.CLUSTER]
   });

package/config/secret.ts

@@ -13,3 +13,13 @@ export const SECRET_TYPES = {
   RKE_AUTH_CONFIG:   'rke.cattle.io/auth-config',
   FLEET_OCI_STORAGE: 'fleet.cattle.io/bundle-oci-storage/v1alpha1'
 };
+
+/**
+ * Data keys for a Fleet GitHub App authentication secret (stored as an Opaque secret).
+ * Shared so the create flows stay in sync.
+ */
+export const GITHUB_APP_SECRET_KEYS = {
+  APP_ID:          'github_app_id',
+  INSTALLATION_ID: 'github_app_installation_id',
+  PRIVATE_KEY:     'github_app_private_key',
+};

package/config/settings.ts

@@ -67,6 +67,7 @@ export const SETTING = {
   UI_DASHBOARD_HARVESTER_LEGACY_PLUGIN:          'ui-dashboard-harvester-legacy-plugin',
   UI_OFFLINE_PREFERRED:                          'ui-offline-preferred',
   SYSTEM_DEFAULT_REGISTRY:                       'system-default-registry',
+  SYSTEM_DEFAULT_REGISTRY_PULL_SECRETS:          'system-default-registry-pull-secrets',
   UI_ISSUES:                                     'ui-issues',
   PL:                                            'ui-pl',
   PL_RANCHER_VALUE:                              'rancher',
@@ -124,6 +125,7 @@ export const SETTING = {
    */
   DYNAMIC_CONTENT_ENABLED:                       'ui-content-enabled',
   DYNAMIC_CONTENT_ENDPOINT:                      'ui-content-endpoint',
+  IMPORTED_CLUSTER_DAY2_OPS_DEFAULT:             'imported-cluster-day2-ops-enabled'
 } as const;
 
 // These are the settings that are allowed to be edited via the UI
@@ -163,6 +165,7 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.SERVER_URL]:                           { kind: 'url', canReset: true },
   [SETTING.RKE_METADATA_CONFIG]:                  { kind: 'json' },
   [SETTING.SYSTEM_DEFAULT_REGISTRY]:              {},
+  [SETTING.SYSTEM_DEFAULT_REGISTRY_PULL_SECRETS]: {},
   [SETTING.UI_DASHBOARD_INDEX]:                   {},
   [SETTING.UI_OFFLINE_PREFERRED]:                 {
     kind:    'enum',
@@ -184,12 +187,12 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
     ruleSet: [{ name: 'minValue', factoryArg: 1 }]
   },
   [SETTING.IMPORTED_CLUSTER_VERSION_MANAGEMENT]:           { kind: 'boolean' },
+  [SETTING.IMPORTED_CLUSTER_DAY2_OPS_DEFAULT]:             { kind: 'boolean' },
   // Configuration setup for agent configuration. Setting this up will activate the specific banner configuration.
   [SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS]:          { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.CLUSTER },
   [SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET]: { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.CLUSTER },
   [SETTING.FLEET_AGENT_DEFAULT_PRIORITY_CLASS]:            { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.FLEET },
-  [SETTING.FLEET_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET]:   { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.FLEET }
-
+  [SETTING.FLEET_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET]:   { kind: 'json', agent: AGENT_CONFIGURATION_TYPES.FLEET },
 };
 
 /**
@@ -206,6 +209,7 @@ export const PROVISIONING_SETTINGS = [
   SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET,
   SETTING.FLEET_AGENT_DEFAULT_PRIORITY_CLASS,
   SETTING.FLEET_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET,
+  SETTING.IMPORTED_CLUSTER_DAY2_OPS_DEFAULT
 ];
 
 /**

package/config/table-headers.js

@@ -1072,11 +1072,14 @@ export const ROLE = {
 export const FEATURE_DESCRIPTION = {
   name:          'description',
   labelKey:      'tableHeaders.description',
-  value:         'status.description',
+  value:         'id',
   align:         'left',
   sort:          ['status.description'],
   formatter:     'Translate',
-  formatterOpts: { prefix: 'featureFlags.description' },
+  formatterOpts: {
+    prefix:       'featureFlags.description',
+    fallbackPath: 'status.description'
+  },
 };
 
 export const STATE_NORMAN = {

package/config/types.js

@@ -219,6 +219,12 @@ export const LONGHORN_VERSION_V2 = 'LonghornV2';
 
 export const SNAPSHOT = 'rke.cattle.io.etcdsnapshot';
 
+export const OPERATION = {
+  ETCD_SNAPSHOT:         'operation.cattle.io.etcdsnapshotsave',
+  ETCD_SNAPSHOT_RESTORE: 'operation.cattle.io.etcdsnapshotrestore',
+  ENCRYPTION_KEY_ROTATE: 'operation.cattle.io.encryptionkeyrotation',
+};
+
 // --------------------------------------
 // 2. Only if Rancher is installed
 // --------------------------------------
@@ -400,6 +406,7 @@ export const AUTH_TYPE = {
   _S3:                '_S3',
   _RKE:               '_RKE',
   _IMAGE_PULL_SECRET: '_IPS',
+  _GITHUB_APP:        '_GITHUB_APP',
 };
 
 export const LOCAL_CLUSTER = 'local';