Unverified Commit f90d0af5 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

k3s: update to latest versions (#404341)

parents 34c9f250 b97665a7

nixos/tests/k3s/airgap-images.nix

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import ../make-test-python.nix ( 


      start_all()

      machine.wait_for_unit("k3s")

      machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"", timeout=120)

      machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"")

      images = json.loads(machine.succeed("crictl img -o json"))

      image_names = [i["repoTags"][0] for i in images["images"]]

      with open("${k3s.imagesList}") as expected_images:

pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
{

  traefik-crd = {

    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";

    sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";

  };

  traefik = {

    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";

    sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";

  };

}

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

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
{

  "airgap-images-amd64": {

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

    "sha256": "b3b340da3d88c6723f18cf6219edf50745d5a749cb552bd2d3eee0b1281dd5a2"

  },

  "airgap-images-arm": {

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

    "sha256": "571f0addf5253ed0e98864157c885fbd14fc67f8efcfd638cc36ade48f903b8c"

  },

  "airgap-images-arm64": {

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

    "sha256": "f2fc003d8ec5c1ac66d0eeb9e410a443a0af3f5b23367d3578c55c6e9e0c618a"

  },

  "images-list": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-images.txt",

    "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1"

  }

}

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

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
{

  k3sVersion = "1.29.15+k3s1";

  k3sCommit = "35a47239188444222067c25cc096346adb20401f";

  k3sRepoSha256 = "0vynlcnmhhf82hr2rv01km5jyp2c2zb7872nnd8kzdxdw3jcqp7x";

  k3sVendorHash = "sha256-+es8ua7JuDnUXej6hqE1ooFS81NhuoYYuA2+4CgUOmU=";

  chartVersions = import ./chart-versions.nix;

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

  k3sRootVersion = "0.14.1";

  k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";

  k3sCNIVersion = "1.6.0-k3s1";

  k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";

  containerdVersion = "1.7.26-k3s1";

  containerdSha256 = "0snz0i7xmnvs8bj7140q0lsxqdv835hksvk36baw71w5mbm1w1xz";

  criCtlVersion = "1.29.0-k3s1";

}

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

+8 −8
Original line number Diff line number Diff line 
{

  "airgap-images-amd64": {

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

    "sha256": "aba20bf6082fdccafc36c1ba79ba2705b2ef6f159a3455585c98cf128e767986"

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

    "sha256": "1c5efab645244d13cda7111a456aff796dfb4645c845df82266c4da56d3db2a7"

  },

  "airgap-images-arm": {

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

    "sha256": "658aa3c0672f2eb3305b262a7187d0fa7fa2759dccdca196612472a9fcc4fd48"

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

    "sha256": "df41354c497c8c2514b247c237415d721fb1381bb821c00af59526ba2ef1e8e8"

  },

  "airgap-images-arm64": {

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

    "sha256": "f92a63c9f570afd4a9f33b69a441ce057ee4d31359026e9b699f519ae7b8a81a"

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

    "sha256": "041a626ab65e9f61bdc67e664649bc8dc434cc9f89da15611660967a1d156fa3"

  },

  "images-list": {

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-images.txt",

    "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1"

    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-images.txt",

    "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9"

  }

}