Merge pull request #5138 from codyrancher/psp-backport

[backport v2.8.next1] Removing all references to PSP since they will no longer be supported
rancher · Apr 24, 2024 · 2657ea0 · 2657ea0
2 parents 8160702 + 8583bd9
commit 2657ea0
Show file tree

Hide file tree

Showing 80 changed files with 7 additions and 3,375 deletions.
diff --git a/app/authenticated/cluster/edit/route.js b/app/authenticated/cluster/edit/route.js
@@ -26,7 +26,6 @@ export default Route.extend({
       kontainerDrivers:           globalStore.findAll('kontainerDriver'),
       nodeTemplates:              globalStore.findAll('nodeTemplate'),
       nodeDrivers:                globalStore.findAll('nodeDriver'),
-      psps:                       globalStore.findAll('podSecurityPolicyTemplate'),
       psacs:                      globalStore.findAll('podSecurityAdmissionConfigurationTemplate'),
       roleTemplates:              get(this, 'roleTemplateService').get('allFilteredRoleTemplates'),
       users:                      globalStore.findAll('user'),

diff --git a/app/authenticated/cluster/projects/edit/route.js b/app/authenticated/cluster/projects/edit/route.js
@@ -16,7 +16,6 @@ export default Route.extend({
       project:                     store.find('project', params.project_id),
       projectRoleTemplateBindings: store.find('projectRoleTemplateBinding'),
       projects:                    store.findAll('project'),
-      psps:                        store.find('podSecurityPolicyTemplate'),
       roles:                       get(this, 'roleTemplateService').get('allFilteredRoleTemplates'),
       users:                       store.find('user', null, { forceReload: true }),
     }).then((hash) => {

diff --git a/app/authenticated/cluster/projects/new/route.js b/app/authenticated/cluster/projects/new/route.js
@@ -24,7 +24,6 @@ export default Route.extend({
       me:       get(this, 'access.principal'),
       project,
       projects: store.findAll('project'),
-      psps:     store.findAll('podSecurityPolicyTemplate'),
       roles:    get(this, 'roleTemplateService').get('allFilteredRoleTemplates'),
       users:    store.find('user', null, { forceReload: true }),
     });

diff --git a/app/authenticated/cluster/security/members/edit/route.js b/app/authenticated/cluster/security/members/edit/route.js
@@ -17,7 +17,6 @@ export default Route.extend({
           context: 'cluster'
         }
       }),
-      policies: store.find('podsecuritypolicytemplate'),
     });
   },
 });
diff --git a/app/authenticated/project/security/members/edit/route.js b/app/authenticated/project/security/members/edit/route.js
@@ -17,7 +17,6 @@ export default Route.extend({
           context: 'cluster'
         }
       }),
-      policies: store.find('podsecuritypolicytemplate'),
     });
   },
 });
diff --git a/app/components/new-edit-project/component.js b/app/components/new-edit-project/component.js
@@ -2,9 +2,7 @@ import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import layout from './template';
-import {
-  get, set, computed, observer, setProperties
-} from '@ember/object';
+import { get, set, computed, setProperties } from '@ember/object';
 import NewOrEdit from 'ui/mixins/new-or-edit';
 import ChildHook from 'shared/mixins/child-hook';
 import { isEmpty } from '@ember/utils';
