Unverified Commit 203b1670 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

k3s_1_34: init at 1.34.1+k3s1 (#451748)

parents 2fa7e7f0 d3b416da

pkgs/applications/networking/cluster/k3s/1_34/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-34.2.1+up34.2.0.tgz";

    sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z";

  };

  traefik = {

    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz";

    sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw";

  };

}

pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/scripts/package-cli b/scripts/package-cli

index a15d754926..bc450dbe4e 100755

--- a/scripts/package-cli

+++ b/scripts/package-cli

@@ -3,7 +3,10 @@ set -e -x

 

 cd $(dirname $0)/..

 

+runc_require=$(grep "github.com/opencontainers/runc" go.mod | awk -F '=> ' '{print $2}' | xargs -0 printf 'require %s')

+echo "$runc_require" >> go.mod

 . ./scripts/version.sh

+sed -i '$d' go.mod

 

 GO=${GO-go}

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

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

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

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

    "sha256": "076c53d96bbca9ed7aee5a4e398933787c55c59fd58e617581ce885e22759793"

  },

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

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

    "sha256": "27355d2838c727180f0a8ded8aec0ac14e2186bd50487a3c3f29500884121aa7"

  },

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

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

    "sha256": "7292bafb04a8800b7efdc096a4e4f00d972dcf9a009f7ccca311a0bc9b23eda1"

  },

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

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

    "sha256": "64e166d1b037ed87566c444261365bdd54745de6cf8acf1ae4698ddf34ca69a7"

  },

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

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

    "sha256": "b1f649125466251088aec6fcd56b86df29d7674eb3ae6ab596448ddfd60cc9e0"

  },

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

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

    "sha256": "78380791cb61262b78d61c2b52fd77e0eedde6c0351e53d11e2cfb9034ec5937"

  }

}

pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
diff --git a/scripts/version.sh b/scripts/version.sh

index 37500a3b788d..96a6e6205472 100755

--- a/scripts/version.sh

+++ b/scripts/version.sh

@@ -10,11 +10,11 @@ if [ -z "$NO_DAPPER" ]; then

 fi



 get-module-version(){

-  go list -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1

+  go list -mod=readonly -e -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1

 }



 get-module-path(){

-  go list -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1

+  go list -mod=readonly -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1

 }



 PKG_CONTAINERD_K3S=$(get-module-path github.com/containerd/containerd/v2)

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

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

  k3sVersion = "1.34.1+k3s1";

  k3sCommit = "24fc436e6ea59c56ebc37727baa4e6c9a201ee01";

  k3sRepoSha256 = "0fjkjsmig7xdn1filph2wbp69jva0jdkv8ax68wymvbqq4rn3s0k";

  k3sVendorHash = "sha256-87YMUWhwfFwm5bzcL42b7JFJbVWsoRtubH4jjYH/7mc=";

  chartVersions = import ./chart-versions.nix;

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

  k3sRootVersion = "0.15.0";

  k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";

  k3sCNIVersion = "1.7.1-k3s1";

  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";

  containerdVersion = "2.1.4-k3s2";

  containerdSha256 = "18z6i6mzvllhglarsc6npn4k0m4akg7wm1rqc4a926dag47mgh8j";

  criCtlVersion = "1.34.0-k3s2";

}