diff --git a/go.mod b/go.mod index 8c39f0bfac4..b92bae78f4b 100644 --- a/go.mod +++ b/go.mod @@ -519,7 +519,7 @@ replace ( k8s.io/legacy-cloud-providers => ./staging/src/k8s.io/legacy-cloud-providers k8s.io/metrics => ./staging/src/k8s.io/metrics k8s.io/mount-utils => ./staging/src/k8s.io/mount-utils - k8s.io/pod-security-standards => ./staging/src/k8s.io/pod-security-standards + k8s.io/pod-security-admission => ./staging/src/k8s.io/pod-security-admission k8s.io/sample-apiserver => ./staging/src/k8s.io/sample-apiserver k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller diff --git a/staging/README.md b/staging/README.md index fc969f448b2..517c181227d 100644 --- a/staging/README.md +++ b/staging/README.md @@ -29,7 +29,7 @@ Repositories currently staged here: - [`k8s.io/legacy-cloud-providers`](https://github.com/kubernetes/legacy-cloud-providers) - [`k8s.io/metrics`](https://github.com/kubernetes/metrics) - [`k8s.io/mount-utils`](https://github.com/kubernetes/mount-utils) -- [`k8s.io/pod-security-standards`](https://github.com/kubernetes/pod-security-standards) +- [`k8s.io/pod-security-admission`](https://github.com/kubernetes/pod-security-admission) - [`k8s.io/sample-apiserver`](https://github.com/kubernetes/sample-apiserver) - [`k8s.io/sample-cli-plugin`](https://github.com/kubernetes/sample-cli-plugin) - [`k8s.io/sample-controller`](https://github.com/kubernetes/sample-controller) diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 448ab8918af..792e59d452f 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -262,11 +262,11 @@ - k8s.io/klog - k8s.io/utils -- baseImportPath: "./vendor/k8s.io/pod-security-standards/" +- baseImportPath: "./vendor/k8s.io/pod-security-admission/" allowedImports: - k8s.io/api - k8s.io/apimachinery - k8s.io/client-go - k8s.io/klog - - k8s.io/pod-security-standards + - k8s.io/pod-security-admission - k8s.io/utils diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index df44053676f..e3627530402 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -1460,10 +1460,10 @@ rules: dir: staging/src/k8s.io/mount-utils name: release-1.21 -- destination: pod-security-standards +- destination: pod-security-admission library: true branches: - source: branch: master - dir: staging/src/k8s.io/pod-security-standards + dir: staging/src/k8s.io/pod-security-admission name: master diff --git a/staging/src/k8s.io/pod-security-standards/.github/PULL_REQUEST_TEMPLATE.md b/staging/src/k8s.io/pod-security-admission/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from staging/src/k8s.io/pod-security-standards/.github/PULL_REQUEST_TEMPLATE.md rename to staging/src/k8s.io/pod-security-admission/.github/PULL_REQUEST_TEMPLATE.md diff --git a/staging/src/k8s.io/pod-security-standards/CONTRIBUTING.md b/staging/src/k8s.io/pod-security-admission/CONTRIBUTING.md similarity index 100% rename from staging/src/k8s.io/pod-security-standards/CONTRIBUTING.md rename to staging/src/k8s.io/pod-security-admission/CONTRIBUTING.md diff --git a/staging/src/k8s.io/pod-security-standards/LICENSE b/staging/src/k8s.io/pod-security-admission/LICENSE similarity index 100% rename from staging/src/k8s.io/pod-security-standards/LICENSE rename to staging/src/k8s.io/pod-security-admission/LICENSE diff --git a/staging/src/k8s.io/pod-security-standards/OWNERS b/staging/src/k8s.io/pod-security-admission/OWNERS similarity index 100% rename from staging/src/k8s.io/pod-security-standards/OWNERS rename to staging/src/k8s.io/pod-security-admission/OWNERS diff --git a/staging/src/k8s.io/pod-security-standards/README.md b/staging/src/k8s.io/pod-security-admission/README.md similarity index 97% rename from staging/src/k8s.io/pod-security-standards/README.md rename to staging/src/k8s.io/pod-security-admission/README.md index 442ff4b034c..1345382dc70 100644 --- a/staging/src/k8s.io/pod-security-standards/README.md +++ b/staging/src/k8s.io/pod-security-admission/README.md @@ -1,4 +1,4 @@ -# Pod Security Standards +# Pod Security Admission diff --git a/staging/src/k8s.io/pod-security-standards/SECURITY_CONTACTS b/staging/src/k8s.io/pod-security-admission/SECURITY_CONTACTS similarity index 100% rename from staging/src/k8s.io/pod-security-standards/SECURITY_CONTACTS rename to staging/src/k8s.io/pod-security-admission/SECURITY_CONTACTS diff --git a/staging/src/k8s.io/pod-security-standards/code-of-conduct.md b/staging/src/k8s.io/pod-security-admission/code-of-conduct.md similarity index 100% rename from staging/src/k8s.io/pod-security-standards/code-of-conduct.md rename to staging/src/k8s.io/pod-security-admission/code-of-conduct.md diff --git a/staging/src/k8s.io/pod-security-standards/doc.go b/staging/src/k8s.io/pod-security-admission/doc.go similarity index 81% rename from staging/src/k8s.io/pod-security-standards/doc.go rename to staging/src/k8s.io/pod-security-admission/doc.go index 1ca0b018f48..70175530663 100644 --- a/staging/src/k8s.io/pod-security-standards/doc.go +++ b/staging/src/k8s.io/pod-security-admission/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package podsecuritystandards is a placeholder until the initial podsecurity implementation is +// Package podsecurityadmission is a placeholder until the initial podsecurity implementation is // added. -package podsecuritystandards // import "k8s.io/pod-security-standards" +package podsecurityadmission // import "k8s.io/pod-security-admission" diff --git a/staging/src/k8s.io/pod-security-admission/go.mod b/staging/src/k8s.io/pod-security-admission/go.mod new file mode 100644 index 00000000000..e2ab1aaaba2 --- /dev/null +++ b/staging/src/k8s.io/pod-security-admission/go.mod @@ -0,0 +1,7 @@ +// This is a generated file. Do not edit directly. + +module k8s.io/pod-security-admission + +go 1.16 + +replace k8s.io/pod-security-admission => ../pod-security-admission diff --git a/staging/src/k8s.io/pod-security-standards/go.sum b/staging/src/k8s.io/pod-security-admission/go.sum similarity index 100% rename from staging/src/k8s.io/pod-security-standards/go.sum rename to staging/src/k8s.io/pod-security-admission/go.sum diff --git a/staging/src/k8s.io/pod-security-standards/go.mod b/staging/src/k8s.io/pod-security-standards/go.mod deleted file mode 100644 index b0fe1f796d9..00000000000 --- a/staging/src/k8s.io/pod-security-standards/go.mod +++ /dev/null @@ -1,7 +0,0 @@ -// This is a generated file. Do not edit directly. - -module k8s.io/pod-security-standards - -go 1.16 - -replace k8s.io/pod-security-standards => ../pod-security-standards diff --git a/vendor/k8s.io/pod-security-admission b/vendor/k8s.io/pod-security-admission new file mode 120000 index 00000000000..eb8d1870499 --- /dev/null +++ b/vendor/k8s.io/pod-security-admission @@ -0,0 +1 @@ +../../staging/src/k8s.io/pod-security-admission \ No newline at end of file diff --git a/vendor/k8s.io/pod-security-standards b/vendor/k8s.io/pod-security-standards deleted file mode 120000 index 8f93f52eed7..00000000000 --- a/vendor/k8s.io/pod-security-standards +++ /dev/null @@ -1 +0,0 @@ -../../staging/src/k8s.io/pod-security-standards \ No newline at end of file diff --git a/vendor/modules.txt b/vendor/modules.txt index ee41eb9934d..b17ea67216f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2704,7 +2704,7 @@ sigs.k8s.io/yaml # k8s.io/legacy-cloud-providers => ./staging/src/k8s.io/legacy-cloud-providers # k8s.io/metrics => ./staging/src/k8s.io/metrics # k8s.io/mount-utils => ./staging/src/k8s.io/mount-utils -# k8s.io/pod-security-standards => ./staging/src/k8s.io/pod-security-standards +# k8s.io/pod-security-admission => ./staging/src/k8s.io/pod-security-admission # k8s.io/sample-apiserver => ./staging/src/k8s.io/sample-apiserver # k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin # k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller