Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kubernetes] Support kubernetes 1.31.1 #11533

Merged
merged 1 commit into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@ Note: Upstart/SysV init based OS types are not supported.
## Supported Components

- Core
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.30.4
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.31.1
- [etcd](https://github.com/etcd-io/etcd) v3.5.12
- [docker](https://www.docker.com/) v26.1
- [containerd](https://containerd.io/) v1.7.22
- [cri-o](http://cri-o.io/) v1.30.3 (experimental: see [CRI-O Note](docs/CRI/cri-o.md). Only on fedora, ubuntu and centos based OS)
- [cri-o](http://cri-o.io/) v1.31.0 (experimental: see [CRI-O Note](docs/CRI/cri-o.md). Only on fedora, ubuntu and centos based OS)
- Network Plugin
- [cni-plugins](https://github.com/containernetworking/plugins) v1.2.0
- [calico](https://github.com/projectcalico/calico) v3.28.1
Expand Down
2 changes: 1 addition & 1 deletion inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ kube_token_dir: "{{ kube_config_dir }}/tokens"
kube_api_anonymous_auth: true

## Change this to use another Kubernetes version, e.g. a current beta release
kube_version: v1.30.4
kube_version: v1.31.1

# Where the binaries will be downloaded.
# Note: ensure that you've enough disk space (about 1G)
Expand Down
4 changes: 4 additions & 0 deletions roles/container-engine/cri-o/tasks/load_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@
- name: Cri-o | include vars/v1.29.yml
include_vars: v1.29.yml
when: crio_version is version("v1.29.0", operator=">=")

- name: Cri-o | include vars/v1.31.yml
include_vars: v1.31.yml
when: crio_version is version("v1.31.0", operator=">=")
13 changes: 13 additions & 0 deletions roles/container-engine/cri-o/vars/v1.31.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
crio_conmon: "{{ bin_dir }}/conmon"

# cri-o binary files
crio_bin_files:
- conmon
- conmonrs
- crun
- runc
- crio
- pinns

crio_status_command: crio status
yankay marked this conversation as resolved.
Show resolved Hide resolved
32 changes: 32 additions & 0 deletions roles/kubespray-defaults/defaults/main/checksums.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
---
crictl_checksums:
arm:
v1.31.0: 0
v1.30.0: 0
v1.29.0: 0
v1.28.0: 1ea267f3872f4b7f311963ab43ce6653ceeaf8727206c889b56587c95497e9dd
arm64:
v1.31.0: f9879541e92fd302db00b9d28ef617744bb8b8b62520bd4c0479819d7d4ae869
v1.30.0: 3769043fc6018a9e1697fcb768bb89ecd429176bd71e849058916f79a46a07a8
v1.29.0: 0b615cfa00c331fb9c4524f3d4058a61cc487b33a3436d1269e7832cf283f925
v1.28.0: 06e9224e42bc5e23085751e93cccdac89f7930ba6f7a45b8f8fc70ef663c37c4
amd64:
v1.31.0: 9daa32308090aedee5a7f2ab1f1428fef6f669a64e993f0b5b98db8ef6edd71b
v1.30.0: 3dd03954565808eaeb3a7ffc0e8cb7886a64a9aa94b2bfdfbdc6e2ed94842e49
v1.29.0: d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb
v1.28.0: 8dc78774f7cbeaf787994d386eec663f0a3cf24de1ea4893598096cb39ef2508
ppc64le:
v1.31.0: ed545379a61deff415172ea3ca6b847166c5d116c7a1271866286cd0242c09a2
v1.30.0: ada550cecb5647014f16dd3ff6c59d7ef7d942ca8cb6c51c15ed019622f39ee9
v1.29.0: 2803a1865045077f29f798b9c569e1db7d44b5c329a546a0fd183e906925b99f
v1.28.0: b70fb7bee5982aa1318ba25088319f1d0d1415567f1f76cd69011b8a14da4daf
crio_archive_checksums:
arm:
v1.31.0: 0
v1.30.3: 0
v1.30.2: 0
v1.30.1: 0
Expand All @@ -31,6 +36,7 @@ crio_archive_checksums:
v1.28.1: 0
v1.28.0: 0
arm64:
v1.31.0: d54afe0140afde0bed09136bd923d8fb415c9016189e7f1b719565ec84edf737
v1.30.3: 2e47b4b307788b15263256e0e423574c60eec80e17576704df736a7ccc13d7bd
v1.30.2: 6c0ed1a8a38c65fda45d8b725b8742d247e9f658d8cd6c56baa05bd749b9ccbe
v1.30.1: 371a6da24dfc7c9e01f29191b36a0629474a37cd8300fa8a36483647a7859b72
Expand All @@ -44,6 +50,7 @@ crio_archive_checksums:
v1.28.1: 98a96c6b6bdf20c60e1a7948847c28b57d9e6e47e396b2e405811ea2c24ab9dc
v1.28.0: c8ea800244d9e4ce74af85126afadea2939cd6f7ddd152d0f09fafbf294ef1cc
amd64:
v1.31.0: 3cc88ce3c19b2f9bbdfaa1bd42eea64bd7d5ffac6e714a83abbdea40df9ef8c2
v1.30.3: 622809ec7e21350a3ff7897c7d2cabdf4367b1a5904d346514adc485de3c7172
v1.30.2: 10be07d2626a093b58a29110e84256029d4c46aeb06a6b41e8bddc30bcfcaa4b
v1.30.1: 7293f51295d89106e59fe0f83af9599e71fe4f446e1b13c40687ef63ecc1b194
Expand All @@ -57,6 +64,7 @@ crio_archive_checksums:
v1.28.1: 63cee2e67e283e29d790caa52531bcca7bc59473fb73bde75f4fd8daa169d4bf
v1.28.0: fa87497c12815766d18f332b38a4d823fa6ad6bb3d159e383a5557e6c912eb3b
ppc64le:
v1.31.0: 46d901644f86d25dd62f12c16bd88cf26a0b9c400405f571fc5b68abdfefad95
v1.30.3: 44ed039a1c0c492b14212bbe59c63fe804e3cc525102f47475a5bc0ffd08f4e8
v1.30.2: 19169b1ef3324c749a0b0105b47288c0ef4949964b340c85229d00234e6148a1
v1.30.1: e6fb05de749a06316d046e46f8ff4345a413264e63f63dc9e3f1db2cb8a7c962
Expand All @@ -73,6 +81,8 @@ crio_archive_checksums:
# Kubernetes versions above Kubespray's current target version are untested and should be used with caution.
kubelet_checksums:
arm:
v1.31.1: 0
v1.31.0: 0
philipsabri marked this conversation as resolved.
Show resolved Hide resolved
v1.30.4: 0
v1.30.3: 0
v1.30.2: 0
Expand Down Expand Up @@ -100,6 +110,8 @@ kubelet_checksums:
v1.28.1: 0
v1.28.0: 0
arm64:
v1.31.1: fbd98311e96b9dcdd73d1688760d410cc70aefce26272ff2f20eef51a7c0d1da
v1.31.0: b310da449a9d2f8b928cab5ca12a6772617ba421023894e061ca2647e6d9f1c3
philipsabri marked this conversation as resolved.
Show resolved Hide resolved
v1.30.4: d3df7a4acff9aba5518930b9c417e8e0ca8cf5e105b7fee6504891fa8f3e962a
v1.30.3: 41d1926cd7b9c7c250c45f11c8fa9d1946cae98aec2eefc61a2cb4933612bcce
v1.30.2: 72ceb082311b42032827a936f80cd2437b8eee03053d05dbe36ba48585febfb8
Expand Down Expand Up @@ -127,6 +139,8 @@ kubelet_checksums:
v1.28.1: 9b7fa64b2785da4a38768377961e227f8da629c56a5df43ca1b665dd07b56f3c
v1.28.0: 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9
amd64:
v1.31.1: 50619fff95bdd7e690c049cc083f495ae0e7c66d0cdf6a8bcad298af5fe28438
v1.31.0: 39e7f1c61c8389ea7680690f8bd5dd733672fa16875ae598df0fd8c205df57a9
v1.30.4: 0c02c0f997b3e9769eae7ca051856054411fca947b3d5409d991ce1964dd0e69
v1.30.3: 9a37ddd5ea026639b7d85e98fa742e392df7aa5ec917bed0711a451613de3c1c
v1.30.2: 6923abe67ef069afca61c71c585023840426e802b198298055af3a82e11a4e52
Expand Down Expand Up @@ -154,6 +168,8 @@ kubelet_checksums:
v1.28.1: 2bc22332f44f8fcd3fce57879fd873f977949ebd261571fbae31fbb2713a5dd3
v1.28.0: bfb6b977100963f2879a33e5fbaa59a5276ba829a957a6819c936e9c1465f981
ppc64le:
v1.31.1: 5b9e8de02f797991670c3f16fa7e46edc7e862644bfa376573c2fca2eaf01519
v1.31.0: b347b96dd79d3ac09e490669b38c5c2a49b5d73cf82cb619a1c54c6e0a165dbb
v1.30.4: 50ea965747f3f8c69288aa9268e5c2cc1eb6c3f0b3efa7eba862258bd225d98d
v1.30.3: c48df46a72ff9764fd1bc54e99b6154772031b1e66c36b0ac5764a5801eadfc0
v1.30.2: 268dfbb7ee3abcb8ff9fd0a88f81204e40dd33d177f7878941c9ff6b7cca0474
Expand Down Expand Up @@ -182,6 +198,8 @@ kubelet_checksums:
v1.28.0: 22de59965f2d220afa24bf04f4c6d6b65a4bb1cd80756c13381973b1ac3b4578
kubectl_checksums:
arm:
v1.31.1: 51b178c9362a4fbe35644399f113d7f904d306261953a51c5c0a57676e209fa6
v1.31.0: a4d6292c88c199688a03ea211bea08c8ae29f1794f5deeeef46862088d124baa
v1.30.4: a31676f522cc745f241b1fd5755b9965558e4f1f5db5149319439a15f49806d1
v1.30.3: f9147ca81cbcb7b1cf41b75d95a0fd3597defb7c0e6db8c54e6ca7f493929c71
v1.30.2: 2dab982920d87bc9a17c539bfa4f94b758afc454bb044029dee06144e8dbee08
Expand Down Expand Up @@ -209,6 +227,8 @@ kubectl_checksums:
v1.28.1: eaa05dab1bffb8593d8e5caa612530ee5c914ee2be73429b7ce36c3becad893f
v1.28.0: 372c4e7bbe98c7067c4b7820c4a440c931ad77f7cb83d3237b439ca3c14d3d37
arm64:
v1.31.1: 3af2451191e27ecd4ac46bb7f945f76b71e934d54604ca3ffc7fe6f5dd123edb
v1.31.0: f42832db7d77897514639c6df38214a6d8ae1262ee34943364ec1ffaee6c009c
v1.30.4: 1d8b4e6443c7df8e92a065d88d146142a202fea5ec694135b83d9668529ea3b1
v1.30.3: c6f9568f930b16101089f1036677bb15a3185e9ed9b8dbce2f518fb5a52b6787
v1.30.2: 56becf07105fbacd2b70f87f3f696cfbed226cb48d6d89ed7f65ba4acae3f2f8
Expand Down Expand Up @@ -236,6 +256,8 @@ kubectl_checksums:
v1.28.1: 46954a604b784a8b0dc16754cfc3fa26aabca9fd4ffd109cd028bfba99d492f6
v1.28.0: f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c
amd64:
v1.31.1: 57b514a7facce4ee62c93b8dc21fda8cf62ef3fed22e44ffc9d167eab843b2ae
v1.31.0: 7c27adc64a84d1c0cc3dcf7bf4b6e916cc00f3f576a2dbac51b318d926032437
v1.30.4: 2ffd023712bbc1a9390dbd8c0c15201c165a69d394787ef03eda3eccb4b9ac06
v1.30.3: abd83816bd236b266c3643e6c852b446f068fe260f3296af1a25b550854ec7e5
v1.30.2: c6e9c45ce3f82c90663e3c30db3b27c167e8b19d83ed4048b61c1013f6a7c66e
Expand Down Expand Up @@ -263,6 +285,8 @@ kubectl_checksums:
v1.28.1: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1
v1.28.0: 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce
ppc64le:
v1.31.1: 635275e4b207902bc6dda29de898e5152229271c46cb9613340e36c3abc2cb67
v1.31.0: 92393bc295423429522fa8c49724f95f31fa9bf20062d2c123e928d08886c95d
v1.30.4: a913b4b8573d356483d5c7f14d2cecb290b41ab3b58812567b54ce09e763aad9
v1.30.3: 3f2ba2216e43b833251a570b1218cba61d43ef2734c0a7751d281656066ab30b
v1.30.2: 738bc1bad45df79fc4313d167a68ed5a1cf747f1f94e4434f0733e3126989f2e
Expand Down Expand Up @@ -291,6 +315,8 @@ kubectl_checksums:
v1.28.0: 7a9dcb4c75b33b9dac497c1a756b1f12c7c63f86fc0f321452360fbe1a79ce0f
kubeadm_checksums:
arm:
v1.31.1: 0
v1.31.0: 0
philipsabri marked this conversation as resolved.
Show resolved Hide resolved
v1.30.4: 0
v1.30.3: 0
v1.30.2: 0
Expand Down Expand Up @@ -318,6 +344,8 @@ kubeadm_checksums:
v1.28.1: 0
v1.28.0: 0
arm64:
v1.31.1: 66195cd53cda3c73c9ae5e49a1352c710c0ea9ce244bbdeb68b917d809f0ea78
v1.31.0: dbeb84862d844d58f67ad6be64021681a314cda162a04e6047f376f2a9ad0226
v1.30.4: 609afad8590afb39b500cc5175c64b17690f7bf0b0eebcf1d347656d262e5c8c
v1.30.3: 6590f2447c87346aac29e2ab42fe4f29873f9bf154ee878f00da4c81bfdb8ea2
v1.30.2: 7268762b7afd44bf07619985dd52c376b63e47d73b8f9a3b08cc49624a8fbd55
Expand Down Expand Up @@ -345,6 +373,8 @@ kubeadm_checksums:
v1.28.1: 7d2f68917470a5d66bd2a7d62897f59cb4afaeffb2f26c028afa119acd8c3fc8
v1.28.0: b9b473d2d9136559b19eb465006af77df45c09862cd7ce6673a33aae517ff5ab
amd64:
v1.31.1: b3f92d19d482359116dd9ee9c0a10cb86e32a2a2aef79b853d5f07d6a093b0df
v1.31.0: cf3b1a44b11ab226e40610e63d99fae7588a82940bb77da471a6dec624c819c2
v1.30.4: 6c6053fb8b31030ef7fffe146eb29489f7bf53d7a5ca10e0b10c907bf4b7e281
v1.30.3: bb78c2a27027278ee644d523f583ed7fdba48b4fbf31e3cfb0e309b6457dda69
v1.30.2: 672b0cae2accce5eac10a1fe4ea6b166e5b518c79ccf71a2fbe7b53c2ca74062
Expand Down Expand Up @@ -372,6 +402,8 @@ kubeadm_checksums:
v1.28.1: 6134dbc92dcb83c3bae1a8030f7bb391419b5d13ea94badd3a79b7ece75b2736
v1.28.0: 12ea68bfef0377ccedc1a7c98a05ea76907decbcf1e1ec858a60a7b9b73211bb
ppc64le:
v1.31.1: 76667e109e2dfcb332820c35f598b6f588b6f18c8b59acfb956fb9b4995dda4e
v1.31.0: 002307ea116a5aa5f78d3d9fb00e9981593711fb79fdfc9be0a9857c370bdcf3
v1.30.4: df0a42a57e69f3080871736d0953f1f287f63def0ed514324aca2469463efd7a
v1.30.3: 76a58a7389365295fb4ea1163c2644c3700f066a8e8cb1b7897ad83576e43ce2
v1.30.2: 8aee71554003411470a5933cdff7896736ae1182055c0de6bb3782d0a7581c71
Expand Down
6 changes: 6 additions & 0 deletions roles/kubespray-defaults/defaults/main/download.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,31 +132,36 @@ skopeo_version: "v1.15.0"
kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}"

pod_infra_supported_versions:
v1.31: "3.9"
v1.30: "3.9"
v1.29: "3.9"
v1.28: "3.9"
pod_infra_version: "{{ pod_infra_supported_versions[kube_major_version] }}"

etcd_supported_versions:
v1.31: "v3.5.12"
v1.30: "v3.5.12"
v1.29: "v3.5.12"
v1.28: "v3.5.12"
etcd_version: "{{ etcd_supported_versions[kube_major_version] }}"

crictl_supported_versions:
v1.31: "v1.31.0"
v1.30: "v1.30.0"
v1.29: "v1.29.0"
v1.28: "v1.28.0"
crictl_version: "{{ crictl_supported_versions[kube_major_version] }}"

crio_supported_versions:
v1.31: v1.31.0
v1.30: v1.30.3
v1.29: v1.29.1
v1.28: v1.28.4
crio_version: "{{ crio_supported_versions[kube_major_version] }}"

# Scheduler plugins doesn't build for K8s 1.29 yet
scheduler_plugins_supported_versions:
v1.31: 0
v1.30: 0
v1.29: 0
v1.28: v0.28.9
Expand Down Expand Up @@ -363,6 +368,7 @@ csi_livenessprobe_image_repo: "{{ kube_image_repo }}/sig-storage/livenessprobe"
csi_livenessprobe_image_tag: "v2.5.0"

snapshot_controller_supported_versions:
v1.31: "v7.0.2"
v1.30: "v7.0.2"
v1.29: "v7.0.2"
v1.28: "v7.0.2"
Expand Down
2 changes: 1 addition & 1 deletion roles/kubespray-defaults/defaults/main/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ kubelet_fail_swap_on: true
kubelet_swap_behavior: LimitedSwap

## Change this to use another Kubernetes version, e.g. a current beta release
kube_version: v1.30.4
kube_version: v1.31.1

## The minimum version working
kube_version_min_required: v1.28.0
Expand Down