From 269155b3577f40309e12fcd74e86a939d924e080 Mon Sep 17 00:00:00 2001
From: Nancy Butler <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Thu, 26 Jan 2023 10:34:20 -0700
Subject: [PATCH] fix rke1 psa config template field

---
 .../cluster-driver/driver-rke/component.js    | 35 ++-----------------
 .../cluster-driver/driver-rke/template.hbs    | 10 +++---
 translations/en-us.yaml                       |  1 -
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
index fad139d1e..66464ed6b 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
@@ -718,38 +718,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
           }),
         }));
       } else {
-        set(this, 'config.services.kubeApi.podSecurityPolicy', value );
-      }
-
-      return value;
-    }
-  }),
-
-  kubeApiPSAC: computed('config.services.kubeApi.podSecurityConfiguration', {
-    get() {
-      let psaConfig = get(this, 'config.services.kubeApi');
-
-      if (typeof  psaConfig === 'undefined') {
-        return undefined;
-      }
-
-      return get(psaConfig, 'podSecurityConfiguration');
-    },
-    set(key, value) {
-      if (!value){
-        delete this.config.services.kubeApi.podSecurityConfiguration
-      } else {
-        if (typeof get(this, 'config.services') === 'undefined') {
-          set(this, 'config.services', get(this, 'globalStore').createRecord({
-            type:     'rkeConfigServices',
-            kubeApi: get(this, 'globalStore').createRecord({
-              type:                              'kubeAPIService',
-              podSecurityConfiguration: value,
-            }),
-          }));
-        } else {
-          set(this, 'config.services.kubeApi.podSecurityConfiguration', value);
-        }
+        set(this, 'config.services', { kubeApi: { podSecurityPolicy: value } });
       }
 
       return value;
@@ -761,7 +730,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
     const intl     = get(this, 'intl');
 
     return [
-      { displayName: intl.t('clusterNew.psa.default'), },
+      { displayName: intl.t('generic.none'), },
       ...psacs]
   }),
 
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
index 8b65b57d1..b798d0b17 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
@@ -525,29 +525,29 @@
                 {{t "clusterNew.psa.label"}}
                 {{#if clusterTemplateCreate}}
                   <ClusterTemplateOverrideToggle
-                    @path="rancherKubernetesEngineConfig.services.kubeApi.podSecurityConfiguration"
-                    @configVariable={{config.services.kubeApi.podSecurityConfiguration}}
+                    @path="defaultPodSecurityAdmissionConfigurationTemplateName"
+                    @configVariable={{cluster.defaultPodSecurityAdmissionConfigurationTemplateName}}
                     @addOverride={{action "addOverride"}}
                     @questions={{model.clusterTemplateRevision.questions}}
                   />
                 {{/if}}
               </label>
               <CheckOverrideAllowed
-                @paramName="rancherKubernetesEngineConfig.services.kubeApi.podSecurityConfiguration"
+                @paramName="defaultPodSecurityAdmissionConfigurationTemplateName"
                 @applyClusterTemplate={{applyClusterTemplate}}
                 @clusterTemplateRevision={{model.clusterTemplateRevision.clusterConfig}}
                 @questions={{model.clusterTemplateRevision.questions}}
               >
                 {{#input-or-display
                     editable=notView
-                    value=config.services.kubeApi.podSecurityConfiguration
+                    value=cluster.defaultPodSecurityAdmissionConfigurationTemplateName
                 }}
                   {{new-select
                     content=psaOpts
                     optionLabelPath="displayName"
                     optionValuePath="id"
                     localizedPrompt=true
-                    value=kubeApiPSAC
+                    value=cluster.defaultPodSecurityAdmissionConfigurationTemplateName
                   }}
                 {{/input-or-display}}
               </CheckOverrideAllowed>
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 45a89bbe0..ed363ac3c 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -4472,7 +4472,6 @@ clusterNew:
     shortLabel: Open Telekom Cloud CCE
   psa:
     label: Pod Security Admission Configuration Template
-    default: Default
   psp:
     label: Default Pod Security Policy
     none: No policies are defined