rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fleet change default OCI storage sec annotation; improve tooltip 

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
This commit is contained in:
Francesco Torchia 2025-06-03 11:42:24 +02:00
parent ea1f6606f5
commit e50e54d8eb
No known key found for this signature in database
GPG Key ID: E6D011B7415D4393
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts
View File

@ -454,7 +454,7 @@ describe('Workspaces', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] },
expect(response?.statusCode).to.eq(200);
expect(response?.body.id).to.equal(customWorkspace);
expect(response?.body.annotations).to.have.property('field.cattle.io/description', `${ customWorkspace }-desc-edit`);
expect(response?.body.annotations).to.have.property('default-oci-registry', ociSecretName); // TODO add real annotation
expect(response?.body.annotations).to.have.property('ui-default-oci-registry', ociSecretName);
});
fleetWorkspacesListPage.waitForPage();
});

2
shell/assets/translations/en-us.yaml
View File

@ -2627,7 +2627,7 @@ fleet:
ociStorageSecret:
title: OCI Registry
label: OCI Storage Secret
tooltip: If 'None' is selected, Fleet will use the most recent OCI storage secret defined as default in {workspace} workspace.<br>Every changes of the selected OCI storage secret will not be applied until next Git Repo update.
tooltip: If 'None' is selected, Fleet will use the 'ocistorage' fallback secret when existing in current workspace.<br>Every changes of the selected OCI storage secret will not be applied until next Git Repo update.
options:
chooseExisting: "Choose a secret:"
chooseCustom: "Choose a custom secret:"

2
shell/config/labels-annotations.js
View File

@ -127,7 +127,7 @@ export const FLEET = {
CLUSTER: 'fleet.cattle.io/cluster',
CREATED_BY_USER_ID: 'fleet.cattle.io/created-by-user-id',
CREATED_BY_USER_NAME: 'fleet.cattle.io/created-by-display-name',
OCI_STORAGE_SECRET_DEFAULT: 'default-oci-registry', // TODO add real id
OCI_STORAGE_SECRET_DEFAULT: 'ui-default-oci-registry',
OCI_STORAGE_SECRET_GENERATED: 'generated' // TODO add real id
};