From a2ede48823064429a925fd4977128811948b3f60 Mon Sep 17 00:00:00 2001 From: Kartik Shah Date: Mon, 30 Sep 2024 09:49:16 +0000 Subject: [PATCH] chore: update flake.lock and switch to tofu (#7091) * chore: update flake.lock and switch to tofu * chore: update k3s image to 1.30 --- dev/Makefile | 2 +- flake.lock | 12 ++++++------ flake.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev/Makefile b/dev/Makefile index 10daa3e1e8..a4d5f79311 100644 --- a/dev/Makefile +++ b/dev/Makefile @@ -2,7 +2,7 @@ TF:=terraform REPO:=$(shell git rev-parse --show-toplevel) create-cluster: - k3d cluster create --image rancher/k3s:v1.27.4-k3s1 -v "$(REPO):/charts" \ + k3d cluster create --image rancher/k3s:v1.30.4-k3s1 -v "$(REPO):/charts" \ --k3s-arg "--disable=traefik@server:0" \ --k3s-arg "--disable=servicelb@server:0" diff --git a/flake.lock b/flake.lock index 01bc733692..ccdee2db9e 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693355128, - "narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=", + "lastModified": 1727617520, + "narHash": "sha256-uNfh3aMyCekMpjtL/PZtl2Hz/YqNuUpCBEzVxt1QYck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9", + "rev": "7eee17a8a5868ecf596bbb8c8beb527253ea8f4d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e5f20afd0c..a96d91b70f 100644 --- a/flake.nix +++ b/flake.nix @@ -32,11 +32,11 @@ ytt yq-go kubernetes-helm - terraform + opentofu ]; shellHook = '' - alias tf=terraform + alias tf=tofu alias k=kubectl ''; });