From 37ad9b1d4edb67af0e324aa6969b39d8e12670bd Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Wed, 30 Nov 2022 10:16:39 +0800 Subject: [PATCH] remove PSP as v1.25 remove it --- cmd/config/docs/api-conventions/functions-spec.md | 3 +-- cmd/config/internal/generateddocs/api/docs.go | 2 +- kyaml/openapi/openapi.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/config/docs/api-conventions/functions-spec.md b/cmd/config/docs/api-conventions/functions-spec.md index ae5021060..22a30aa47 100644 --- a/cmd/config/docs/api-conventions/functions-spec.md +++ b/cmd/config/docs/api-conventions/functions-spec.md @@ -26,8 +26,7 @@ interpreted as described in [RFC 2119][2]. KRM functions enable shift-left practices (client-side) through: - Pre-commit / delivery validation and linting of configuration - - e.g. Fail if any containers don't have PodSecurityPolicy or CPU / Memory - limits + - e.g. Fail if any containers don't have CPU / Memory limits - Implementation of abstractions as client actuated APIs - e.g. Create a client-side _"CRD"_ for generating configuration checked into git diff --git a/cmd/config/internal/generateddocs/api/docs.go b/cmd/config/internal/generateddocs/api/docs.go index 70de9fb4b..baab4f549 100644 --- a/cmd/config/internal/generateddocs/api/docs.go +++ b/cmd/config/internal/generateddocs/api/docs.go @@ -255,7 +255,7 @@ interpreted as described in [RFC 2119][2]. - Pre-commit / delivery validation and linting of configuration - - e.g. Fail if any containers don't have PodSecurityPolicy or CPU / Memory limits + - e.g. Fail if any containers don't have CPU / Memory limits - Implementation of abstractions as client actuated APIs (e.g. templating) - e.g. Create a client-side _"CRD"_ for generating configuration checked into git - Aspect Orient configuration / Injection of cross-cutting configuration diff --git a/kyaml/openapi/openapi.go b/kyaml/openapi/openapi.go index 7f2398f78..f9224188e 100644 --- a/kyaml/openapi/openapi.go +++ b/kyaml/openapi/openapi.go @@ -104,7 +104,7 @@ var precomputedIsNamespaceScoped = map[yaml.TypeMeta]bool{ {APIVersion: "node.k8s.io/v1beta1", Kind: "RuntimeClass"}: false, {APIVersion: "policy/v1", Kind: "PodDisruptionBudget"}: true, {APIVersion: "policy/v1beta1", Kind: "PodDisruptionBudget"}: true, - {APIVersion: "policy/v1beta1", Kind: "PodSecurityPolicy"}: false, + {APIVersion: "policy/v1beta1", Kind: "PodSecurityPolicy"}: false, // remove after openapi upgrades to v1.25. {APIVersion: "rbac.authorization.k8s.io/v1", Kind: "ClusterRole"}: false, {APIVersion: "rbac.authorization.k8s.io/v1", Kind: "ClusterRoleBinding"}: false, {APIVersion: "rbac.authorization.k8s.io/v1", Kind: "Role"}: true,