Unverified Commit 1d27f00d authored by rorosen's avatar rorosen Committed by GitHub
Browse files

k3s: update `k3s_1_32`, `k3s_1_33` and `k3s_1_34` (#491421)

parents acca705f dc68ac73

nixos/tests/rancher/multi-node.nix

+0 −5
Original line number Diff line number Diff line
@@ -218,11 +218,6 @@ in 
      # wait for the agent to show up

      server.wait_until_succeeds("kubectl get node agent")



      ${lib.optionalString (rancherDistro == "k3s") ''

        for m in machines:

            m.succeed("k3s check-config")

      ''}



      server.succeed("kubectl cluster-info")

      # Also wait for our service account to show up; it takes a sec

      server.wait_until_succeeds("kubectl get serviceaccount default")

nixos/tests/rancher/single-node.nix

+0 −3
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ in 
      machine.wait_for_unit("${serviceName}")

      machine.succeed("kubectl cluster-info")

      machine.fail("sudo -u noprivs kubectl cluster-info")

      ${lib.optionalString (rancherDistro == "k3s") ''

        machine.succeed("k3s check-config")

      ''}



      # Also wait for our service account to show up; it takes a sec

      machine.wait_until_succeeds("kubectl get serviceaccount default")

pkgs/applications/networking/cluster/k3s/1_32/images-versions.json

+12 −12
Original line number Diff line number Diff line 
{

  "airgap-images-amd64-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.gz",

    "sha256": "572f512cc0bdf89213d2c532e6182d4a291663bb38a51beb57197bf3fb67dd47"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz",

    "sha256": "3f45abe980b2a6ba9ba8037d9b5a96ab199ce5ddf53c496e99087422d20f0383"

  },

  "airgap-images-amd64-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.zst",

    "sha256": "a65a1ed1cf081285d4c32ed3989d95cb0a4d90209e99a8765b65d41b02ea059d"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",

    "sha256": "924ecfe275f8e9e6c03ab52d78901cf7aa32bf5abd1c4294ac8c41d7860865b6"

  },

  "airgap-images-arm-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.gz",

    "sha256": "ffaee35854e9bfa6f34fae0a7a2ff81e8909cfb2d5a5bd65df89c03a1ceb1b3a"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm.tar.gz",

    "sha256": "fc310a93b1477a9e0e5ad21bc2e1a28dbadd7578923dff594bccc8cf90eb265b"

  },

  "airgap-images-arm-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.zst",

    "sha256": "b92568a2fa8683a5abd29c151d12f2737bf7ac961dfa615a2fa891a66f2d23cf"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",

    "sha256": "dcef1d1edf592dce46a6a039576c3169d0caf4eec165c6cbcf1dfbe019b1535d"

  },

  "airgap-images-arm64-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.gz",

    "sha256": "cc99b0211110b8dc14c47cde0fe9b93b7e36c2ead64286412a896f6aa8a722cf"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz",

    "sha256": "a5d645989991207bae3cee1597c8c581908291af912766132d99fae3b103918b"

  },

  "airgap-images-arm64-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.zst",

    "sha256": "a7ab99f7e2a6cf6ecc833c8ba67ba154b3ff186c58d574fa4bbda2e70dcb55f7"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",

    "sha256": "53e747b44505ddcc239c3d175dfa9f23b925c5018e3f878b0be87af876c4c41b"

  }

}

pkgs/applications/networking/cluster/k3s/1_32/versions.nix

+5 −5
Original line number Diff line number Diff line 
{

  k3sVersion = "1.32.11+k3s3";

  k3sCommit = "c9aa1d2889a003715698542826c2af94160ac2e5";

  k3sRepoSha256 = "0fi634dnsghjwnp07h6jhknccqlr9n5g3l34sipc41vvfmn4b0k8";

  k3sVendorHash = "sha256-qbmqzsd8oMQSFCh7HvjDiYds5gLEIGjjcv4EJbgxfJI=";

  k3sVersion = "1.32.12+k3s1";

  k3sCommit = "0dc662e80238b7b70d24ad9025a6b64292d14955";

  k3sRepoSha256 = "1pmdbzxp968hxya590qhf4sz3gx6yzpwhcg24hkfsxbm9bclrr0g";

  k3sVendorHash = "sha256-T5GGzudpTTMb2SBC6+spCo7Q/IOr6LfiWb/oWOcCOv8=";

  chartVersions = import ./chart-versions.nix;

  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);

  k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@ 
  flannelPluginVersion = "v1.9.0-flannel1";

  kubeRouterVersion = "v2.6.3-k3s1";

  criDockerdVersion = "v0.3.19-k3s2.32";

  helmJobVersion = "v0.9.12-build20251215";

  helmJobVersion = "v0.9.14-build20260210";

}

pkgs/applications/networking/cluster/k3s/1_33/images-versions.json

+12 −12
Original line number Diff line number Diff line 
{

  "airgap-images-amd64-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.gz",

    "sha256": "130a3b3e51947b7a0beffca422b85c2d3fbe78b1163a0fc069871877021123d3"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz",

    "sha256": "e4c4437580f6a2379963ed78d3a58212932fd4c917fc33c0664ce2a8b89fe389"

  },

  "airgap-images-amd64-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.zst",

    "sha256": "b0d7062008fa7fcad9ad7c6b60f74ae1c561927dbb5a4105433f5afbd091361b"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",

    "sha256": "1760ed5f74a27f4ac5ccac4f8cdf88f2cb5c3bc85ec23674bd499ae3efd93617"

  },

  "airgap-images-arm-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.gz",

    "sha256": "6451f4bd29b4ab76dcbfa520d907425976a04e9d5044b969e81fa2dfdc085c20"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm.tar.gz",

    "sha256": "6f1ff82e1845d00692f89ad12cf0b0921ae451bae18e8479334a6200312dd746"

  },

  "airgap-images-arm-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.zst",

    "sha256": "03a165ad40d022616281fbf329bcfa546b9245a9f431d1c362b86faff72d83dd"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",

    "sha256": "9ae9184211aa4b729cb3c2c659e6442c55bedc7a13720f923898b284b48b87b0"

  },

  "airgap-images-arm64-tar-gz": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.gz",

    "sha256": "6243a503de28c17f4b1b16018237a5008bc99983dc3b3b87ed2a1fe790d9e211"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz",

    "sha256": "a1a00a92559e9a966e882e871163dae7278fea5f20194a37d00cd81fae5dff84"

  },

  "airgap-images-arm64-tar-zst": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.zst",

    "sha256": "74713adf726f6b407330b93e252b7a8e0a85204137c8a6f61b66f681b5761c42"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",

    "sha256": "df4695448bd8a783cb0e6c91e40aa1abed36b921a121dd1b7f87ff3973faec27"

  }

}