From fef2ecf97dc9b26b49e0490d2d10172a82e10eb1 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 6 Mar 2024 14:52:20 +0100 Subject: [PATCH] Add `cri-client` staging repository Signed-off-by: Sascha Grunert --- go.mod | 1 + go.work | 1 + staging/publishing/import-restrictions.yaml | 5 + staging/publishing/rules.yaml | 8 + staging/src/k8s.io/apiserver/go.mod | 2 +- .../.github/PULL_REQUEST_TEMPLATE.md | 2 + staging/src/k8s.io/cri-client/CONTRIBUTING.md | 7 + staging/src/k8s.io/cri-client/LICENSE | 201 ++++++++++++++++++ staging/src/k8s.io/cri-client/OWNERS | 14 ++ staging/src/k8s.io/cri-client/README.md | 47 ++++ .../src/k8s.io/cri-client/SECURITY_CONTACTS | 19 ++ .../src/k8s.io/cri-client/code-of-conduct.md | 3 + staging/src/k8s.io/cri-client/go.mod | 7 + staging/src/k8s.io/cri-client/go.sum | 0 .../k8s.io/dynamic-resource-allocation/go.mod | 1 + .../k8s.io/dynamic-resource-allocation/go.sum | 1 + 16 files changed, 318 insertions(+), 1 deletion(-) create mode 100644 staging/src/k8s.io/cri-client/.github/PULL_REQUEST_TEMPLATE.md create mode 100644 staging/src/k8s.io/cri-client/CONTRIBUTING.md create mode 100644 staging/src/k8s.io/cri-client/LICENSE create mode 100644 staging/src/k8s.io/cri-client/OWNERS create mode 100644 staging/src/k8s.io/cri-client/README.md create mode 100644 staging/src/k8s.io/cri-client/SECURITY_CONTACTS create mode 100644 staging/src/k8s.io/cri-client/code-of-conduct.md create mode 100644 staging/src/k8s.io/cri-client/go.mod create mode 100644 staging/src/k8s.io/cri-client/go.sum diff --git a/go.mod b/go.mod index 51e191d562df1..eadf6e7dc19a3 100644 --- a/go.mod +++ b/go.mod @@ -249,6 +249,7 @@ replace ( k8s.io/component-helpers => ./staging/src/k8s.io/component-helpers k8s.io/controller-manager => ./staging/src/k8s.io/controller-manager k8s.io/cri-api => ./staging/src/k8s.io/cri-api + k8s.io/cri-client => ./staging/src/k8s.io/cri-client k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib k8s.io/dynamic-resource-allocation => ./staging/src/k8s.io/dynamic-resource-allocation k8s.io/endpointslice => ./staging/src/k8s.io/endpointslice diff --git a/go.work b/go.work index 15a04ac26e804..04fa741832125 100644 --- a/go.work +++ b/go.work @@ -17,6 +17,7 @@ use ( ./staging/src/k8s.io/component-helpers ./staging/src/k8s.io/controller-manager ./staging/src/k8s.io/cri-api + ./staging/src/k8s.io/cri-client ./staging/src/k8s.io/csi-translation-lib ./staging/src/k8s.io/dynamic-resource-allocation ./staging/src/k8s.io/endpointslice diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 29df7c61c2a1e..f889787bf8337 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -222,6 +222,7 @@ - k8s.io/apiserver - k8s.io/client-go - k8s.io/cri-api + - k8s.io/cri-client - k8s.io/klog - k8s.io/component-base - k8s.io/kubelet @@ -317,3 +318,7 @@ - k8s.io/endpointslice - k8s.io/klog - k8s.io/utils + +# TODO: enable when source code got transferred +# - baseImportPath: "./staging/src/k8s.io/cri-client" +# allowedImports: [] diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 78641c165b625..4b4dbde5b6dd7 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -1490,6 +1490,14 @@ rules: dirs: - staging/src/k8s.io/cri-api library: true +- destination: cri-client + branches: + - name: master + source: + branch: master + dirs: + - staging/src/k8s.io/cri-client + library: true - destination: kubelet branches: - name: master diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 3dab6a194c07c..08deb241a498e 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -5,6 +5,7 @@ module k8s.io/apiserver go 1.22.0 require ( + github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a github.com/coreos/go-oidc v2.2.1+incompatible github.com/coreos/go-systemd/v22 v22.5.0 github.com/emicklei/go-restful/v3 v3.11.0 @@ -60,7 +61,6 @@ require ( require ( github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect diff --git a/staging/src/k8s.io/cri-client/.github/PULL_REQUEST_TEMPLATE.md b/staging/src/k8s.io/cri-client/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000000..e7e5eb834b23a --- /dev/null +++ b/staging/src/k8s.io/cri-client/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,2 @@ +Sorry, we do not accept changes directly against this repository. Please see +CONTRIBUTING.md for information on where and how to contribute instead. diff --git a/staging/src/k8s.io/cri-client/CONTRIBUTING.md b/staging/src/k8s.io/cri-client/CONTRIBUTING.md new file mode 100644 index 0000000000000..239b8ecd14f66 --- /dev/null +++ b/staging/src/k8s.io/cri-client/CONTRIBUTING.md @@ -0,0 +1,7 @@ +# Contributing guidelines + +Do not open pull requests directly against this repository, they will be ignored. Instead, please open pull requests against [kubernetes/kubernetes](https://git.k8s.io/kubernetes/). Please follow the same [contributing guide](https://git.k8s.io/kubernetes/CONTRIBUTING.md) you would follow for any other pull request made to kubernetes/kubernetes. + +This repository is published from [kubernetes/kubernetes/staging/src/k8s.io/cri-api](https://git.k8s.io/kubernetes/staging/src/k8s.io/cri-api) by the [kubernetes publishing-bot](https://git.k8s.io/publishing-bot). + +Please see [Staging Directory and Publishing](https://git.k8s.io/community/contributors/devel/sig-architecture/staging.md) for more information. diff --git a/staging/src/k8s.io/cri-client/LICENSE b/staging/src/k8s.io/cri-client/LICENSE new file mode 100644 index 0000000000000..8dada3edaf50d --- /dev/null +++ b/staging/src/k8s.io/cri-client/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/staging/src/k8s.io/cri-client/OWNERS b/staging/src/k8s.io/cri-client/OWNERS new file mode 100644 index 0000000000000..b367056314867 --- /dev/null +++ b/staging/src/k8s.io/cri-client/OWNERS @@ -0,0 +1,14 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +# Disable inheritance as this is owned by sig-node +options: + no_parent_owners: true +approvers: + - sig-node-approvers + - api-approvers + - sig-node-cri-approvers +reviewers: + - sig-node-reviewers +labels: + - sig/node + - area/kubelet diff --git a/staging/src/k8s.io/cri-client/README.md b/staging/src/k8s.io/cri-client/README.md new file mode 100644 index 0000000000000..3201cf51aaee2 --- /dev/null +++ b/staging/src/k8s.io/cri-client/README.md @@ -0,0 +1,47 @@ +# cri-client + +Container Runtime Interface client implementation + +## Purpose + +This repository contains the client source code for the Container Runtime Interface (CRI). +CRI is a plugin interface which enables kubelet to use a wide variety of container runtimes, +without the need to recompile. CRI consists of a protocol buffers and gRPC API. +Read more about CRI at [kubernetes docs](https://kubernetes.io/docs/concepts/architecture/cri/). + +The repository [kubernetes/cri-client](https://github.com/kubernetes/cri-api) is a mirror of https://github.com/kubernetes/kubernetes/tree/master/staging/src/k8s.io/cri-client. +Please do **not** file issues or submit PRs against the [kubernetes/cri-client](https://github.com/kubernetes/cri-client) +repository as it is readonly, all development is done in [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes). + +The [`cri-api` staging repository](https://github.com/kubernetes/cri-api) is +defined in [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes) +and is **only** intended to be used for kubelet to container runtime +interactions, or for node-level troubleshooting using a tool such as `crictl`. +The `cri-api` wraps the [Protobuf protocol definition](https://github.com/kubernetes/cri-api/blob/63929b3/pkg/apis/runtime/v1/api.proto) +with extra features which can be used directly from other clients as well. +It is **not** a common purpose container runtime API for general use, and is +intended to be Kubernetes-centric. We try to avoid it, but there may be logic +within a container runtime that optimizes for the order or specific parameters +of call(s) that the kubelet makes. + +## Community, discussion, contribution, and support + +Learn how to engage with the Kubernetes community on the [community +page](http://kubernetes.io/community/). + +You can reach the maintainers of this repository at: + +- Slack: #sig-node (on https://kubernetes.slack.com -- get an + invite at [slack.kubernetes.io](https://slack.kubernetes.io)) +- Mailing List: + https://groups.google.com/forum/#!forum/kubernetes-sig-node + +### Code of Conduct + +Participation in the Kubernetes community is governed by the [Kubernetes +Code of Conduct](code-of-conduct.md). + +### Contribution Guidelines + +See [CONTRIBUTING.md](CONTRIBUTING.md) for more information. Please note that [kubernetes/cri-api](https://github.com/kubernetes/cri-api) +is a readonly mirror repository, all development is done at [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes). diff --git a/staging/src/k8s.io/cri-client/SECURITY_CONTACTS b/staging/src/k8s.io/cri-client/SECURITY_CONTACTS new file mode 100644 index 0000000000000..79d41b8aa423b --- /dev/null +++ b/staging/src/k8s.io/cri-client/SECURITY_CONTACTS @@ -0,0 +1,19 @@ +# Defined below are the security contacts for this repo. +# +# They are the contact point for the Product Security Committee to reach out +# to for triaging and handling of incoming issues. +# +# The below names agree to abide by the +# [Embargo Policy](https://git.k8s.io/security/private-distributors-list.md#embargo-policy) +# and will be removed and replaced if they violate that agreement. +# +# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE +# INSTRUCTIONS AT https://kubernetes.io/security/ + +tallclair +yujuhong +dims +cjcullen +joelsmith +liggitt +philips diff --git a/staging/src/k8s.io/cri-client/code-of-conduct.md b/staging/src/k8s.io/cri-client/code-of-conduct.md new file mode 100644 index 0000000000000..0d15c00cf3252 --- /dev/null +++ b/staging/src/k8s.io/cri-client/code-of-conduct.md @@ -0,0 +1,3 @@ +# Kubernetes Community Code of Conduct + +Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md) diff --git a/staging/src/k8s.io/cri-client/go.mod b/staging/src/k8s.io/cri-client/go.mod new file mode 100644 index 0000000000000..075869f0b6ac0 --- /dev/null +++ b/staging/src/k8s.io/cri-client/go.mod @@ -0,0 +1,7 @@ +// This is a generated file. Do not edit directly. + +module k8s.io/cri-client + +go 1.22.0 + +replace k8s.io/cri-client => ../cri-client diff --git a/staging/src/k8s.io/cri-client/go.sum b/staging/src/k8s.io/cri-client/go.sum new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/staging/src/k8s.io/dynamic-resource-allocation/go.mod b/staging/src/k8s.io/dynamic-resource-allocation/go.mod index 657bff7f49bf8..1ab9b3fe1c21c 100644 --- a/staging/src/k8s.io/dynamic-resource-allocation/go.mod +++ b/staging/src/k8s.io/dynamic-resource-allocation/go.mod @@ -22,6 +22,7 @@ require ( require ( github.com/antlr4-go/antlr/v4 v4.13.0 // indirect + github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect diff --git a/staging/src/k8s.io/dynamic-resource-allocation/go.sum b/staging/src/k8s.io/dynamic-resource-allocation/go.sum index 14faac98ff457..5310215cdffdc 100644 --- a/staging/src/k8s.io/dynamic-resource-allocation/go.sum +++ b/staging/src/k8s.io/dynamic-resource-allocation/go.sum @@ -4,6 +4,7 @@ github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMo github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=