diff --git a/.envrc b/.envrc index 91b1dd10..c9d06a1c 100644 --- a/.envrc +++ b/.envrc @@ -1,6 +1,6 @@ #shellcheck disable=SC2148,SC2155 export KUBECONFIG="$(expand_path ./kubeconfig)" export SOPS_AGE_KEY_FILE="$(expand_path ./age.key)" -export TALOSCONFIG="$(expand_path ./talosconfig.yaml)" +export TALOSCONFIG="$(expand_path ./kubernetes/bootstrap/talos/clusterconfig/talosconfig)" export OMNICONFIG="$(expand_path ./omniconfig.yaml)" use nix diff --git a/kubernetes/bootstrap/helmfile.yaml b/kubernetes/bootstrap/helmfile.yaml index 4471c41e..ae209422 100644 --- a/kubernetes/bootstrap/helmfile.yaml +++ b/kubernetes/bootstrap/helmfile.yaml @@ -18,17 +18,17 @@ releases: namespace: kube-system chart: cilium/cilium version: 1.15.6 - values: ["../../../apps/kube-system/cilium/app/resources/values.yml"] + values: ["../apps/kube-system/cilium/app/resources/values.yml"] wait: true - name: kubelet-csr-approver namespace: kube-system chart: postfinance/kubelet-csr-approver version: 1.2.2 - values: ["../../../apps/kube-system/kubelet-csr-approver/app/helm-values.yaml"] + values: ["../apps/kube-system/kubelet-csr-approver/app/helm-values.yaml"] needs: ["cilium"] - name: spegel namespace: kube-system chart: oci://ghcr.io/spegel-org/helm-charts/spegel version: v0.0.23 - values: ["../../../apps/kube-system/spegel/app/resources/values.yml"] + values: ["../apps/kube-system/spegel/app/resources/values.yml"] wait: true diff --git a/shell.nix b/shell.nix index 96492322..c98e7cf9 100644 --- a/shell.nix +++ b/shell.nix @@ -5,15 +5,17 @@ pkgs.mkShell { NIX_CONFIG = "experimental-features = nix-command flakes"; nativeBuildInputs = with pkgs; [ + fluxcd git - go-task - sops - pre-commit gitleaks + go-task + helmfile k9s kubectl kubevirt - fluxcd + kubernetes-helm + pre-commit + sops ]; # Possible inputs needed. Keeping here for posterity # age