Upgrade kubernetes/containerd versions

Author: simonswine

flake.nix

@@ -180,10 +180,10 @@
           inch-exporter = pkgs.inch-exporter;
           intel-gpu-exporter = pkgs.intel-gpu-exporter;
           jsonnet-language-server = pkgs.jsonnet-language-server;
-          kubernetes-1-31 = pkgs.kubernetes-1-31;
           kubernetes-1-32 = pkgs.kubernetes-1-32;
           kubernetes-1-33 = pkgs.kubernetes-1-33;
           kubernetes-1-34 = pkgs.kubernetes-1-34;
+          kubernetes-1-35 = pkgs.kubernetes-1-35;
           mi-flora-exporter = pkgs.mi-flora-exporter;
           miio = pkgs.miio;
           modbus-exporter = pkgs.modbus-exporter;

overlays/containerd/default.nix

@@ -1,11 +1,11 @@
 self: super: {
   containerd = super.containerd.overrideAttrs (old: rec {
-    version = "2.1.5";
+    version = "2.2.1";
     src = super.fetchFromGitHub {
       owner = "containerd";
       repo = "containerd";
       rev = "v${version}";
-      hash = "sha256-P948Rn11kAENAX3qHrSmIdV6VgybbuHdOTAgcYWk2bg=";
+      hash = "sha256-fDOfN0XESrBTDW7Nxj9niqU93BQ5/JaGLwAR3u6Xaik=";
     };
     makeFlags =
       builtins.filter (

overlays/kubernetes/default.nix

@@ -45,23 +45,23 @@ let
     });
 in
 {
-  kubernetes-1-31 = kubernetesVersion {
-    kver = "1.31.14";
-    khash = "rfYv9VlXKdQNcR1AiMv7wVeyJYHq5qJPw9g15sn3U40=";
-  };
-
   kubernetes-1-32 = kubernetesVersion {
-    kver = "1.32.10";
-    khash = "8N6Qo0Qqg+lTvBzA6H6lOTWSMxUbjQh1U4iqZ2V679c=";
+    kver = "1.32.11";
+    khash = "/Hg0yf7Y8My+g3w36fA94ozCzhmI0sMjpF7FPZ/UykY=";
   };
 
   kubernetes-1-33 = kubernetesVersion {
-    kver = "1.33.6";
-    khash = "ywmaMRtq/HqkHO4CGspL4AYcn4IbFzAzA0xZRmAgCWE=";
+    kver = "1.33.7";
+    khash = "439MCwbt6XRhKi+6wbyro33ptS//uIv0TeL2NQ/tD7M=";
   };
 
   kubernetes-1-34 = kubernetesVersion {
-    kver = "1.34.2";
-    khash = "3rQyoGt9zTeF8+PIhA5p+hHY1V5O8CawvKWscf/r9RM=";
+    kver = "1.34.3";
+    khash = "1X2kxUi7jNnyTNo+ZGZmhU5DHVl98eYOrJ4qpjzqqjE=";
+  };
+
+  kubernetes-1-35 = kubernetesVersion {
+    kver = "1.35.0";
+    khash = "AT1/4RhnVK/mAoNVqPIfSwbzD8VNRqKumOpE0fidJ74=";
   };
 }

targets/generic/kubernetes.nix

@@ -6,7 +6,7 @@
 
   virtualisation.containerd-kubelet.enable = true;
   services.kubernetes.kubelet-kubeadm.enable = true;
-  services.kubernetes.package = pkgs.kubernetes-1-32;
+  services.kubernetes.package = pkgs.kubernetes-1-33;
   services.prometheus-node-exporter-zfs = {
     enable = true;
     extraArgs = [