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

Merge pull request #4967 from mantis-toboggan-md/psa-rke1 

update rke1 psp banner
This commit is contained in:
Nancy 2023-02-16 09:31:59 -07:00 committed by GitHub
parent 2781f74f54 c4c0efb776
commit 642c892cd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/shared/addon/components/cluster-driver/driver-rke/component.js
View File

@ -765,6 +765,13 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
} }
}), }),
pspInfoBanner: computed('supportsPSP', function(){
const { supportsPSP } = this;
const intl = get(this, 'intl')
return supportsPSP ? intl.t('clusterNew.psp.deprecatedInfoBanner') : intl.t('clusterNew.psp.removedInfoBanner')
}),
monitoringProvider: computed('config.monitoring', { monitoringProvider: computed('config.monitoring', {
get() { get() {
let monitoringConfig = get(this, 'config.monitoring'); let monitoringConfig = get(this, 'config.monitoring');

16
lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
View File

@ -239,14 +239,7 @@
expandAll=al.expandAll expandAll=al.expandAll
expand=(action expandFn) expand=(action expandFn)
}} }}
<div class="row">
<section>
<BannerMessage
@color="bg-info m-0"
@message={{t "clusterNew.psp.supportRemoved"}}
/>
</section>
</div>
<div class="row"> <div class="row">
<div class="col span-3"> <div class="col span-3">
<label class="acc-label"> <label class="acc-label">
@ -417,6 +410,13 @@
@message={{t "clusterNew.psp.unsupported"}} @message={{t "clusterNew.psp.unsupported"}}
/> />
</section> </section>
{{else}}
<section>
<BannerMessage
@color="bg-info m-0"
@message={{pspInfoBanner}}
/>
</section>
{{/if}} {{/if}}
{{#if PSPInClusterWarning}} {{#if PSPInClusterWarning}}
<section> <section>

5
translations/en-us.yaml
View File

@ -4477,9 +4477,10 @@ clusterNew:
none: No policies are defined none: No policies are defined
prompt: Select a Pod Security Policy... prompt: Select a Pod Security Policy...
required: A Default Pod Security Policy is required when support is enabled. required: A Default Pod Security Policy is required when support is enabled.
unsupported: Pod security policies are not supported in the version selected; please disable PSP support and consider using the built-in Pod Security Admission Controller instead. unsupported: Pod security policies are not supported in the version selected; please disable PSP support and use PodSecurity Admission instead.
deleteBeforeUpgrade: The PSP resources in this cluster will be unreachable upon upgrade; please delete them before proceeding. deleteBeforeUpgrade: The PSP resources in this cluster will be unreachable upon upgrade; please delete them before proceeding.
supportRemoved: Pod Security Policy support has been deprecated as of kubernetes version v1.21.0 and removed as of v1.25.0. deprecatedInfoBanner: Pod Security Policies are deprecated as of Kubernetes v1.21, and have been removed in Kubernetes v1.25.
removedInfoBanner: Pod Security Policies have been removed in Kubernetes v1.25, use PodSecurity Admission instead.
rancherd: rancherd:
shortLabel: RancherD shortLabel: RancherD
register: register: