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.

Sign up for GitHub

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

kubeadm: bump versions #297

Merged
merged 4 commits into from
Feb 22, 2022
Merged

kubeadm: bump versions #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee734fd
kola/test/kubeadm: bump kubernetes versions
tormath1 Feb 21, 2022
40dad7d
kola/test/kubeadm: bump CNI and Flannel version
tormath1 Feb 21, 2022
f5587c1
kubeadm/template: update `/opt/cni` SELinux label type
tormath1 Feb 21, 2022
4bd24c5
changelog: add entry
tormath1 Feb 22, 2022
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- kola: fixed cl.filesystem test for systemd 250 and newer ([#280](https://github.com/flatcar-linux/mantle/pull/280))
- PXE boots now over HTTPS on Equinix Metal ([#288](https://github.com/flatcar-linux/mantle/pull/288))
- Bumped cilium tested version to 1.11.0 ([291](https://github.com/flatcar-linux/mantle/pull/291))
- Bumped `etcd` and `cobra` dependency ([#293](https://github.com/flatcar-linux/mantle/pull/293))
- Bumped `etcd` and `cobra` dependencies ([#293](https://github.com/flatcar-linux/mantle/pull/293))
- Bumped Kubernetes binaries and CNI versions ([#297](https://github.com/flatcar-linux/mantle/pull/297))

### Removed
- Remove `--repo-branch` option from cork ([#283](https://github.com/flatcar-linux/mantle/pull/283))
Expand Down
78 changes: 39 additions & 39 deletions kola/tests/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,76 +43,76 @@ var (
// testConfig holds params for various kubernetes releases
// and the nested params are used to render script templates
testConfig = map[string]map[string]interface{}{
"v1.23.0": map[string]interface{}{
"FlannelVersion": "v0.14.0",
"v1.23.4": map[string]interface{}{
"FlannelVersion": "v0.16.3",
"CiliumVersion": "1.11.0",
"CiliumCLIVersion": "v0.10.2",
"CNIVersion": "v0.8.7",
"CNIVersion": "v1.0.1",
"CRIctlVersion": "v1.22.0",
"ReleaseVersion": "v0.4.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"arm64": map[string]string{
"KubeadmSum": "56e4e1dc1b4dcae45d31658b21e96cff6a6b8f44b4a39ba5216de7fd2f0632a06c809639d3a5cc4e6ef1635a8bca851c691f2461e5334ae4d374e31734c66431",
"KubeletSum": "1efdd0342dad9f2683a60bad7a1e64b0000bde7a339082ab27a35efa54ba01f2a4a031dc3a9b264fadb6c1e141fd8f6d72026a48bc0689dd8efb411c3c4741cd",
"KubeadmSum": "a1d7d1dc0ee4598c53eedfac7a10ae4bf69613b352b0067f9ec5a8c4f5410b37a475afddf669f93646f830ab963f54046d22b101c385732c6252ba9c9ee78d4f",
"KubeletSum": "209450f58a2e9de79903723b169197e968ee58dd5b1149e3366aff9042286b4f83692f1b69e792155a9879e656802b64d317fdcbd5e85da4ad6cc2cb4667a5fe",
"CRIctlSum": "f926c645e0d5f177c0589b1d052ffef4b4ed9d45b3d5b467473b6075ef767fb43b1f7ba5b525d57f021b6b8dc18d7efd27e03e1ec5b71a20f4e321c32456cdd9",
"CNISum": "d1fcb37c727c6aa328e1f51d2a06c93a43dbdee2b7f495e12725e6d60db664d6068a1e6e26025df6c4996d9431921855c71df60c227e62bacbf5c9d213a21f8d",
"KubectlSum": "6e16a4bba09fd131b7e75596050ec860c2c5955d556d99ba4e0e91d0b26e0e2c4ed73a4e8a111a51401bb0d2208b6d77f7022b213b0c0017ab503b4caeb01bf0",
"CNISum": "616c4f493a560ecd1ecc60f758720bb2c3539c4261a63d2094f474380d59d88444637cee7fed124c53193f08de7feb65510fe95579b12306c112ad45a74e1536",
"KubectlSum": "8e46340013faf76b7881314e1f2375b8cb13668994d09fe5037a65d9521b6fe99ce1011339aaee24ce211dc4eef7902c341ddb3d7b628038f060482e3349a7f7",
},
"amd64": map[string]string{
"KubeadmSum": "0fd9145145c74731327eca8ec8aae7a068a7f83fdb6e879cd3961a52db67df6f0b0d36c324bee73ce718f06671e71488d5d076ae05cd7b756185a2739e2748c1",
"KubeletSum": "6af3e7264ba6f0351480b654d230b407d459d4cb9e3a0d99efcc9a6bda9f80855249e3209a498f60f82b54d126a8b52ce8539414664f7391d3129e805daa5e96",
"KubeadmSum": "f56614d98fe93990664477c5c6cddcd319fcde0e452373da3506618c42ff5113a39848f169e1c4c8347dfc8c3e5f525469bcc6333d5c1bc88e60bcba45d57ea9",
"KubeletSum": "4306ef42564efc96ca7901a7fabe3231a3c660b83d935e78f8a06913cc9aa06b0777976bbc62de4fa5291b9bc2406970213e5d09390826da87cc05f365459c0e",
"CRIctlSum": "9ff93e9c15942c39c85dd4e8182b3e9cd47fcb15b1315b0fdfd0d73442a84111e6cf8bb74b586e34b1f382a71107eb7e7820544a98d2224ca6b6dee3ee576222",
"CNISum": "8f2cbee3b5f94d59f919054dccfe99a8e3db5473b553d91da8af4763e811138533e05df4dbeab16b3f774852b4184a7994968f5e036a3f531ad1ac4620d10ede",
"KubectlSum": "2c5d9583521637da0dbcfaa290c8683894eda2d5f2f5f7bcc349fe5149c8dd3e7b707ac04d25a0a9a34ed989a2e9baa5ea661b0a68cb93ba0f69ea79de1e6748",
"CNISum": "220ee0073e9b3708b8ec6159a6ee511b2fd9b88cbe74d48a9b823542e17acf53acec6215869a1d21826422d655eebdd53795fafcef70205d34bf9d8878b493d8",
"KubectlSum": "12349ef989f85e99ae88bb1e20ad15aa1c0aea7050372b4ae56e9f89c270a176246c445cf350d1024bc91e3fd5955ed1c6035185d0f4217f4b99628e9c173d50",
},
},
"v1.22.0": map[string]interface{}{
"FlannelVersion": "v0.14.0",
"v1.22.7": map[string]interface{}{
"FlannelVersion": "v0.16.3",
"CiliumVersion": "1.11.0",
"CiliumCLIVersion": "v0.10.2",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"CNIVersion": "v1.0.1",
"CRIctlVersion": "v1.22.0",
"ReleaseVersion": "v0.4.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"arm64": map[string]string{
"KubeadmSum": "bdc32d358eba328a16b515cb1b7b1fd76bb5951ed5c6e1ea845798f13e6415e040e5f150030bd446e6eb6096533136780aef263b2a9c38ba11536c4415212be0",
"KubeletSum": "39953c3dce3dd579b1601859681ee81825b3bc3fdf764a097b31c01277bc8afc23693599ec4c1065d8844e1fed91f5edea558b33648794f084fc495efe623f88",
"CRIctlSum": "45ab5f2dccb6579b5d376c07dd8264dd714a56ead32744655e698f5919bb0e7934a88666cccfad9cedf30d5bb713394f359f5c6a50963da9a34ddb469dbee92a",
"CNISum": "d1fcb37c727c6aa328e1f51d2a06c93a43dbdee2b7f495e12725e6d60db664d6068a1e6e26025df6c4996d9431921855c71df60c227e62bacbf5c9d213a21f8d",
"KubectlSum": "0912bf3f26eeb35cce3adf21dfe899ea6707c499bd50a19dbaad7c64e00a6c3cd33a21c5f67e5022cf6c4187b2994b7b9a1c9dd7d192fb0fbd3ac52fdb776f07",
"KubeadmSum": "2289516a4bc33d0aff0f85e0d50db00f9f4d211a9a48eabd491b9dee0b6662c7f339135570e9eaa65f7ce82490703b700e18dc663d94de2fa54a0b9cd944daf8",
"KubeletSum": "62a91ee9b915cb5cc8270b75c3f3fbfdf3fbed71dc422d1d49cbf9f83a5886f327390facdfb3e1c62cd286f56d438101eb6e8101b6b6611dda56647340f013a3",
"CRIctlSum": "f926c645e0d5f177c0589b1d052ffef4b4ed9d45b3d5b467473b6075ef767fb43b1f7ba5b525d57f021b6b8dc18d7efd27e03e1ec5b71a20f4e321c32456cdd9",
"CNISum": "616c4f493a560ecd1ecc60f758720bb2c3539c4261a63d2094f474380d59d88444637cee7fed124c53193f08de7feb65510fe95579b12306c112ad45a74e1536",
"KubectlSum": "1714b683a2da381cc9801f20758fc01b7178e8b0a5c1c1f906b7f1aa59f125e1668c9d64aa3b82ffcccf015ec88d519cdaad461bd269f8e437bab1ab0d1be211",
},
"amd64": map[string]string{
"KubeadmSum": "339e13ad840cbeab906e416f321467ab6c91cc4b66e5ad4db6f8d41a974146cf8226727edbcf686854a0803246e316158f028de7e753197cdcd2d99a604afbfd",
"KubeletSum": "1b5d530e62f0198aa7af09371ba799d135b54b9a4513981fa09b786ca5fdc98819345112b5c3a68834f6171e9b4438075cf7ec77c2c575b8e3c56b8eb15d2a86",
"CRIctlSum": "e258f4607a89b8d44c700036e636dd42cc3e2ed27a3bb13beef736f80f64f10b7974c01259a66131d3f7b44ed0c61b1ca0ea91597c416a9c095c432de5112d44",
"CNISum": "8f2cbee3b5f94d59f919054dccfe99a8e3db5473b553d91da8af4763e811138533e05df4dbeab16b3f774852b4184a7994968f5e036a3f531ad1ac4620d10ede",
"KubectlSum": "a93b2ca067629cb1fe9cbf1af1a195c12126488ed321e3652200d4dbfee9a577865647b7ef6bb673e1bdf08f03108b5dcb4b05812a649a0de5c7c9efc1407810",
"KubeadmSum": "48b5d66203e2da262b2526a3a0e33527a13443014692d60c27a8513b36bde23cdb438cfbbe8fbe884bd0a04b1eb97e95dae2b648713cdefc8ecef3dcd0ed5ade",
"KubeletSum": "69c1953ecf40e7c171bc918b99fb0379d25bdcea5b88124c088a875c5d343b94b4064457542bc530de1203ef041808cf3b7e4155f777fdc10a462df65848543e",
"CRIctlSum": "9ff93e9c15942c39c85dd4e8182b3e9cd47fcb15b1315b0fdfd0d73442a84111e6cf8bb74b586e34b1f382a71107eb7e7820544a98d2224ca6b6dee3ee576222",
"CNISum": "220ee0073e9b3708b8ec6159a6ee511b2fd9b88cbe74d48a9b823542e17acf53acec6215869a1d21826422d655eebdd53795fafcef70205d34bf9d8878b493d8",
"KubectlSum": "c34d3a8f09993036acbe21a580bb25eb95b27c03d2950844220afb1ebe35e8bc67f2cb7682adbe1e1a7f33f5dd34e5abb2c1d899abe2090b194dfdf7b9c2e509",
},
},
"v1.21.0": map[string]interface{}{
"FlannelVersion": "v0.14.0",
"v1.21.10": map[string]interface{}{
"FlannelVersion": "v0.16.3",
"CiliumVersion": "1.11.0",
"CiliumCLIVersion": "v0.10.2",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"CNIVersion": "v1.0.1",
"CRIctlVersion": "v1.22.0",
"ReleaseVersion": "v0.4.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"arm64": map[string]string{
"KubeadmSum": "96248c47e809f88675d932bd8479cc1c170abb958be204965812235fb0173e788a91c46760a274a43cc56af3de4133f8ea1f5daf4f431410dbba043836e775d5",
"KubeletSum": "fc2a7e3ae6d44c0e384067f8e0bcd47b0db120d03d06cc8589c601f618792959ea894cf3325df8ab4902af23ded7fd875cf4fe718be0e67ad990a7559e4a8b1a",
"CRIctlSum": "45ab5f2dccb6579b5d376c07dd8264dd714a56ead32744655e698f5919bb0e7934a88666cccfad9cedf30d5bb713394f359f5c6a50963da9a34ddb469dbee92a",
"CNISum": "d1fcb37c727c6aa328e1f51d2a06c93a43dbdee2b7f495e12725e6d60db664d6068a1e6e26025df6c4996d9431921855c71df60c227e62bacbf5c9d213a21f8d",
"KubectlSum": "b990b81d5a885a9d131aabcc3a5ca9c37dfaff701470f2beb896682a8643c7e0c833e479a26f21129b598ac981732bf52eecdbe73896fe0ff2d9c1ffd082d1fd",
"KubeadmSum": "9acabdb85f4dada74dab909b6b21315c81fdeba6df2c156bbebf4b18b8d427a114a853e694d1b42c01c12ede23a43e04651292d65917f405486d8b0088fb2b46",
"KubeletSum": "029e81f48efa98cbb35835c208540acd662fa16dabea687aff3d25208d7bfa77500d97ed0a756f926f06b989f22971e91baf124d1df330eab9dee90448192752",
"CRIctlSum": "f926c645e0d5f177c0589b1d052ffef4b4ed9d45b3d5b467473b6075ef767fb43b1f7ba5b525d57f021b6b8dc18d7efd27e03e1ec5b71a20f4e321c32456cdd9",
"CNISum": "616c4f493a560ecd1ecc60f758720bb2c3539c4261a63d2094f474380d59d88444637cee7fed124c53193f08de7feb65510fe95579b12306c112ad45a74e1536",
"KubectlSum": "c9cd8ebd472d9d6652a307ae78c0753cd3bfbbdcb1ed137db06e16ad900ae454f1e2654d7c01db737b0e2dff3e07b4e18c911264afc94b584f8795baf4a92735",
},
"amd64": map[string]string{
"KubeadmSum": "0673408403a3474c868ae86109f11f9114bca7ddce204be0d169316fb3ce0edefa4b2a472ba9b8308e423e6b927d4098ac36296405570f444f39551fb1c4bbb4",
"KubeletSum": "530689c0cc32ef1830f7ae26ac10995f815043d48a905141e23a34a5e61522c4ee2ff46953648c47c5592d7c2ffa40ce90469a697f36f68475b8da5abd73f9f5",
"CRIctlSum": "e258f4607a89b8d44c700036e636dd42cc3e2ed27a3bb13beef736f80f64f10b7974c01259a66131d3f7b44ed0c61b1ca0ea91597c416a9c095c432de5112d44",
"CNISum": "8f2cbee3b5f94d59f919054dccfe99a8e3db5473b553d91da8af4763e811138533e05df4dbeab16b3f774852b4184a7994968f5e036a3f531ad1ac4620d10ede",
"KubectlSum": "9557d298146ef62ffbcf05b3591bf1ce74f345628370447a4f614b5f64e367b5bfa8e397cc4755da9ea38f1ba04c95c65c313e735550ffc3b03c197e936c3e11",
"KubeadmSum": "1319e29679f1d91faf4c9900662641614fd05101dc38618ce075c6819eb8af5a097f8cf416bdf9e2ee9bb92b6c4e3cf4d25df8de2ed6c50ef48a2da605e610b6",
"KubeletSum": "ee16a40f5982fe459c919d396f7b407e358394cb27836cba8545a5841b3dcedf02ed4da45207b8e311a0707defe977bdcebbed130c7fefc6dd770ec3afd68718",
"CRIctlSum": "9ff93e9c15942c39c85dd4e8182b3e9cd47fcb15b1315b0fdfd0d73442a84111e6cf8bb74b586e34b1f382a71107eb7e7820544a98d2224ca6b6dee3ee576222",
"CNISum": "220ee0073e9b3708b8ec6159a6ee511b2fd9b88cbe74d48a9b823542e17acf53acec6215869a1d21826422d655eebdd53795fafcef70205d34bf9d8878b493d8",
"KubectlSum": "5334a634ea72358f2ec303e82678160e260b8920aeb62c1953a43cb70bc919870568e67144f78c4949e0db1297ee2b5e604ff76a7433637c093919c855d189d1",
},
},
}
Expand Down
2 changes: 2 additions & 0 deletions kola/tests/kubeadm/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var (
Environment=CNI_VERSION={{ .CNIVersion }}
ExecStartPre=/usr/bin/mkdir --parents /opt/cni/bin
ExecStartPre=/usr/bin/tar -v --extract --file "/opt/cni-plugins-linux-{{ .Arch }}-${CNI_VERSION}.tgz" --directory /opt/cni/bin --no-same-owner
ExecStartPre=/usr/bin/chcon -R /opt/cni -t svirt_lxc_file_t
ExecStart=/usr/bin/rm "/opt/cni-plugins-linux-{{ .Arch }}-${CNI_VERSION}.tgz"
[Install]
WantedBy=multi-user.target
Expand Down Expand Up @@ -121,6 +122,7 @@ storage:
Environment=CNI_VERSION={{ .CNIVersion }}
ExecStartPre=/usr/bin/mkdir --parents /opt/cni/bin
ExecStartPre=/usr/bin/tar -v --extract --file "/opt/cni-plugins-linux-{{ .Arch }}-${CNI_VERSION}.tgz" --directory /opt/cni/bin --no-same-owner
ExecStartPre=/usr/bin/chcon -R /opt/cni -t svirt_lxc_file_t
ExecStart=/usr/bin/rm "/opt/cni-plugins-linux-{{ .Arch }}-${CNI_VERSION}.tgz"
[Install]
WantedBy=multi-user.target
Expand Down
1 change: 1 addition & 0 deletions kola/tests/kubeadm/testdata/master-cilium-amd64-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ systemd:
Environment=CNI_VERSION=v0.8.7
ExecStartPre=/usr/bin/mkdir --parents /opt/cni/bin
ExecStartPre=/usr/bin/tar -v --extract --file "/opt/cni-plugins-linux-amd64-${CNI_VERSION}.tgz" --directory /opt/cni/bin --no-same-owner
ExecStartPre=/usr/bin/chcon -R /opt/cni -t svirt_lxc_file_t
ExecStart=/usr/bin/rm "/opt/cni-plugins-linux-amd64-${CNI_VERSION}.tgz"
[Install]
WantedBy=multi-user.target
Expand Down
1 change: 1 addition & 0 deletions kola/tests/kubeadm/testdata/master-cilium-arm64-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ systemd:
Environment=CNI_VERSION=v0.8.7
ExecStartPre=/usr/bin/mkdir --parents /opt/cni/bin
ExecStartPre=/usr/bin/tar -v --extract --file "/opt/cni-plugins-linux-arm64-${CNI_VERSION}.tgz" --directory /opt/cni/bin --no-same-owner
ExecStartPre=/usr/bin/chcon -R /opt/cni -t svirt_lxc_file_t
ExecStart=/usr/bin/rm "/opt/cni-plugins-linux-arm64-${CNI_VERSION}.tgz"
[Install]
WantedBy=multi-user.target
Expand Down