treewide: bump to k8s v1.33.2
Update Kubernetes to 1.33 which is already at patch version 2. As part
of K8s gomod dependencies containerd was bumped a minor release to 2.1.3.
The UserNamespacesSupport feature gate is now default-on and was thus
dropped. The netlink patches were upstreamed and can now be dropped as
part of the depenency update. A new klog sink adapter for our logging
interface was introduced as the client-go MutationCache now requires a
logger.
containerd abuses gRPC interfaces for mocking, thus they are not
forward-compatible and need a new patch to be compatible with the
CRI version now being used.
Change-Id: I4feb2ab3bcfca5b83c7ea38ed444b14ade1e9bf0
Reviewed-on: https://review.monogon.dev/c/monogon/+/4433
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/third_party/com_github_containernetworking_plugins/cniplugins-add-linkgroup.patch b/third_party/com_github_containernetworking_plugins/cniplugins-add-linkgroup.patch
index f294550..ec83ddd 100644
--- a/third_party/com_github_containernetworking_plugins/cniplugins-add-linkgroup.patch
+++ b/third_party/com_github_containernetworking_plugins/cniplugins-add-linkgroup.patch
@@ -8,10 +8,10 @@
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/plugins/main/ptp/ptp.go b/plugins/main/ptp/ptp.go
-index 129146f2..aee37b11 100644
+index 9c88d901..e0b283c5 100644
--- a/plugins/main/ptp/ptp.go
+++ b/plugins/main/ptp/ptp.go
-@@ -46,6 +46,7 @@ type NetConf struct {
+@@ -47,6 +47,7 @@ type NetConf struct {
IPMasq bool `json:"ipMasq"`
IPMasqBackend *string `json:"ipMasqBackend,omitempty"`
MTU int `json:"mtu"`
@@ -19,16 +19,16 @@
}
func setupContainerVeth(netns ns.NetNS, ifName string, mtu int, pr *current.Result) (*current.Interface, *current.Interface, error) {
-@@ -145,7 +146,7 @@ func setupContainerVeth(netns ns.NetNS, ifName string, mtu int, pr *current.Resu
+@@ -146,7 +147,7 @@ func setupContainerVeth(netns ns.NetNS, ifName string, mtu int, pr *current.Resu
return hostInterface, containerInterface, nil
}
-func setupHostVeth(vethName string, result *current.Result) error {
+func setupHostVeth(vethName string, group int, result *current.Result) error {
// hostVeth moved namespaces and may have a new ifindex
- veth, err := netlink.LinkByName(vethName)
+ veth, err := netlinksafe.LinkByName(vethName)
if err != nil {
-@@ -177,6 +178,12 @@ func setupHostVeth(vethName string, result *current.Result) error {
+@@ -178,6 +179,12 @@ func setupHostVeth(vethName string, result *current.Result) error {
}
}
@@ -41,7 +41,7 @@
return nil
}
-@@ -224,7 +231,7 @@ func cmdAdd(args *skel.CmdArgs) error {
+@@ -225,7 +232,7 @@ func cmdAdd(args *skel.CmdArgs) error {
return err
}