Unverified Commit 0b6cc046 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #312795 from wrmilling/k3s-remove-1.26 

k3s_1_26: remove package
parents c51c1380 d95a9f09

pkgs/applications/networking/cluster/k3s/1_26/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-25.0.2+up25.0.0.tgz";

    sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq";

  };

  traefik = {

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

    sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89";

  };

}

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

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

  k3sVersion = "1.26.15+k3s1";

  k3sCommit = "132972364806998c35d250153e2af245f9ecf18d";

  k3sRepoSha256 = "13iwmjxyf71l2g66kxdivnj21bf9lmr5p4qlp8kmysm23w2badj9";

  k3sVendorHash = "sha256-xoscRchOK4p3d1DAnxbJq7oIvxIn1twePmOBDdfXzw8=";

  chartVersions = import ./chart-versions.nix;

  k3sRootVersion = "0.12.2";

  k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";

  k3sCNIVersion = "1.4.0-k3s2";

  k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";

  containerdVersion = "1.7.11-k3s2.26";

  containerdSha256 = "0413a81kzb05xkklwyngg8g6a0w4icsi938rim69jmr2sijc89ww";

  criCtlVersion = "1.26.0-rc.0-k3s1";

}

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

+3 −14
Original line number Diff line number Diff line
@@ -12,17 +12,7 @@ let 
  extraArgs = builtins.removeAttrs args [ "callPackage" ];

in

{

  k3s_1_26 = common (

    (import ./1_26/versions.nix)

    // {

      updateScript = [

        ./update-script.sh

        "26"

      ];

    }

  ) extraArgs;



  # 1_27 can be built with the same builder as 1_26

  # 1_27 can be built with the same builder as 1_30

  k3s_1_27 = common (

    (import ./1_27/versions.nix)

    // {
@@ -33,7 +23,7 @@ in 
    }

  ) extraArgs;



  # 1_28 can be built with the same builder as 1_26

  # 1_28 can be built with the same builder as 1_30

  k3s_1_28 = common (

    (import ./1_28/versions.nix)

    // {
@@ -44,7 +34,7 @@ in 
    }

  ) extraArgs;



  # 1_29 can be built with the same builder as 1_26

  # 1_29 can be built with the same builder as 1_30

  k3s_1_29 = common (

    (import ./1_29/versions.nix)

    // {
@@ -55,7 +45,6 @@ in 
    }

  ) extraArgs;



  # 1_30 can be built with the same builder as 1_26

  k3s_1_30 = common (

    (import ./1_30/versions.nix)

    // {

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -32047,7 +32047,7 @@ with pkgs; 
  inherit (callPackage ../applications/networking/cluster/k3s {

    buildGoModule = buildGo121Module;

    go = go_1_21;

  }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29;

  }) k3s_1_27 k3s_1_28 k3s_1_29;

  inherit (callPackage ../applications/networking/cluster/k3s {

    buildGoModule = buildGo122Module;

    go = go_1_22;