@@ -24,19 +22,16 @@ export default Component.extend(NewOrEdit, ChildHook, {
   layout,
   memberConfig:                M_CONFIG,
   model:                       null,
-  podSecurityPolicyTemplateId: null,
   isNew:                       false,
 
   primaryResource:             alias('model.project'),
-  secPolicy:                   alias('model.project.defaultPodSecurityPolicyTemplateId'),
   policies:                    alias('model.policies'),
   init() {
     this._super(...arguments);
     let bindings = (get(this, 'model.project.projectRoleTemplateBindings') || []).slice();
 
     bindings = bindings.filter((x) => get(x, 'name') !== 'creator');
     set(this, 'memberArray', bindings);
-    set(this, 'podSecurityPolicyTemplateId', get(this, 'model.project.podSecurityPolicyTemplateId'));
     if (isEmpty(get(this, 'primaryResource.id'))) {
       set(this, 'isNew', true);
     }
@@ -70,9 +65,6 @@ export default Component.extend(NewOrEdit, ChildHook, {
     },
   },
 
-  pspDidChange: observer('podSecurityPolicyTemplateId', function() {
-    set(this, 'model.project.podSecurityPolicyTemplateId', get(this, 'podSecurityPolicyTemplateId'));
-  }),
   creator:         computed('editing', 'model.{me,users}', 'primaryResource.creatorId', function() {
     let cid = get(this, 'primaryResource.creatorId');
     let creator = null;
@@ -119,15 +111,6 @@ export default Component.extend(NewOrEdit, ChildHook, {
     return get(this, 'errors.length') === 0;
   },
 
-  didSave() {
-    const pr = get(this, 'primaryResource');
-    const podSecurityPolicyTemplateId = get(this, 'podSecurityPolicyTemplateId') ? get(this, 'podSecurityPolicyTemplateId') : null;
-
-    return pr.waitForCondition('BackingNamespaceCreated').then(() => this.applyHooks().then(() => {
-      pr.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId, }).then(() => pr);
-    }));
-  },
-
   doneSaving() {
     this.goBack();
   },

diff --git a/app/components/new-edit-project/template.hbs b/app/components/new-edit-project/template.hbs
@@ -17,19 +17,6 @@
     nameRequired=true
     namePlaceholder="projectsPage.name.placeholder"
   }}
-  {{#if model.project.cluster.capabilities.pspEnabled}}
-    <label class="acc-label">
-      {{t "projectsPage.psp.label"}}
-    </label>
-    {{new-select
-      content=model.psps
-      optionLabelPath="displayName"
-      optionValuePath="id"
-      prompt="generic.none"
-      localizedPrompt=true
-      value=podSecurityPolicyTemplateId
-    }}
-  {{/if}}
 </section>
 
 <div class="row">

diff --git a/app/instance-initializers/nav.js b/app/instance-initializers/nav.js
@@ -305,13 +305,6 @@ const rootNav = [
         resource:       ['roletemplate'],
         resourceScope:  'global',
       },
-      {
-        id:             'global-security-roles',
-        localizedLabel: 'nav.admin.security.podSecurityPolicies',
-        route:          'global-admin.security.policies',
-        resource:       ['podsecuritypolicytemplate'],
-        resourceScope:  'global',
-      },
       {
         id:             'global-security-authentication',
         localizedLabel: 'nav.admin.security.authentication',

diff --git a/app/models/cluster.js b/app/models/cluster.js
@@ -1000,21 +1000,19 @@ export default Resource.extend(Grafana, ResourceUsage, {
 
   clearConfigFieldsForClusterTemplate() {
     let clearedNull   = ['localClusterAuthEndpoint', 'rancherKubernetesEngineConfig', 'enableNetworkPolicy'];
-    let clearedDelete = ['defaultClusterRoleForProjectMembers', 'defaultPodSecurityPolicyTemplateId'];
+    let clearedDelete = ['defaultClusterRoleForProjectMembers'];
     let {
       localClusterAuthEndpoint,
       rancherKubernetesEngineConfig,
       enableNetworkPolicy,
       defaultClusterRoleForProjectMembers,
-      defaultPodSecurityPolicyTemplateId,
     } = this;
 
     let cachedConfig = {
       localClusterAuthEndpoint,
       rancherKubernetesEngineConfig,
       enableNetworkPolicy,
       defaultClusterRoleForProjectMembers,
-      defaultPodSecurityPolicyTemplateId,
     };
 
     // set this incase we fail to save the cluster;

diff --git a/app/models/podsecuritypolicytemplate.js b/app/models/podsecuritypolicytemplate.js
diff --git a/lib/global-admin/addon/cluster-templates/detail/route.js b/lib/global-admin/addon/cluster-templates/detail/route.js
@@ -19,7 +19,6 @@ export default Route.extend({
       return hash({
         clusterTemplate,
         clusterTemplateRevision:   revision,
-        psps:                      this.globalStore.findAll('podSecurityPolicyTemplate'),
         psacs:                      this.globalStore.findAll('podSecurityAdmissionConfigurationTemplate'),
         clusterTemplateRevisionId: revision.id,
       });

diff --git a/lib/global-admin/addon/cluster-templates/detail/template.hbs b/lib/global-admin/addon/cluster-templates/detail/template.hbs
@@ -9,5 +9,5 @@
 
 <CruClusterTemplate @clusterTemplate={{model.clusterTemplate}}
   @clusterTemplateRevision={{model.clusterTemplateRevision}}
-  @clusterTemplateRevisionId={{model.clusterTemplateRevisionId}} @psps={{model.psps}} @psacs={{model.psacs}} @mode="view"
+  @clusterTemplateRevisionId={{model.clusterTemplateRevisionId}} @psacs={{model.psacs}} @mode="view"
   @cancel={{action "cancel" }} @done={{action "done" }} />
diff --git a/lib/global-admin/addon/cluster-templates/new-revision/route.js b/lib/global-admin/addon/cluster-templates/new-revision/route.js
@@ -30,7 +30,6 @@ export default Route.extend({
           return hash({
             clusterTemplate:           template,
             clusterTemplateRevision:   tempRevision,
-            psps:                      this.globalStore.findAll('podSecurityPolicyTemplate'),
             psacs:                      this.globalStore.findAll('podSecurityAdmissionConfigurationTemplate'),
             clusterTemplateRevisionId: tempId,
           });
@@ -50,7 +49,6 @@ export default Route.extend({
           return hash({
             clusterTemplate:           template,
             clusterTemplateRevision:   tempRevision,
-            psps:                      this.globalStore.findAll('podSecurityPolicyTemplate'),
             psacs:                     this.globalStore.findAll('podSecurityAdmissionConfigurationTemplate'),
             clusterTemplateRevisionId: tempId,
           });

diff --git a/lib/global-admin/addon/cluster-templates/new-revision/template.hbs b/lib/global-admin/addon/cluster-templates/new-revision/template.hbs
@@ -6,5 +6,5 @@
 
 <CruClusterTemplate @clusterTemplate={{model.clusterTemplate}}
   @clusterTemplateRevision={{model.clusterTemplateRevision}} @updateTemplateId={{action "updateTemplateId" }}
-  @clusterTemplateRevisionId={{model.clusterTemplateRevisionId}} @psps={{model.psps}} @psacs={{model.psacs}} @mode="edit"
+  @clusterTemplateRevisionId={{model.clusterTemplateRevisionId}} @psacs={{model.psacs}} @mode="edit"
   @cancel={{action "cancel" }} @done={{action "done" }} />
diff --git a/lib/global-admin/addon/cluster-templates/new/route.js b/lib/global-admin/addon/cluster-templates/new/route.js
@@ -19,7 +19,6 @@ export default Route.extend({
           rancherKubernetesEngineConfig: this.globalStore.createRecord({ type: 'rancherKubernetesEngineConfig' })
         })
       }),
-      psps:  this.globalStore.findAll('podSecurityPolicyTemplate'),
       psacs: this.globalStore.findAll('podSecurityAdmissionConfigurationTemplate'),
       users: this.globalStore.findAll('user'),
     });

diff --git a/lib/global-admin/addon/cluster-templates/new/template.hbs b/lib/global-admin/addon/cluster-templates/new/template.hbs
@@ -5,5 +5,5 @@
 </div>
 
 <CruClusterTemplate @clusterTemplate={{model.clusterTemplate}}
-  @clusterTemplateRevision={{model.clusterTemplateRevision}} @users={{model.users}} @psps={{model.psps}} @psacs={{model.psacs}} @mode="new"
+  @clusterTemplateRevision={{model.clusterTemplateRevision}} @users={{model.users}} @psacs={{model.psacs}} @mode="new"
   @forceExpandOnInit={{false}} @cancel={{action "cancel" }} @done={{action "done" }} />
diff --git a/lib/global-admin/addon/clusters/new/launch/route.js b/lib/global-admin/addon/clusters/new/launch/route.js
@@ -93,7 +93,6 @@ export default Route.extend({
       cloudCredentials:           gs.findAll('cloudcredential'),
       clusterRoleTemplateBinding: gs.findAll('clusterRoleTemplateBinding'),
       nodeTemplates:              gs.findAll('nodeTemplate'),
-      psps:                       gs.findAll('podSecurityPolicyTemplate'),
       psacs:                      gs.findAll('podSecurityAdmissionConfigurationTemplate'),
       users:                      gs.findAll('user'),
       clusterTemplates,

diff --git a/lib/global-admin/addon/components/form-basic-policy/component.js b/lib/global-admin/addon/components/form-basic-policy/component.js
diff --git a/lib/global-admin/addon/components/form-basic-policy/template.hbs b/lib/global-admin/addon/components/form-basic-policy/template.hbs
diff --git a/lib/global-admin/addon/components/form-capability-policy/component.js b/lib/global-admin/addon/components/form-capability-policy/component.js