Skip to content

Commit 691d326

Browse files
Gackodkostyrev
authored andcommitted
Chart: Remove Pod Security Policy. (kubernetes#11971)
1 parent 95a1ab5 commit 691d326

19 files changed

+1
-438
lines changed

charts/ingress-nginx/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
244244
| controller.admissionWebhooks.createSecretJob.resources | object | `{}` | |
245245
| controller.admissionWebhooks.createSecretJob.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":65532,"runAsNonRoot":true,"runAsUser":65532,"seccompProfile":{"type":"RuntimeDefault"}}` | Security context for secret creation containers |
246246
| controller.admissionWebhooks.enabled | bool | `true` | |
247-
| controller.admissionWebhooks.existingPsp | string | `""` | Use an existing PSP instead of creating one |
248247
| controller.admissionWebhooks.extraEnvs | list | `[]` | Additional environment variables to set |
249248
| controller.admissionWebhooks.failurePolicy | string | `"Fail"` | Admission Webhook failure policy to use |
250249
| controller.admissionWebhooks.key | string | `"/usr/local/certificates/key"` | |
@@ -307,7 +306,6 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
307306
| controller.enableAnnotationValidations | bool | `true` | |
308307
| controller.enableMimalloc | bool | `true` | Enable mimalloc as a drop-in replacement for malloc. # ref: https://github.com/microsoft/mimalloc # |
309308
| controller.enableTopologyAwareRouting | bool | `false` | This configuration enables Topology Aware Routing feature, used together with service annotation service.kubernetes.io/topology-mode="auto" Defaults to false |
310-
| controller.existingPsp | string | `""` | Use an existing PSP instead of creating one |
311309
| controller.extraArgs | object | `{}` | Additional command line arguments to pass to Ingress-Nginx Controller E.g. to specify the default SSL certificate you can use |
312310
| controller.extraContainers | list | `[]` | Additional containers to be added to the controller pod. See https://github.com/lemonldap-ng-controller/lemonldap-ng-controller as example. |
313311
| controller.extraEnvs | list | `[]` | Additional environment variables to set |
@@ -497,7 +495,6 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
497495
| defaultBackend.autoscaling.targetMemoryUtilizationPercentage | int | `50` | |
498496
| defaultBackend.containerSecurityContext | object | `{}` | Security context for default backend containers |
499497
| defaultBackend.enabled | bool | `false` | |
500-
| defaultBackend.existingPsp | string | `""` | Use an existing PSP instead of creating one |
501498
| defaultBackend.extraArgs | object | `{}` | |
502499
| defaultBackend.extraConfigMaps | list | `[]` | |
503500
| defaultBackend.extraEnvs | list | `[]` | Additional environment variables to set for defaultBackend pods |
@@ -550,7 +547,6 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
550547
| dhParam | string | `""` | A base64-encoded Diffie-Hellman parameter. This can be generated with: `openssl dhparam 4096 2> /dev/null | base64` # Ref: https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/ssl-dh-param |
551548
| imagePullSecrets | list | `[]` | Optional array of imagePullSecrets containing private registry credentials # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ |
552549
| namespaceOverride | string | `""` | Override the deployment namespace; defaults to .Release.Namespace |
553-
| podSecurityPolicy.enabled | bool | `false` | |
554550
| portNamePrefix | string | `""` | Prefix for TCP and UDP ports names in ingress controller service # Some cloud providers, like Yandex Cloud may have a requirements for a port name regex to support cloud load balancer integration |
555551
| rbac.create | bool | `true` | |
556552
| rbac.scope | bool | `false` | |

charts/ingress-nginx/ci/deamonset-psp-values.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

charts/ingress-nginx/ci/deamonset-webhook-and-psp-values.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

charts/ingress-nginx/ci/deployment-psp-values.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

charts/ingress-nginx/ci/deployment-webhook-and-psp-values.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

charts/ingress-nginx/templates/_helpers.tpl

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,6 @@ readOnlyRootFilesystem: {{ .Values.defaultBackend.image.readOnlyRootFilesystem }
235235
{{- end -}}
236236
{{- end -}}
237237

238-
{{/*
239-
Return the appropriate apiGroup for PodSecurityPolicy.
240-
*/}}
241-
{{- define "podSecurityPolicy.apiGroup" -}}
242-
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
243-
{{- print "policy" -}}
244-
{{- else -}}
245-
{{- print "extensions" -}}
246-
{{- end -}}
247-
{{- end -}}
248-
249238
{{/*
250239
Extra modules.
251240
*/}}

charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,4 @@ rules:
2020
verbs:
2121
- get
2222
- update
23-
{{- if .Values.podSecurityPolicy.enabled }}
24-
- apiGroups: [{{ template "podSecurityPolicy.apiGroup" . }}]
25-
resources: ['podsecuritypolicies']
26-
verbs: ['use']
27-
{{- with .Values.controller.admissionWebhooks.existingPsp }}
28-
resourceNames: [{{ . }}]
29-
{{- else }}
30-
resourceNames: [{{ include "ingress-nginx.admissionWebhooks.fullname" . }}]
31-
{{- end }}
32-
{{- end }}
3323
{{- end }}

charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml

Lines changed: 0 additions & 52 deletions
This file was deleted.

charts/ingress-nginx/templates/controller-psp.yaml

Lines changed: 0 additions & 100 deletions
This file was deleted.

charts/ingress-nginx/templates/controller-role.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,4 @@ rules:
9191
- list
9292
- watch
9393
- get
94-
{{- if .Values.podSecurityPolicy.enabled }}
95-
- apiGroups: [{{ template "podSecurityPolicy.apiGroup" . }}]
96-
resources: ['podsecuritypolicies']
97-
verbs: ['use']
98-
{{- with .Values.controller.existingPsp }}
99-
resourceNames: [{{ . }}]
100-
{{- else }}
101-
resourceNames: [{{ include "ingress-nginx.fullname" . }}]
102-
{{- end }}
103-
{{- end }}
10494
{{- end }}

0 commit comments

Comments
 (0)