From 8e401f94ea7faf044d74cf7221a8ed450e4a91b4 Mon Sep 17 00:00:00 2001 From: Takuya Murakami Date: Tue, 2 Sep 2025 16:41:16 +0900 Subject: [PATCH] [calico] Add version 3.30.3 and make it default (#12523) Signed-off-by: Takuya Murakami --- README.md | 2 +- .../vars/main/checksums.yml | 37 ++++++++----------- .../calico/templates/calico-cr.yml.j2 | 6 ++- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index cb8ed2a87..eb7b118a3 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ Note: - [cri-o](http://cri-o.io/) 1.33.3 (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) 1.4.1 - - [calico](https://github.com/projectcalico/calico) 3.29.5 + - [calico](https://github.com/projectcalico/calico) 3.30.3 - [cilium](https://github.com/cilium/cilium) 1.17.7 - [flannel](https://github.com/flannel-io/flannel) 0.26.7 - [kube-ovn](https://github.com/alauda/kube-ovn) 1.12.21 diff --git a/roles/kubespray_defaults/vars/main/checksums.yml b/roles/kubespray_defaults/vars/main/checksums.yml index 53af5712a..3ecca4d15 100644 --- a/roles/kubespray_defaults/vars/main/checksums.yml +++ b/roles/kubespray_defaults/vars/main/checksums.yml @@ -474,6 +474,10 @@ cni_binary_checksums: 1.0.0: sha256:1a055924b1b859c54a97dc14894ecaa9b81d6d949530b9544f0af4173f5a8f2a calicoctl_binary_checksums: arm64: + 3.30.3: sha256:2ae0474b88a6042e5489d7410d2669a9d443c9d5c51e2bdc8ebe4d6dd98f2475 + 3.30.2: sha256:b7aaa3ef1d3f280f835f3e339cbc32d4c6cd6493c7adf46b1ecae29fca848e7f + 3.30.1: sha256:e3ae853fecfbf09bb2cb8d5ecded553b2d8d1a7229cfbf911fb3ff13c3ab5412 + 3.30.0: sha256:3b97d2e15a0ffc42755571ca0749a1722c7d87d045d2345606eec8e18e95ccc6 3.29.5: sha256:b121a5fb297271c72ba252f6650d4752c67772f16dd57022d69439866e947957 3.29.4: sha256:3139c83cdd3e648d9605c2cebb4657871e41310aad0c7b4bf198e3a8393c5cec 3.29.3: sha256:d6cba570af9162dff56714ac5e22dfdd170742bc58a51211f587875a3de79fc4 @@ -486,12 +490,11 @@ calicoctl_binary_checksums: 3.28.2: sha256:8ebe965424ac94084499182b2853de62e5d18cdc346a3b8974e991d8b7a9592d 3.28.1: sha256:c062d13534498a427c793a4a9190be4df3cf796a3feb29e4a501e1d6f48daa7c 3.28.0: sha256:c4ca8563d2a920729116a3a30171c481580c8c447938ce974ce14d7ce25a31bf - 3.27.5: sha256:1c929538565c9f885debb45cc38b3efb4e58d362400163a2eff2b56fad838334 - 3.27.4: sha256:8544b601a67e0594009dafef6d3237fcf6f32fb64726c09abc1f2ce9d6819496 - 3.27.3: sha256:1fc5f58a18d8b1c487b4663fc5cbe23b45bd9d31617debd309f6dfac7c11a8ef - 3.27.2: sha256:0fd1f65a511338cf9940835987d420c94ab95b5386288ba9673b736a4d347463 - 3.27.0: sha256:b4b8c71f9658165e45336b9b5e4fad865529feeffe4294247eb5b4c4310dcaf9 amd64: + 3.30.3: sha256:a7d017d1abf6ef5d6e03267187c0dd68c32f5e937b64decd29d003be44fa6b94 + 3.30.2: sha256:a89e03de84194ab445a998940768959aaabaa5d92be31fe00814b21f86f48c76 + 3.30.1: sha256:85208c36a4fb4e251322a4e544a7b8fc9bd6b9ba2922685a2a2b0aa7dc75d743 + 3.30.0: sha256:a8d385b40526e117a622eb2134f7ed0ce77b9048dbd560dfa2be49fbb4ee6f25 3.29.5: sha256:0b118c7efa08e84751a6c7f6647d61ecac58793343d949ad75b71a1d55480a9c 3.29.4: sha256:f2a6da6e97052da3b8b787aaea61fa83298586e822af8b9ec5f3858859de759c 3.29.3: sha256:8101eef6d31ca80db0c64c7ab8930f657dafc1f8696f145ef5d5f162026eedda @@ -504,12 +507,11 @@ calicoctl_binary_checksums: 3.28.2: sha256:d7f30447f0f59262051b95bdc656407442c4f71066dc37ddd3b676108fab569d 3.28.1: sha256:22ec5727c38dbe19001792b4ca64ac760a6e2985d5c1a231d919dbebe5bca171 3.28.0: sha256:4ea270699e67ca29e5533ddb0a68d370cb0005475796c7e841f83047da6297b6 - 3.27.5: sha256:0a63022166b353ebea49a2f250793019edf531dd5cdb0655da746e7c243aacba - 3.27.4: sha256:84f2bd29ef7b06e85a2caf0b6c6e0d3da5ab5264d46b360e6baaf49bbc3b957d - 3.27.3: sha256:e22b8bb41684f8ffb5143b50bf3b2ab76985604d774d397cfb6fb11d8a19f326 - 3.27.2: sha256:692f69dc656e41cd35e23e24f56c98c4aeeb723fed129985b46f71e6eb5e1594 - 3.27.0: sha256:46e79ae146b3dd90998f56511cf5d6db64deb97cb784235caf1f99e0672d66e4 ppc64le: + 3.30.3: sha256:ccd13ced62baf633fb4347fbe6c9fdc0d3b1b7deb1794c83c015507a0cb8238e + 3.30.2: sha256:6364bbadfcaf5935427a5f6ef431435b39ccacc22c8a1b5f9071fda00bdfd8ec + 3.30.1: sha256:d35943a9eccf7def1f3f92b782b221331a2e9163625233b98a72189e2f1b8a6b + 3.30.0: sha256:5694651bbc6a50dc5537f1f0acf4d4c3897eec5f3b114bdc7cb6bce21df7ba83 3.29.5: sha256:ec2ab56be3ffdc7ee41f14f3a5fe17564c13a8103939113437c124e2a9900a0e 3.29.4: sha256:c7798ef7817bb67f84d54aef661066e64f957977fc80f88b49be2b13a3492d06 3.29.3: sha256:edb98d2a0d3f8afbf98eb000f0d535d4678af39dd6e10a09ea5615a4824f692f @@ -522,11 +524,6 @@ calicoctl_binary_checksums: 3.28.2: sha256:9889a2f9c26ae82a501b33440b3a0772f552a4ece128cd57a21e395452b4238f 3.28.1: sha256:985caad36fed7b883a2cd4cf91e556974bcca95fe4e6b7ff4cb64d8d8fbe9223 3.28.0: sha256:0789cb0d1478ec3f0a44db265b19042be9dfc18bc1776343c7ea8d246561d12b - 3.27.5: sha256:7b8c8936e55e319b94d1fb71dacbef7617661f76241a4ed16289b5a2165fa62d - 3.27.4: sha256:1d44e119d9836eb4715f42a915a849377f7d6a6881b73ce66d0c95092e29d4f2 - 3.27.3: sha256:5f2ac510c0ec31ec4c02ff2660f2502b68b655616d5b766a51bd99d2e3604fbc - 3.27.2: sha256:f918bb88de1d01de3d143e1e75d0ee1256f247c5cbabec7d665aaf8d1fd3cc6c - 3.27.0: sha256:3de46d8bc30c6f9d9387d484ed62a5655c1f204b1b831b5a90f0a0d1c1ffd752 ciliumcli_binary_checksums: arm64: 0.18.6: sha256:7639c69b410c26d0276fe1297d53e9573f094b56822bd01e85153acb3ca7dd43 @@ -616,6 +613,10 @@ ciliumcli_binary_checksums: 0.15.15: sha256:492279c1f960c79747290a5d1e1b21084a04a93f9e13ab4ae7df4c76fe808aff calico_crds_archive_checksums: no_arch: + 3.30.3: sha256:f24ef6afead1443b816fcfc9a6f9fdadb335a3dfab5255a2e2da2cb4fc3b5e30 + 3.30.2: sha256:40885e201efb3458bb2e145928aadbe63d6a54c00dd505323776cc9cddc02825 + 3.30.1: sha256:3040a1d313bafd30e4e2dea24c2155c8d1afbe3c6e961e0a4a52482d12b32490 + 3.30.0: sha256:7373910b311213d00cb6f079690c90071b68724cd01b1b4eba04831c26454e1a 3.29.5: sha256:f36d0b31aaa34f648b211d16f864f262e4700aad30ab0889b327d31c115b6a42 3.29.4: sha256:6d2396fde36ba59ad55a92b5b66643adcc9ee13bb2b3986b1014e2f8f95fa861 3.29.3: sha256:66d49b3af986944e58fede252a2c164251a63f43894181ed7401a6e11dcd8421 @@ -628,12 +629,6 @@ calico_crds_archive_checksums: 3.28.2: sha256:f02a0e99e060850bd9050d4c94d37df899911a5e357e1d26e1b5b79a923bb389 3.28.1: sha256:c56f1530e7ded9d5b4afb9d83a7a24da6d2959ef7ad38521813f1c2bf138182d 3.28.0: sha256:ee721337db0cd847e91aae1cdfd420596896ebcb865575fd913c2f12ac2cdb76 - 3.27.5: sha256:f9cca65b96ab05732ed1902afd0f3086be54d6bb6b47c86a289ecf4ea5cdc25d - 3.27.4: sha256:5f6ac510bd6bd8c14542afe91f7dbcf2a846dba02ae3152a3b07a1bfdea96078 - 3.27.3: sha256:d11a32919bff389f642af5df8180ad3cec586030decd35adb2a7d4a8aa3b298e - 3.27.2: sha256:8154bb4aad887f2a5500b505fe203a918f72c4e602b04c688c4b94f76a26e925 - 3.27.1: sha256:76abb0db222af279e3514cfae02be9259097b565bbb2ffcb776ca00566480edb - 3.27.0: sha256:2a4b5132035dfd6ac4abc8d545f33de139350eca523e0c5cfe4ac32e43fcb2f1 helm_archive_checksums: arm: 3.18.4: sha256:34ea88aef15fd822e839da262176a36e865bb9cfdb89b1f723811c0cc527f981 diff --git a/roles/network_plugin/calico/templates/calico-cr.yml.j2 b/roles/network_plugin/calico/templates/calico-cr.yml.j2 index 96f59df29..cc0f7d9d3 100644 --- a/roles/network_plugin/calico/templates/calico-cr.yml.j2 +++ b/roles/network_plugin/calico/templates/calico-cr.yml.j2 @@ -90,6 +90,7 @@ rules: - apiGroups: ["policy.networking.k8s.io"] resources: - adminnetworkpolicies + - baselineadminnetworkpolicies verbs: - watch - list @@ -121,8 +122,11 @@ rules: - ipreservations - ipamblocks - globalnetworkpolicies - - globalnetworksets + - stagedglobalnetworkpolicies - networkpolicies + - stagednetworkpolicies + - stagedkubernetesnetworkpolicies + - globalnetworksets - networksets - clusterinformations - hostendpoints