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

package/assets/styles/global/_button.scss

@@ -8,7 +8,7 @@ $btn-sm-height: 30px;
 // -----------------------------------------------------------------------------
 .btn,
 button,
-[class^='btn-'] {
+[class^='btn-']:not(.btn-group) {
   align-items: center;
   display: inline-flex;
   text-align: center;

package/assets/translations/en-us.yaml

@@ -72,6 +72,7 @@ generic:
       warning: Warning
       error: Error
   ok: OK
+  or: or
   other: |-
     {count, plural,
     one  {other}
@@ -1007,6 +1008,7 @@ asyncButton:
     action: Snapshot Now
     waiting: Snapshot Initiated…
     success: Snapshot Creating
+    day2OpsNotEnabled: Day 2 Operations are not enabled for this cluster
   timing:
     action: Generate Response Times
     waiting: Generating…
@@ -1138,9 +1140,15 @@ catalog:
       label: Container Registry
       tooltip: Container images are pulled from the Cluster Container Registry or, failing that, the System Container Registry Setting. To change this default behavior enter or update the registry here
       custom:
-        checkBoxLabel: Container Registry for Rancher System Container Images
+        checkBoxLabel: Override the Default Container Registry
         inputLabel: Container Registry
         placeholder: Registry domain and ports, ex. registry.io:5000
+      pullSecret:
+        skipOption: Do not use image pull secrets
+        defaultLabel: 'Use default pull secret ({name})'
+        defaultLabelGeneric: Use default pull secrets
+        existingValuesBanner: '{secrets} are configured as image pull secrets in the chart values. To modify them, edit the values YAML directly.'
+        defaultSecretsBanner: '{secrets} are configured as default pull secrets. Select or create an image pull secret here to override the default.'
     header:
       charts: Charts
     info:
@@ -2680,6 +2688,7 @@ cluster:
         other {A snapshot has been requested for {count} clusters}
       }
     groupLabel: Location
+    predatesImportTooltip: The restore action is not currently supported for this snapshot as it predates the import into Rancher.
     failed: "Snapshot from {time} failed"
     rke1:
       local: local
@@ -2744,6 +2753,7 @@ cluster:
     upgrade: Upgrade Strategy
     registration: Registration
     nodePools: Node Pools
+    operations: Operations
   rotateCertificates:
     label: Rotate Certificates
     modalTitle: Rotate Cluster Certificates
@@ -2984,10 +2994,10 @@ fleet:
     title: Continuous Delivery Settings
     info: Rancher will reboot Fleet agent and controller on settings change.
     apply: Apply changes
-    noPermissions: You have no permissions to modify Fleet Settings
+    noPermissions: You have no permissions to modify Continuous Delivery Settings
     parseError: 'Cannot parse values from "{ path }" in "{ id }" ConfigMap'
     fields:
-      ariaLabel: Fleet {name} setting
+      ariaLabel: Continuous Delivery {name} setting
     agentTLSMode:
       label: TLS Mode
       description: "Determines whether the agent should trust CA bundles from the operating system's trust store when connecting to a management cluster."
@@ -3064,13 +3074,13 @@ fleet:
       description: 'Agent deployment settings.'
     replicas:
       label: Replicas
-      description: 'Number of replicas of Fleet pods.'
+      description: 'Number of replicas of pods.'
     annotations:
       label: Extra Annotations
-      description: 'Extra annotations passed to the Fleet pods.'
+      description: 'Extra annotations passed to the pods.'
     developer:
       label: Developer
-      description: 'Enable debug info from Fleet.'
+      description: 'Enable debug info.'
 
   tableHeaders:
     applicationType: Type
@@ -3081,7 +3091,7 @@ fleet:
   dashboard:
     pageTitle: Continuous Delivery Dashboard
     menuLabel: Dashboard
-    welcome: Welcome to Fleet Continuous Delivery
+    welcome: Welcome to Continuous Delivery
     gitOpsScale: GitOps at scale.
     learnMore: Learn More.
     learnMoreLink: https://fleet.rancher.io
@@ -3204,7 +3214,7 @@ fleet:
     groupBy: Group By Type
     subTypes:
       fleet.cattle.io.gitrepo:
-        description: GitRepo describes a git repository that is watched by Fleet. The resource contains the necessary information to deploy the repo, or parts of it, to target clusters.
+        description: GitRepo describes a git repository that is watched. The resource contains the necessary information to deploy the repo, or parts of it, to target clusters.
       fleet.cattle.io.helmop:
         description: HelmOp is a simplified way of creating bundles by directly pointing to a Helm repository or to an OCI registry, without needing to set up a git repository.
       suse-application-collection:
@@ -6025,6 +6035,13 @@ promptRestore:
   fromS3: Restore from S3
   label: Snapshot
   placeholder: Select a snapshot to restore
+  error:
+    unableToResolveTargetCluster: Unable to resolve target cluster for snapshot restore
+  restoreMode:
+    label: Restore Type
+    onlyEtcd: Only etcd
+    kubernetesVersionAndEtcd: Kubernetes version and etcd
+    clusterConfigKubernetesVersionAndEtcd: Cluster config, Kubernetes version and etcd
   notification:
     title: Restore Snapshot
     message: Restoring snapshot { selectedSnapshot } has started...
@@ -6048,7 +6065,9 @@ promptRotateEncryptionKey:
   title: Rotate Encryption Keys
   description: The last backup {name} was performed on {date}
   warning: Before proceeding, ensure a successful ETCD backup of the cluster has been completed.
-  error: No backup found
+  error:
+    noBackup: No backup found
+    unableToResolveTargetCluster: Unable to resolve target cluster for encryption key rotation
 
 rancherAlertingDrivers:
   msTeams: Enable Microsoft Teams
@@ -6333,6 +6352,8 @@ resourceYaml:
 
 secret:
   authentication: Authentication
+  githubApp:
+    label: GitHub App
   certificate:
     certificate: Certificate
     certificates: Certificates
@@ -6469,14 +6490,19 @@ selectOrCreateAuthSecret:
     passwordPersonalAccessToken: Password/Personal Access Token
   rke:
     info: "An RKE Auth Config secret contains the username and password concatenated and base64 encoded into the secret's 'auth' key"
+  githubApp:
+    appId: GitHub App ID
+    installationId: GitHub App Installation ID
+    privateKey: GitHub App Private Key
   namespaceGroup: "Namespace: {name}"
   chooseExisting: "Choose an existing secret:"
   createSsh: Create an SSH Key Secret
   createBasic: Create an HTTP Basic Auth Secret
   createS3: Create an S3-Compatible Auth Secret
   createRKE: Create an RKE Auth Config Secret
+  createGithubApp: Create a GitHub App Auth Secret
   createImagePullSecretBasedOnAuth: Create an Image Pull Secret based on Authentication Secret
-  createImagePullSecret: Create a new Image Pull Secret with new Username/Password
+  createImagePullSecret: Create an Image Pull Secret with a Username and Password
 
 serviceAccount:
   automount: Automount Service Account Token
@@ -7363,6 +7389,7 @@ validation:
   betweenValues: '"{key}" must be between {min} and {max}'
   noSchema: No schema found to validate
   noType: No type to validate
+  createResourceFailed: 'Failed to create resource: insufficient permissions or resource type not found'
   number:
     requiredInt: '"{key}" must be integer'
     isPositive: '"{key}" must be positive'
@@ -8966,6 +8993,7 @@ advancedSettings:
     'ingress-ip-domain': 'Wildcard DNS domain to use for automatically generated Ingress hostnames. <ingress-name>.<namespace-name>.<ip address of ingress controller> will be added to the domain.'
     'server-url': 'Default {appName} install url. Must be HTTPS. All nodes in your cluster must be able to reach this.'
     'system-default-registry': 'Private registry to be used for all Rancher System Container Images. If no value is specified, the default registry for the container runtime is used. For Docker and containerd, the default is `docker.io`.'
+    'system-default-registry-pull-secrets': 'List of image pull secrets to authenticate into registry from which Rancher System Container Images are pulled. By default, these secrets will be copied into each Rancher chart namespace. Secrets must be in the `cattle-system` namespace. The first valid secret listed here will be used.'
     'ui-dashboard-index': 'HTML index location for the {appName} UI.'
     'ui-offline-preferred': 'Controls whether UI assets are served locally by the server container or from the remote URL defined in the ui-dashboard-index setting. The `Dynamic` option will use local assets in production builds of {appName}.'
     'ui-pl': 'Private-Label company name.'
@@ -8988,6 +9016,7 @@ advancedSettings:
     'k3s-based-upgrader-uninstall-concurrency': Defines the maximum number of clusters in which Rancher can concurrently uninstall the legacy `rancher-k3s-upgrader` or `rancher-rke2-upgrader` app from imported or node-driver K3s or RKE2 clusters.
     'system-agent-upgrader-install-concurrency': Defines the maximum number of clusters in which Rancher can concurrently install the resources required for upgrading system-agent.
     'imported-cluster-version-management': Enables version management for imported RKE2/K3s clusters, and the local cluster if it is an RKE2/K3s cluster. The per-cluster version management setting overrides this global setting at the cluster level. For existing clusters where the cluster-level version management is set to 'system-default', changing this flag will trigger a redeployment of the cluster agent during the next reconciliation (by default every 5 minutes, or as soon as the cluster is edited, whichever comes first).
+    'imported-cluster-day2-ops-enabled': Controls whether newly imported RKE2/K3s clusters will have day 2 operations (etcd snapshots, restores, encryption key rotations) enabled by default. This does not affect previously imported clusters.
   warnings:
     'agent-tls-mode': 'Changing this setting will cause all agents to be redeployed.'
   editHelp:

package/components/ActionDropdownShell.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { RcDropdown, RcDropdownTrigger, RcDropdownItem } from '@components/RcDropdown';
+import { ButtonSize } from '@components/RcButton';
 type HiddenAction = {
   action: string;
   enabled: boolean;
@@ -11,11 +12,12 @@ type HiddenAction = {
   anyEnabled: boolean;
 }
 
-defineProps<{
+withDefaults(defineProps<{
   disabled: boolean,
   hiddenActions: HiddenAction[],
   actionTooltip: unknown,
-}>();
+  size?: ButtonSize,
+}>(), { size: 'large' });
 
 const emit = defineEmits(['click', 'mouseover', 'mouseleave']);
 
@@ -35,7 +37,7 @@ const setBulkActionOfInterest = (act: HiddenAction | null, event: 'mouseover' |
   >
     <rc-dropdown-trigger
       class="bulk-actions-dropdown"
-      size="large"
+      :size="size"
       :disabled="disabled"
     >
       <template #before>

package/components/ButtonGroup.vue

@@ -31,11 +31,25 @@ export default {
     disabled: {
       type:    Boolean,
       default: false,
-    }
+    },
+
+    size: {
+      type:      String,
+      default:   'large',
+      validator: (value) => ['small', 'medium', 'large'].includes(value),
+    },
 
   },
 
   computed: {
+    sizeClass() {
+      return {
+        small:  'btn-sm',
+        medium: 'btn-md',
+        large:  null,
+      }[this.size];
+    },
+
     optionObjects() {
       const value = this.value;
 
@@ -52,6 +66,7 @@ export default {
 
         out.class = {
           btn:                  true,
+          [this.sizeClass]:     !!this.sizeClass,
           [this.inactiveClass]: !active,
           [this.activeClass]:   active,
         };
@@ -122,3 +137,13 @@ export default {
     </button>
   </div>
 </template>
+
+<style lang="scss" scoped>
+.btn-group {
+  .btn-md {
+    padding: 0 12px;
+    min-height: 32px;
+    line-height: 32px;
+  }
+}
+</style>

package/components/CruResource.vue

@@ -127,6 +127,12 @@ export default {
       default: () => []
     },
 
+    // Used to be called before going to the next step in the wizard.
+    beforeNext: {
+      type:    Function,
+      default: null
+    },
+
     stepsOptions: {
       type:    Object,
       default: () => ({ editFirstStep: true })
@@ -200,6 +206,7 @@ export default {
       tocContainerHeight:                 0,
       mainLayoutEl:                       null,
       throttledComputeTocContainerHeight: null,
+      nextValidating:                     false,
       /**
        * Initialised on demand (given that it needs to make a request to fetch schema definition)
        */
@@ -488,6 +495,47 @@ export default {
       return slot !== 'default' && typeof this.$slots[slot] === 'function';
     },
 
+    async wizardBeforeGoToStep(fromStep, toStep) {
+      if (!this.beforeNext) {
+        return;
+      }
+
+      const fromIdx = this.steps.findIndex((s) => s.name === fromStep.name);
+      const toIdx = this.steps.findIndex((s) => s.name === toStep.name);
+
+      if (toIdx <= fromIdx) {
+        return;
+      }
+
+      try {
+        await this.beforeNext(fromStep);
+        this.$emit('error', []);
+      } catch (err) {
+        this.$emit('error', exceptionToErrorsArray(err));
+        throw err;
+      }
+    },
+
+    async handleNext(nextFn, activeStep) {
+      if (!this.beforeNext) {
+        nextFn();
+
+        return;
+      }
+
+      this.nextValidating = true;
+
+      try {
+        await this.beforeNext(activeStep);
+        this.$emit('error', []);
+        nextFn();
+      } catch (err) {
+        this.$emit('error', exceptionToErrorsArray(err));
+      } finally {
+        this.nextValidating = false;
+      }
+    },
+
     formatError(err) {
       if ( typeof err === 'string') {
         return err;
@@ -751,6 +799,7 @@ export default {
             :edit-first-step="stepsOptions.editFirstStep"
             :errors="errors"
             :finish-mode="finishMode"
+            :before-go-to-step="wizardBeforeGoToStep"
             class="wizard"
             @error="e=>errors = e"
           >
@@ -834,10 +883,10 @@ export default {
                     name="next"
                   >
                     <button
-                      :disabled="!canNext"
+                      :disabled="!canNext || nextValidating"
                       type="button"
                       class="btn role-primary"
-                      @click="next()"
+                      @click="handleNext(next, activeStep)"
                     >
                       <t k="wizard.next" />
                     </button>

package/components/PromptRestore.vue

@@ -7,16 +7,15 @@ import Date from '@shell/components/formatter/Date.vue';
 import RadioGroup from '@components/Form/Radio/RadioGroup.vue';
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
 import { exceptionToErrorsArray } from '@shell/utils/error';
-import { CAPI, SNAPSHOT } from '@shell/config/types';
+import { CAPI, SNAPSHOT, OPERATION, MANAGEMENT } from '@shell/config/types';
 import { set } from '@shell/utils/object';
 import ChildHook, { BEFORE_SAVE_HOOKS } from '@shell/mixins/child-hook';
 import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
 import { escapeHtml } from '@shell/utils/string';
 import day from 'dayjs';
 import { sortBy } from '@shell/utils/sort';
-import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 import AppModal from '@shell/components/AppModal.vue';
-
+import { createOperationCR } from '@shell/utils/operation-cr';
 export default {
   components: {
     Card,
@@ -66,8 +65,41 @@ export default {
       return !!this.snapshot;
     },
 
-    isRke2() {
-      return !!this.snapshot?.rke2;
+    targetCluster() {
+      if (this.isCluster) {
+        return this.toRestore?.[0] || null;
+      }
+
+      if (this.snapshot?.cluster) {
+        return this.snapshot.cluster;
+      }
+
+      const snapshotClusterName = this.snapshot?.spec?.clusterName || this.snapshot?.clusterName;
+      const snapshotClusterId = this.snapshot?.clusterId || (snapshotClusterName ? `${ this.snapshot?.metadata?.namespace }/${ snapshotClusterName }` : null);
+
+      if (!snapshotClusterId) {
+        return null;
+      }
+
+      return this.$store.getters['management/byId'](CAPI.RANCHER_CLUSTER, snapshotClusterId);
+    },
+
+    targetMgmtCluster() {
+      if (this.targetCluster?.mgmt) {
+        return this.targetCluster.mgmt;
+      }
+
+      const mgmtClusterId = this.snapshot?.spec?.clusterName;
+
+      if (!mgmtClusterId) {
+        return null;
+      }
+
+      return this.$store.getters['management/byId'](MANAGEMENT.CLUSTER, mgmtClusterId);
+    },
+
+    isImported() {
+      return !!(this.targetCluster?.isImported || this.targetMgmtCluster?.isImported);
     },
 
     clusterSnapshots() {
@@ -77,6 +109,13 @@ export default {
         return [];
       }
     },
+    restoreModeLabels() {
+      return [
+        this.t('promptRestore.restoreMode.onlyEtcd'),
+        this.t('promptRestore.restoreMode.kubernetesVersionAndEtcd'),
+        this.t('promptRestore.restoreMode.clusterConfigKubernetesVersionAndEtcd')
+      ];
+    },
     restoreModeOptions() {
       return ['none', 'kubernetesVersion', 'all'];
     }
@@ -112,7 +151,7 @@ export default {
       const promise = this.$store.dispatch('management/findAll', { type: SNAPSHOT }).then((snapshots) => {
         const toRestoreClusterName = cluster?.clusterName || cluster?.metadata?.name;
 
-        return snapshots.filter((s) => s?.snapshotFile?.status === STATES_ENUM.SUCCESSFUL && s.clusterName === toRestoreClusterName
+        return snapshots.filter((s) => s?.restoreEnabled && s.clusterName === toRestoreClusterName
         );
       });
 
@@ -143,19 +182,41 @@ export default {
 
     async apply(buttonDone) {
       try {
-        const cluster = this.$store.getters['management/byId'](CAPI.RANCHER_CLUSTER, this.snapshot.clusterId);
+        const cluster = this.targetCluster;
+        const mgmtCluster = cluster?.mgmt || this.targetMgmtCluster;
 
-        await this.applyHooks(BEFORE_SAVE_HOOKS);
-
-        const now = cluster.spec?.rkeConfig?.etcdSnapshotRestore?.generation || 0;
+        const isImportedWithDayTwoOps = cluster?.isImportedWithDayTwoOps || mgmtCluster?.isDayTwoOpsEnabled;
 
-        set(cluster, 'spec.rkeConfig.etcdSnapshotRestore', {
-          generation:       now + 1,
-          name:             this.snapshot.name,
-          restoreRKEConfig: this.restoreMode,
-        });
+        await this.applyHooks(BEFORE_SAVE_HOOKS);
 
-        await cluster.save();
+        // For imported clusters with day 2 ops enabled, create an operation CR
+        if (isImportedWithDayTwoOps) {
+          if (!mgmtCluster) {
+            throw new Error(this.t('promptRestore.error.unableToResolveTargetCluster'));
+          }
+          const namespace = mgmtCluster?.id;
+          const safePrefix = mgmtCluster?.id;
+          const spec = {
+            clusterRef: {
+              apiVersion: 'management.cattle.io/v3',
+              kind:       'Cluster',
+              name:       mgmtCluster?.id,
+            },
+            args: { name: this.snapshot?.snapshotFile?.name },
+          };
+
+          createOperationCR(this.$store.dispatch, OPERATION.ETCD_SNAPSHOT_RESTORE, spec, namespace, safePrefix);
+        } else {
+          const now = cluster.spec?.rkeConfig?.etcdSnapshotRestore?.generation || 0;
+
+          set(cluster, 'spec.rkeConfig.etcdSnapshotRestore', {
+            generation:       now + 1,
+            name:             this.snapshot.name,
+            restoreRKEConfig: this.restoreMode,
+          });
+
+          await cluster.save();
+        }
 
         this.$store.dispatch('growl/success', {
           title:   this.t('promptRestore.notification.title'),
@@ -233,18 +294,25 @@ export default {
                 />
               </p>
             </div>
-            <div class="spacer" />
-            <RadioGroup
-              v-model:value="restoreMode"
-              name="restoreMode"
-              label="Restore Type"
-              :labels="['Only etcd', 'Kubernetes version and etcd', 'Cluster config, Kubernetes version and etcd']"
-              :options="restoreModeOptions"
-            />
+            <div v-if="!isImported">
+              <div class="spacer" />
+              <RadioGroup
+                v-model:value="restoreMode"
+                name="restoreMode"
+                :label="t('promptRestore.restoreMode.label')"
+                :labels="restoreModeLabels"
+                :options="restoreModeOptions"
+              />
+            </div>
           </form>
         </div>
       </template>
-
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        color="error"
+        :label="err"
+      />
       <template #actions>
         <div class="dialog-actions">
           <button
@@ -259,13 +327,6 @@ export default {
             :disabled="!hasSnapshot"
             @click="apply"
           />
-
-          <Banner
-            v-for="(err, i) in errors"
-            :key="i"
-            color="error"
-            :label="err"
-          />
         </div>
       </template>
     </Card>

package/components/Questions/index.vue

@@ -474,6 +474,7 @@ export default {
             :value="get(value, q.variable)"
             :disabled="disabled"
             :chart-name="chartName"
+            :mode="mode"
             @update:value="update(q.variable, $event)"
           />
         </div>

package/components/ResourceTable.vue

@@ -746,6 +746,7 @@ export default {
       <ButtonGroup
         v-model:value="group"
         :options="_groupOptions"
+        size="medium"
       />
     </template>
 

package/components/SortableTable/index.vue

@@ -1125,7 +1125,6 @@ export default {
                 v-clean-tooltip="actionTooltip"
                 type="button"
                 variant="primary"
-                size="large"
                 :class="{[bulkActionClass]:true}"
                 :disabled="!act.enabled"
                 :data-testid="componentTestid + '-' + act.action"
@@ -1146,6 +1145,7 @@ export default {
                   :disabled="!selectedRows.length"
                   :hidden-actions="hiddenActions"
                   :action-tooltip="actionTooltip"
+                  size="medium"
                   @click="applyTableAction"
                   @mouseover="setBulkActionOfInterest"
                   @mouseleave="setBulkActionOfInterest"
@@ -1158,10 +1158,11 @@ export default {
                   :disable-button="!selectedRows.length"
                   size="sm"
                 >
-                  <template #button-content>
+                  <template #button-content="{ buttonSize }">
                     <button
                       ref="actionDropDown"
                       class="btn bg-primary mr-0"
+                      :class="buttonSize"
                       :disabled="!selectedRows.length"
                     >
                       <i class="icon icon-gear" />
@@ -1874,7 +1875,7 @@ export default {
   }
 
   .search-box {
-    height: 40px;
+    height: 32px;
     margin-left: 10px;
     min-width: 180px;
   }

package/components/Wizard.vue

@@ -124,6 +124,11 @@ export default {
     errors: {
       type:    Array,
       default: null,
+    },
+
+    beforeGoToStep: {
+      type:    Function,
+      default: null
     }
   },
 
@@ -217,7 +222,7 @@ export default {
   },
 
   methods: {
-    goToStep(number, fromNav) {
+    async goToStep(number, fromNav) {
       if (number < 1) {
         return;
       }
@@ -233,6 +238,14 @@ export default {
         return;
       }
 
+      if (this.beforeGoToStep && fromNav) {
+        try {
+          await this.beforeGoToStep(this.activeStep, selected);
+        } catch {
+          return;
+        }
+      }
+
       this.activeStep = selected;
 
       this.$emit('next', { step: selected });