diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml index 0638626131..608b9ee1a3 100644 --- a/shell/assets/translations/en-us.yaml +++ b/shell/assets/translations/en-us.yaml @@ -3942,10 +3942,20 @@ plugins: title: Remove the Rancher Extensions Custom Resource Definition prompt: There are one or more extensions installed - removing the CRD will require you to manually reinstall these extensions if you subsequently re-enable extensions support. podSecurityAdmission: - label: Pod Security Admission + name: Pod Security Admission description: Define the admission control mode you want to use for the pod security banner: modifications: 'Note: Modifying a Pod Security Admission Configuration Template will not affect any downstream cluster that references it until there is a cluster update' + labels: + enforce: Enforce + audit: Audit + warn: Warn + usernames: Usernames + runtimeClasses: RuntimeClasses + namespaces: Namespaces + privileged: privileged + baseline: baseline + restricted: restricted version: placeholder: 'Version (default: latest)' exemptions: @@ -6213,6 +6223,11 @@ typeLabel: one { Workspace } other { Workspaces } } + management.cattle.io.podsecurityadmissionconfigurationtemplate: |- + {count, plural, + one { Pod Security Admission } + other { Pod Security Admissions } + } policy.poddisruptionbudget: |- {count, plural, one { Pod Disruption Budget } diff --git a/shell/components/DetailTop.vue b/shell/components/DetailTop.vue index 780f780efb..907e71000f 100644 --- a/shell/components/DetailTop.vue +++ b/shell/components/DetailTop.vue @@ -90,7 +90,7 @@ export default { }, labels() { - if (this.showAllLabels || !this.showFilteredSystemLabels) { + if (!this.showFilteredSystemLabels) { return this.value?.labels || {}; } @@ -249,6 +249,7 @@ export default { v-tooltip="prop ? `${key} : ${prop}` : key" > {{ internalTooltips[key] ? internalTooltips[key] : key }} + : {{ key }} {{ prop ? `${key} : ${prop}` : key }} diff --git a/shell/components/ExplorerProjectsNamespaces.vue b/shell/components/ExplorerProjectsNamespaces.vue index 06c23843c6..56c2933490 100644 --- a/shell/components/ExplorerProjectsNamespaces.vue +++ b/shell/components/ExplorerProjectsNamespaces.vue @@ -235,13 +235,17 @@ export default { } }, methods: { - getPSA(row) { + /** + * Get PSA HTML to be displayed in the tooltips + */ + getPsaTooltip(row) { const dictionary = row.psaTooltipsDescription; const list = Object.values(dictionary) .sort() .map(text => `
${ this.t('podSecurityAdmission.name') }:
`; - return `