From b00a5b18480b4035d99af6f53f85ef34a22ee7a4 Mon Sep 17 00:00:00 2001 From: Jashandeep Sohi Date: Wed, 12 Feb 2025 10:30:20 -0800 Subject: [PATCH] remove option to enable/disable k8s dashboard Setting this to different values in two different devenv will just lead to clobbering. --- local-cluster/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/local-cluster/default.nix b/local-cluster/default.nix index fbd5b38..607efc7 100644 --- a/local-cluster/default.nix +++ b/local-cluster/default.nix @@ -4,9 +4,6 @@ let in { options.devenv-k8s.local-cluster = { enable = lib.mkEnableOption "Setup the local development K8s cluster"; - dashboard = { - disable = lib.mkEnableOption "Disable K8s dashboard"; - }; }; config = lib.mkIf cfg.enable { @@ -14,11 +11,9 @@ in { export KUBECONFIG=~/.kube/config-devenv-k8s local-cluster-up || exit 1 - ${if !cfg.dashboard.disable then '' - echo "" - echo "K8s dashboard running at https://k8s.local.lco.earth" - echo "" - '' else ""} + echo + echo "K8s dashboard is running at https://k8s.local.lco.earth" + echo ''; tasks = { @@ -27,12 +22,12 @@ in { before = [ "devenv:enterShell" ]; }; - "devenv-k8s:local-cluster:updateLocalLcoEarthCert" = lib.mkIf (!cfg.dashboard.disable) { + "devenv-k8s:local-cluster:updateLocalLcoEarthCert" = { exec = "local-cluster-update-local-lco-earth-cert"; before = [ "devenv-k8s:local-cluster:setupNginxIngress" ]; }; - "devenv-k8s:local-cluster:setupK8sDashboard" = lib.mkIf (!cfg.dashboard.disable) { + "devenv-k8s:local-cluster:setupK8sDashboard" = { exec = "local-cluster-k8s-dashboard-up"; before = [ "devenv-k8s:local-cluster:setupNginxIngress" ]; };