kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97171 from deads2k/deprecate-psp 

deprecate PSP in 1.21, but leave removal at 1.25

Kubernetes-commit: 979c644df2ad051015a8ccf6475e3476eda0cea0
This commit is contained in:
Kubernetes Publisher 2020-12-17 22:16:25 -08:00
parent d7ad7ff6ed 7742b18bff
commit 001f65682a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -924,7 +924,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "fcac651617f2"
"Rev": "9c6b1a9487e0"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -932,7 +932,7 @@
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "950728861c24"
"Rev": "9547a43879a0"
},
{
"ImportPath": "k8s.io/client-go",

8
go.mod
View File

@ -34,9 +34,9 @@ require (
github.com/stretchr/testify v1.6.1
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20201209045733-fcac651617f2
k8s.io/api v0.0.0-20201218085720-9c6b1a9487e0
k8s.io/apimachinery v0.0.0-20201209085528-15c5dba13c59
k8s.io/cli-runtime v0.0.0-20201217091618-950728861c24
k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0
k8s.io/client-go v0.0.0-20201217085940-0964d4be7536
k8s.io/component-base v0.0.0-20201217090229-e05af43f81e2
k8s.io/component-helpers v0.0.0-20201217090330-fc14ecbd38ba
@ -49,9 +49,9 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20201209045733-fcac651617f2
k8s.io/api => k8s.io/api v0.0.0-20201218085720-9c6b1a9487e0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201209085528-15c5dba13c59
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201217091618-950728861c24
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0
k8s.io/client-go => k8s.io/client-go v0.0.0-20201217085940-0964d4be7536
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201211071722-8cc0d294774b
k8s.io/component-base => k8s.io/component-base v0.0.0-20201217090229-e05af43f81e2

4
go.sum
View File

@ -632,9 +632,9 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20201209045733-fcac651617f2/go.mod h1:xjrWEKNUnu5XTPx3c+1VDDkb3vXmUiTwwHureX1M32c=
k8s.io/api v0.0.0-20201218085720-9c6b1a9487e0/go.mod h1:RfHTN0YuX1yj8GjBNCMS6JbbdmX/jjszu9vXIt47SpM=
k8s.io/apimachinery v0.0.0-20201209085528-15c5dba13c59/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/cli-runtime v0.0.0-20201217091618-950728861c24/go.mod h1:xor+SrUbcNI9ov1MpKfY8txG3Eg60dn3YVrKmSKGkgQ=
k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0/go.mod h1:YGZiEr0qwB6XSdVC2kbXtQG/+bm7+18eWKXckr167Io=
k8s.io/client-go v0.0.0-20201217085940-0964d4be7536/go.mod h1:e3s7Y5RNYrQANELWm0kX28YBKhjZZmZLhpNDntfnBhQ=
k8s.io/code-generator v0.0.0-20201211071722-8cc0d294774b/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
k8s.io/component-base v0.0.0-20201217090229-e05af43f81e2/go.mod h1:gIi+MRY/IzqtOlI456xyiW/eLgJnlivhxgZIlG3ueCQ=

2
testdata/openapi/swagger.json vendored
View File

@ -14427,7 +14427,7 @@
"type": "object"
},
"io.k8s.api.policy.v1beta1.PodSecurityPolicy": {
"description": "PodSecurityPolicy governs the ability to make requests that affect the Security Context that will be applied to a pod and container.",
"description": "PodSecurityPolicy governs the ability to make requests that affect the Security Context that will be applied to a pod and container. Deprecated in 1.21.",
"properties": {
"apiVersion": {
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",