diff --git a/default.nix b/default.nix index d8cd015bd..bf27afb64 100644 --- a/default.nix +++ b/default.nix @@ -26,8 +26,8 @@ rec { env = pkgs.buildEnv { name = "wire-server-deploy"; paths = with pkgs; [ - pythonForAnsible ansible_2_15 + pythonForAnsible jmespath apacheHttpd awscli2 diff --git a/nix/pkgs/kubernetes-tools.nix b/nix/pkgs/kubernetes-tools.nix index fbed0d390..9e46d26ea 100644 --- a/nix/pkgs/kubernetes-tools.nix +++ b/nix/pkgs/kubernetes-tools.nix @@ -9,7 +9,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-dLbKzPBMN8w+BA3lQUq6uYr+QoXGMm6SKaWGbYBTH0A="; + hash = "sha256-7juoX4nFvQbIIbhTlnIYVUEYUJGwu+aKrpw4ltujjXI="; }; vendorSha256 = null; diff --git a/nix/pkgs/wire-binaries.nix b/nix/pkgs/wire-binaries.nix index dbb1299be..d4fb19f84 100644 --- a/nix/pkgs/wire-binaries.nix +++ b/nix/pkgs/wire-binaries.nix @@ -6,7 +6,7 @@ let image_arch = "amd64"; # These values are manually kept in sync with: - # https://github.com/kubernetes-sigs/kubespray/blob/release-2.20/roles/download/defaults/main.yml + # https://github.com/kubernetes-sigs/kubespray/blob/release-2.24/roles/kubespray-defaults/defaults/main/download.yml # TODO: Find a better process. Automate this! kube_version = "v1.28.2"; etcd_version = "v3.5.9"; diff --git a/offline/ci.sh b/offline/ci.sh index 7c46260ec..34feeb5b2 100755 --- a/offline/ci.sh +++ b/offline/ci.sh @@ -32,7 +32,7 @@ rm -r binaries function list-system-containers() { # These are manually updated with values from -# https://github.com/kubernetes-sigs/kubespray/blob/release-2.15/roles/download/defaults/main.yml +# https://github.com/kubernetes-sigs/kubespray/blob/release-2.24/roles/kubespray-defaults/defaults/main/download.yml # TODO: Automate this. This is very wieldy :) cat <