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

update rke1 psp banner

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

@@ -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', {
     get() {
       let monitoringConfig = get(this, 'config.monitoring');

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

@@ -239,14 +239,7 @@
            expandAll=al.expandAll
            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="col span-3">
               <label class="acc-label">
@@ -412,11 +405,18 @@
           <div class="row">
             {{#if disablePSPWarning}}
               <section>
-              <BannerMessage
+                <BannerMessage
                   @color="bg-error m-0"
                   @message={{t "clusterNew.psp.unsupported"}}
                 />
               </section>
+            {{else}}
+              <section>
+                <BannerMessage
+                  @color="bg-info m-0"
+                  @message={{pspInfoBanner}}
+                />
+              </section>
             {{/if}}
             {{#if PSPInClusterWarning}}
               <section>

translations/en-us.yaml

@@ -4477,9 +4477,10 @@ clusterNew:
     none: No policies are defined
     prompt: Select a Pod Security Policy...
     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.
-    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:
     shortLabel: RancherD
   register: