diff options
| author | Rodolfo Sanchez <rsanchez@pivotal.io> | 2022-05-20 08:02:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 08:02:33 -0500 |
| commit | 089753e45f6e47dda8841f3cc36161688068b9d2 (patch) | |
| tree | a0ce873797c0b1aa6903b5e55da5f7f86db86412 | |
| parent | f245605a6b74c1041307a4f6f35944983cce8525 (diff) | |
| parent | 0e674fc539ae0e2747f7ae19f00661b04f8df5f6 (diff) | |
Merge branch 'kubernetes:master' into patch-1
| -rw-r--r-- | contributors/devel/development.md | 3 | ||||
| -rw-r--r-- | sig-testing/charter.md | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/contributors/devel/development.md b/contributors/devel/development.md index 2417c1e2..4b68a7f4 100644 --- a/contributors/devel/development.md +++ b/contributors/devel/development.md @@ -284,7 +284,8 @@ different versions of Kubernetes. | 1.17 - 1.18 | 1.13.15 | | 1.19 - 1.20 | 1.15.5 | | 1.21 - 1.22 | 1.16.7 | -| 1.23+ | 1.17 | +| 1.23 | 1.17 | +| 1.24+ | 1.18 | ##### A Note on Changing Go Versions diff --git a/sig-testing/charter.md b/sig-testing/charter.md index f307f553..0b3075a4 100644 --- a/sig-testing/charter.md +++ b/sig-testing/charter.md @@ -34,8 +34,6 @@ health of the project. [peribolos] and [label_sync] - Tools that facilitate local testing of kubernetes such as [greenhouse] and [kind] -- Jobs that automate away project toil, such as [periodic jobs that run as - @fejta-bot] - Ensuring all of the above is kept running on a best effort basis - Tools, frameworks and libraries that make it possible to write tests against kubernetes such as e2e\* or integration test frameworks. @@ -113,7 +111,6 @@ Subprojects are created by Tech Leads following the process defined in [sig-gove [Kubernetes Charter README]: https://github.com/kubernetes/community/blob/master/committee-steering/governance/README.md [lazy consensus]: http://en.osswiki.info/concepts/lazy_consensus -[periodic jobs that run as @fejta-bot]: https://git.k8s.io/test-infra/config/jobs/kubernetes/test-infra/fejta-bot-periodics.yaml [boskos]: https://git.k8s.io/test-infra/boskos [ghproxy]: https://git.k8s.io/test-infra/ghproxy [greenhouse]: https://git.k8s.io/test-infra/greenhouse |