Commit d3da7528 authored by Robert Rose's avatar Robert Rose
Browse files

k3s_1_31: init 1.31.0+k3s1 

Release: https://github.com/k3s-io/k3s/releases/tag/v1.31.0%2Bk3s1
parent de4b0a02

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

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

  traefik-crd = {

    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";

    sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";

  };

  traefik = {

    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";

    sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";

  };

}

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

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

  "airgap-images-amd64": {

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

    "sha256": "13pakr8nxlbqhqcz40gyjncw4bghk7x7ryb2ynmr5airspqcdrl6"

  },

  "airgap-images-arm": {

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

    "sha256": "0vc2v89qy9gbzfbmfrdb0l5yzyprk7yma5ps0yfj60jd9av07qvh"

  },

  "airgap-images-arm64": {

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

    "sha256": "10ffa45pm1scavcd5cimdaw29rlc55c9i40qzh3n3451g1yqlmmk"

  },

  "images-list": {

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

    "sha256": "0y4x02fj1iysghq6s88wsiqfpsajrrwrg89m59qk431cii23nrza"

  }

}

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

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

  k3sVersion = "1.31.0+k3s1";

  k3sCommit = "34be6d96d17d8d65fda86272b62b752cb0e9c45e";

  k3sRepoSha256 = "16yzsx56jmca07jdnzjvy4pcfrvvibv987l1mzdaws1vkm3xqfnw";

  k3sVendorHash = "sha256-1uYlvGkW6n4aiUVX/2OjppczdobY/fk1ZaK6j3AEwvM=";

  chartVersions = import ./chart-versions.nix;

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

  k3sRootVersion = "0.14.0";

  k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";

  k3sCNIVersion = "1.4.0-k3s2";

  k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";

  containerdVersion = "1.7.20-k3s1";

  containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i";

  criCtlVersion = "1.31.0-k3s2";

}

pkgs/applications/networking/cluster/k3s/builder.nix

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ let 
    sed --quiet '/# --- run the install process --/q;p' ${k3sRepo}/install.sh > install.sh



    # Let killall expect "containerd-shim" in the Nix store

    to_replace="k3s/data/\[\^/\]\*/bin/containerd-shim"

    to_replace="/data/\[\^/\]\*/bin/containerd-shim"

    replacement="/nix/store/.*k3s-containerd.*/bin/containerd-shim"

    changes=$(sed -i "s|$to_replace|$replacement| w /dev/stdout" install.sh)

    if [ -z "$changes" ]; then

pkgs/applications/networking/cluster/k3s/default.nix

+10 −0
Original line number Diff line number Diff line
@@ -43,4 +43,14 @@ in 
      ];

    }

  ) extraArgs;



  k3s_1_31 = common (

    (import ./1_31/versions.nix)

    // {

      updateScript = [

        ./update-script.sh

        "31"

      ];

    }

  ) extraArgs;

}