@rancher/shell 3.0.9-rc.5 → 3.0.9

package/config/labels-annotations.js

@@ -108,12 +108,13 @@ export const CATALOG = {
   _CLUSTER_TPL:  'cluster-template',
   _CLUSTER_TOOL: 'cluster-tool',
 
-  COMPONENT:         'catalog.cattle.io/ui-component',
-  SOURCE_REPO_TYPE:  'catalog.cattle.io/ui-source-repo-type',
-  SOURCE_REPO_NAME:  'catalog.cattle.io/ui-source-repo',
-  COLOR:             'catalog.cattle.io/ui-color',
-  DISPLAY_NAME:      'catalog.cattle.io/display-name',
-  CLUSTER_REPO_NAME: 'catalog.cattle.io/cluster-repo-name',
+  COMPONENT:           'catalog.cattle.io/ui-component',
+  SOURCE_REPO_TYPE:    'catalog.cattle.io/ui-source-repo-type',
+  SOURCE_REPO_NAME:    'catalog.cattle.io/ui-source-repo',
+  COLOR:               'catalog.cattle.io/ui-color',
+  DISPLAY_NAME:        'catalog.cattle.io/display-name',
+  CLUSTER_REPO_NAME:   'catalog.cattle.io/cluster-repo-name',
+  SUSE_APP_COLLECTION: 'catalog.cattle.io/suse-application-collection',
 
   SUPPORTED_OS: 'catalog.cattle.io/os',
   PERMITTED_OS: 'catalog.cattle.io/permits-os',

package/config/pagination-table-headers.js

@@ -3,7 +3,7 @@ import {
   STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT,
   EVENT_LAST_SEEN_TIME,
   EVENT_TYPE,
-  SECRET_CLONE,
+  SECRET_ORIGIN,
   EVENT_FIRST_SEEN_TIME
 } from '@shell/config/table-headers';
 
@@ -89,7 +89,9 @@ export const STEVE_LIST_GROUPS = [{
   groupLabelKey: 'groupByLabel',
 }];
 
-export const STEVE_SECRET_CLONE = {
-  ...SECRET_CLONE,
-  sort: `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`,
+export const STEVE_SECRET_ORIGIN = {
+  ...SECRET_ORIGIN,
+  // We can't sort by the 'UI_PROJECT_SECRET' label (management.cattle.io/project-scoped-secret) due to backend limitations.
+  // So we sort by the 'UI_PROJECT_SECRET_COPY' annotation (management.cattle.io/project-scoped-secret-copy) which at least groups the copies.
+  sort: `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]:desc`,
 };

package/config/product/explorer.js

@@ -19,7 +19,7 @@ import {
   USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, USER_LAST_LOGIN, USER_DISABLED_IN, USER_DELETED_IN, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT,
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
-  ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, LAST_USED, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
+  DESCRIPTION, SUB_TYPE, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
   DURATION, MESSAGE, REASON, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA,
   EVENT_LAST_SEEN_TIME,
   EVENT_FIRST_SEEN_TIME,
@@ -546,16 +546,6 @@ export function init(store) {
     AGE
   ]);
 
-  headers(NORMAN.TOKEN, [
-    EXPIRY_STATE,
-    ACCESS_KEY,
-    DESCRIPTION,
-    SCOPE_NORMAN,
-    LAST_USED,
-    EXPIRES,
-    AGE_NORMAN
-  ]);
-
   virtualType({
     label:      store.getters['i18n/t']('clusterIndexPage.header'),
     group:      'Root',

package/config/product/manager.js

@@ -202,7 +202,6 @@ export function init(store) {
   ]);
 
   headers(EXT.KUBECONFIG, [
-    STATE,
     {
       name:      'clusters',
       labelKey:  'tableHeaders.clusters',

package/config/query-params.js

@@ -94,3 +94,6 @@ export const SECRET_QUERY_PARAMS = {
 export const SECRET_SCOPE = 'scope';
 // RANCHER OIDC CLIENT
 export const RANCHER_AS_OIDC_QUERY_PARAMS = ['scope', 'client_id', 'redirect_uri', 'response_type'];
+
+// For REPOSITORIES, to determine which type of repo to create, used on clusterrepo create page
+export const TARGET = 'target';

package/config/settings.ts

@@ -2,6 +2,11 @@
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
 
+export const AGENT_CONFIGURATION_TYPES = {
+  CLUSTER: 'cluster',
+  FLEET:   'fleet'
+} as const;
+
 interface GlobalSettingRuleset {
   name: string,
   key?: string | number,
@@ -17,6 +22,7 @@ interface GlobalSetting {
     kind?: string,
     options?: string[]
     readOnly?: boolean,
+    agent?: typeof AGENT_CONFIGURATION_TYPES.CLUSTER | typeof AGENT_CONFIGURATION_TYPES.FLEET,
     /**
      * Function used from the form validation
      */
@@ -111,6 +117,8 @@ export const SETTING = {
   IMPORTED_CLUSTER_VERSION_MANAGEMENT:           'imported-cluster-version-management',
   CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS:          'cluster-agent-default-priority-class',
   CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET: 'cluster-agent-default-pod-disruption-budget',
+  FLEET_AGENT_DEFAULT_PRIORITY_CLASS:            'fleet-agent-default-priority-class',
+  FLEET_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET:   'fleet-agent-default-pod-disruption-budget',
   KEV2_OPERATORS:                                'kev2-operators',
   /**
    * Dynamic Content settings
@@ -178,8 +186,11 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
     ruleSet: [{ name: 'minValue', factoryArg: 1 }]
   },
   [SETTING.IMPORTED_CLUSTER_VERSION_MANAGEMENT]:           { kind: 'boolean' },
-  [SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS]:          { kind: 'json' },
-  [SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET]: { kind: 'json' }
+  // 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 }
 
 };
 
@@ -195,6 +206,8 @@ export const PROVISIONING_SETTINGS = [
   SETTING.IMPORTED_CLUSTER_VERSION_MANAGEMENT,
   SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS,
   SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET,
+  SETTING.FLEET_AGENT_DEFAULT_PRIORITY_CLASS,
+  SETTING.FLEET_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET,
 ];
 
 /**

package/config/table-headers.js

@@ -1,4 +1,4 @@
-import { CATTLE_PUBLIC_ENDPOINTS, UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 import { NODE as NODE_TYPE, NAMESPACE as NAMESPACE_TYPE } from '@shell/config/types';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
@@ -55,6 +55,11 @@ export const NAME = {
   canBeVariable: true,
 };
 
+export const PROJECT_NAMESPACES_NAME = {
+  ...NAME,
+  search: ['nameDisplay', 'projectNameDisplay'],
+};
+
 export const LOGGING_OUTPUT_PROVIDERS = {
   name:      'logging-output-providers',
   labelKey:  'tableHeaders.loggingOutputProviders',
@@ -385,27 +390,17 @@ export const SECRET_DATA = {
   formatter: 'SecretData'
 };
 
-export const SECRET_CLONE = {
-  name:      'secret-clone',
-  labelKey:  'tableHeaders.secret.project-clone',
-  tooltip:   'tableHeaders.secret.project-clone-tooltip',
-  value:     'isProjectSecretCopy',
-  sort:      `metadata.annotations."${ UI_PROJECT_SECRET_COPY }"`,
-  search:    false,
-  formatter: 'Checked',
-};
-
-export const SECRET_PROJECT_SCOPED = {
-  name:     'secret-project-scoped',
-  labelKey: 'tableHeaders.secret.project-scoped',
-  tooltip:  'tableHeaders.secret.project-scoped-tooltip',
-  value:    'clusterAndProjectLabel',
+export const SECRET_ORIGIN = {
+  name:      'secret-origin',
+  labelKey:  'tableHeaders.secret.origin',
+  tooltip:   'tableHeaders.secret.originTooltip',
+  formatter: 'SecretOrigin',
   // Cannot _sort_ upstream secrets by if they are cluster scoped
   // https://github.com/rancher/rancher/issues/51001
   // metadata.labels[management.cattle.io/project-scoped-secret] - covers both cluster scoped AND clones
   // metadata.annotations[management.cattle.io/project-scoped-secret-copy]
   // sort:     [`metadata.labels[${ UI_PROJECT_SECRET }]`, `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`],
-  search:   false,
+  search:    false,
 };
 
 export const TARGET_KIND = {
@@ -1038,6 +1033,15 @@ export const SCOPE_NORMAN = {
   sort:  ['clusterId'],
 };
 
+export const NORMAN_KEY_DEPRECATION = {
+  name:        'isNormanKeyDeprecated',
+  labelKey:    'tableHeaders.isLegacy',
+  value:       (row) => row.isDeprecated ? 'True' : undefined,
+  sort:        'isDeprecated',
+  align:       'left',
+  dashIfEmpty: true,
+};
+
 export const EXPIRES = {
   name:      'expires',
   value:     'expiresAt',

package/config/types.js

@@ -269,6 +269,7 @@ export const EXT = {
   GROUP_MEMBERSHIP_REFRESH_REQUESTS: 'ext.cattle.io.groupmembershiprefreshrequest',
   PASSWORD_CHANGE_REQUESTS:          'ext.cattle.io.passwordchangerequest',
   KUBECONFIG:                        'ext.cattle.io.kubeconfig',
+  TOKEN:                             'ext.cattle.io.token',
 };
 
 export const CAPI = {
@@ -390,21 +391,35 @@ export const ADDRESSES = {
 export const DEFAULT_WORKSPACE = 'fleet-default';
 
 export const AUTH_TYPE = {
-  _NONE:  '_none',
-  _BASIC: '_basic',
-  _SSH:   '_ssh',
-  _S3:    '_S3',
-  _RKE:   '_RKE',
+  _NONE:              '_none',
+  _BASIC:             '_basic',
+  _SSH:               '_ssh',
+  _S3:                '_S3',
+  _RKE:               '_RKE',
+  _IMAGE_PULL_SECRET: '_IPS',
 };
 
 export const LOCAL_CLUSTER = 'local';
 
 export const CLUSTER_REPO_TYPES = {
-  HELM_URL: 'helm-url',
-  GIT_REPO: 'git-repo',
-  OCI_URL:  'oci-url'
+  HELM_URL:            'helm-url',
+  GIT_REPO:            'git-repo',
+  OCI_URL:             'oci-url',
+  SUSE_APP_COLLECTION: 'suse-application-collection'
 };
 
+/**
+ * The `generateName` prefix used when creating authentication secrets
+ * for SUSE App Collection repositories.
+ */
+export const CLUSTER_REPO_APPCO_AUTH_GENERATE_NAME = 'clusterrepo-appco-auth-';
+
+/**
+ * The `generateName` prefix used when creating authentication secrets
+ * for standard repositories.
+ */
+export const CLUSTER_REPO_AUTH_GENERATE_NAME = 'clusterrepo-auth-';
+
 export const ZERO_TIME = '0001-01-01T00:00:00Z';
 
 export const DEFAULT_GRAFANA_STORAGE_SIZE = '10Gi';

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

@@ -6,7 +6,7 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
 import { MANAGEMENT, FLEET, SCHEMA } from '@shell/config/types';
 import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
-import { allHash } from 'utils/promise';
+import { allHash } from '@shell/utils/promise';
 
 export default {
   name: 'FleetDetailCluster',

package/detail/workload/index.vue

@@ -2,7 +2,7 @@
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { NAMESPACE as NAMESPACE_COL } from '@shell/config/table-headers';
 import {
-  POD, WORKLOAD_TYPES, SERVICE, INGRESS, NODE, NAMESPACE, WORKLOAD_TYPE_TO_KIND_MAPPING, METRICS_SUPPORTED_KINDS
+  POD, WORKLOAD_TYPES, SERVICE, INGRESS, NAMESPACE, WORKLOAD_TYPE_TO_KIND_MAPPING, METRICS_SUPPORTED_KINDS
 } from '@shell/config/types';
 import ResourceTable from '@shell/components/ResourceTable';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -13,6 +13,7 @@ import DashboardMetrics from '@shell/components/DashboardMetrics';
 import { mapGetters } from 'vuex';
 import { allDashboardsExist } from '@shell/utils/grafana';
 import { PROJECT } from '@shell/config/labels-annotations';
+import { fetchNodesForServiceTargets } from '@shell/models/service';
 
 const WORKLOAD_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-workload-pods-1/rancher-workload-pods?orgId=1';
 const WORKLOAD_METRICS_SUMMARY_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-workload-1/rancher-workload?orgId=1';
@@ -29,28 +30,23 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
-    let hasNodes = false;
-
-    try {
-      const inStore = this.$store.getters['currentStore']();
-      const schema = this.$store.getters[`${ inStore }/schemaFor`](NODE);
-
-      if (schema) {
-        hasNodes = true;
-      }
-    } catch {}
-
     const hash = {
       allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }),
-      // Nodes should be fetched because they may be referenced in the target
-      // column of a service list item.
-      allNodes:     hasNodes ? this.$store.dispatch('cluster/findAll', { type: NODE }) : []
+      // Nodes should be fetched because they may be referenced in the target column of a service list item.
+      nodes:        fetchNodesForServiceTargets({
+        $store:  this.$store,
+        inStore: this.$store.getters['currentStore']()
+      })
     };
 
     if (this.podSchema) {
       hash.pods = this.value.fetchPods();
     }
 
+    if (this.serviceSchema) {
+      hash.servicesInNamespace = this.$store.dispatch('cluster/findAll', { type: SERVICE, opt: { namespaced: this.value.metadata.namespace } });
+    }
+
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
       hash.jobs = this.value.matchingJobs();
     }
@@ -88,7 +84,6 @@ export default {
     return {
       allIngresses:                    [],
       matchingIngresses:               [],
-      allNodes:                        [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,
       POD_PROJECT_METRICS_DETAIL_URL:  '',

package/dialog/DeactivateDriverDialog.vue

@@ -55,7 +55,7 @@ export default {
       try {
         await Promise.all(this.drivers.map(
           (driver) => this.$store.dispatch('rancher/request', {
-            url:    `v3/${ this.driverType }/${ escape(driver.id) }?action=deactivate`,
+            url:    `v3/${ this.driverType }/${ encodeURIComponent(driver.id) }?action=deactivate`,
             method: 'POST'
           })
         ));

package/dialog/FeatureFlagListDialog.vue

@@ -134,7 +134,7 @@ export default {
             this.waiting = false;
             this.close();
 
-            await this.$store.dispatch('management/findAll', { type: this.resource, opt: { force: true } });
+            await this.$store.dispatch('management/findAll', { type: this.update.type, opt: { force: true } });
           }
         } catch (e) {}
 

package/dialog/Ipv6NetworkingDialog.vue

@@ -0,0 +1,156 @@
+<script>
+import AsyncButton from '@shell/components/AsyncButton';
+import { Card } from '@components/Card';
+
+export default {
+  emits: ['close'],
+
+  components: {
+    Card,
+    AsyncButton,
+  },
+  props: {
+    warnings: {
+      type:    Array,
+      default: () => []
+    },
+
+    isK3s: {
+      type:    Boolean,
+      default: false
+    },
+
+    /**
+     * Callback to identify response of the prompt
+     */
+    confirm: {
+      type:    Function,
+      default: () => { }
+    },
+
+  },
+
+  methods: {
+    close() {
+      this.confirm(false);
+      this.$emit('close');
+    },
+
+    async apply(buttonDone) {
+      this.applyErrors = [];
+      try {
+        this.confirm(true);
+        this.$emit('close');
+      } catch (err) {
+        console.error(err); // eslint-disable-line
+        buttonDone(false);
+      }
+    }
+  },
+};
+</script>
+
+<template>
+  <Card
+    class="prompt-restore"
+    :show-highlight-border="false"
+    data-testid="ipv6-dialog"
+  >
+    <template #title>
+      <h4
+        v-clean-html="t('cluster.rke2.modal.ipv6Warning.title')"
+        class="text-default-text"
+      />
+    </template>
+
+    <template #body>
+      <div
+        class="pl-10 pr-10"
+        style="min-height: 50px;"
+      >
+        <t
+          k="cluster.rke2.modal.ipv6Warning.body"
+          raw
+        />
+        <t
+          :k="isK3s ? 'cluster.rke2.modal.ipv6Warning.readMoreK3s' : 'cluster.rke2.modal.ipv6Warning.readMoreRke2'"
+          raw
+        />
+        <div class="list-pretext">
+          <t
+            k="cluster.rke2.modal.ipv6Warning.verifySettings"
+            raw
+          />
+        </div>
+        <ul
+          data-testid="ipv6-dialog-reasons"
+          class="warning-list"
+        >
+          <li
+            v-for="warning in warnings"
+            :key="warning"
+          >
+            <t
+              :k="warning"
+              raw
+            />
+          </li>
+        </ul>
+      </div>
+    </template>
+
+    <template #actions>
+      <div class="bottom">
+        <div
+
+          class="buttons"
+        >
+          <button
+            data-testid="ipv6-dialog-cancel"
+            class="btn role-secondary mr-10"
+            @click="close"
+          >
+            {{ t('generic.cancel') }}
+          </button>
+
+          <AsyncButton
+            data-testid="ipv6-dialog-continue"
+            mode="continue"
+            action-color="role-primary"
+            @click="apply"
+          />
+        </div>
+      </div>
+    </template>
+  </Card>
+</template>
+<style lang='scss' scoped>
+  .prompt-restore {
+    margin: 0;
+  }
+  .bottom {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    .banner {
+      margin-top: 0
+    }
+    .buttons {
+      display: flex;
+      justify-content: flex-end;
+      width: 100%;
+    }
+  }
+
+.list-pretext {
+    margin-top: 16px;
+}
+
+.warning-list {
+    padding-inline-start: 24px;
+
+    & li {
+        margin-bottom: 8px;
+    }
+}
+</style>

package/dialog/ScalePoolDownDialog.vue

@@ -26,7 +26,7 @@ export default {
     };
   },
   computed: {
-    machinenName() {
+    machineName() {
       const name = this.resources.length > 0 ? this.resources[0]?.id?.split('/')[1] : '';
 
       return name;
@@ -81,7 +81,7 @@ export default {
     <template #body>
       <div class="pl-10 pr-10">
         <div>
-          {{ t('promptRemove.attemptingToRemove', { type }) }} <b>{{ machinenName }}</b>
+          {{ t('promptScaleMachineDown.attemptingToScaleDown', { type }) }} <b>{{ machineName }}</b>
         </div>
         <div>
           <Checkbox

package/edit/__tests__/fleet.cattle.io.gitrepo.test.ts

@@ -244,7 +244,7 @@ describe('view: fleet.cattle.io.gitrepo, GitHub password banner - should', () =>
     const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }, { spec: { repo: 'https://github.com/rancher/fleet-examples' } }));
 
     // Check computed properties
-    expect(wrapper.vm.isGitHubDotComRepository).toBeTruthy();
+    expect(wrapper.vm.isGithubDotComRepository).toBeTruthy();
 
     // Set basic auth selection in tempCachedValues
     await wrapper.setData({ tempCachedValues: { clientSecretName: { selected: AUTH_TYPE._BASIC } } });

package/edit/__tests__/fleet.cattle.io.helmop.test.ts

@@ -264,6 +264,7 @@ describe.each([
 
     wrapper.vm.pollingInterval = inputValue;
     wrapper.vm.updatePollingInterval(inputValue);
+    wrapper.vm.validatePollingInterval();
 
     await wrapper.vm.$nextTick();