fix(blockTypes/kubectl): polish off the kubectl block type

Author: blaggacao

src/std/fwlib/blockTypes/kubectl.nix

@@ -62,7 +62,7 @@ in
           echo
           rm -rf "$manifest_path"
           mkdir -p "$manifest_path"
-          ln -sf "${manifestsWithGitRevision target}" "$manifest_path"
+          ln -s "${manifestsWithGitRevision target}"/* "$manifest_path"
           echo
           echo "Manifests built in: $manifest_path"
         }
@@ -77,35 +77,33 @@ in
         ${render}
         render
       '' {})
-      (mkCommand currentSystem "apply" "Apply the manifests to K8s" [pkgs.kubectl pkgs.jq] ''
+      (mkCommand currentSystem "diff" "Diff the manifests against the cluster" [pkgs.kubectl] ''
         ${render}
         render
 
         diff() {
-          if ! [[ -v CI ]]; then
-            kubectl diff --server-side=true --field-manager="std-action-in-ci" \
-              --filename "$manifest_path" --recursive;
-          else
-            kubectl diff --server-side=true --field-manager="std-action-$(whoami)" \
-              --filename "$manifest_path" --recursive;
-          fi
+          kubectl diff --server-side=true --field-manager="std-action-$(whoami)" \
+            --filename "$manifest_path" --recursive;
+        }
+
+        diff
+      '' {})
+      (mkCommand currentSystem "apply" "Apply the manifests to K8s" [pkgs.kubectl] ''
+        ${render}
+        render
+
+        diff() {
+          kubectl diff --server-side=true --field-manager="std-action-$(whoami)" \
+            --filename "$manifest_path" --recursive;
         }
 
         run() {
-          if ! [[ -v CI ]]; then
-            kubectl apply --server-side=true --field-manager="std-action-in-ci" \
-              --filename "$manifest_path" --recursive;
-          else
-            kubectl apply --server-side=true --field-manager="std-action-$(whoami)" \
-              --filename "$manifest_path" --recursive;
-          fi
+          kubectl apply --server-side=true --field-manager="std-action-$(whoami)" \
+            --filename "$manifest_path" --recursive;
         }
 
-        if diff; then
-          ${askUserToProceedSnippet "apply" "run"}
-        else
-          echo "Deployment hasn't changed since last deployment, nothing to deploy"
-        fi
+        diff
+        ${askUserToProceedSnippet "apply" "run"}
       '' {})
       (mkCommand currentSystem "explore" "Interactively explore the manifests" [pkgs.fx] ''
         fx ${

src/std/fwlib/blockTypes/nomad.nix

@@ -48,7 +48,7 @@ in
         render() {
           echo "Rendering to $job_path..."
           rm -rf "$job_path"
-          ln -sf "${jobWithGitRevision target}" "$job_path"
+          ln -s "${jobWithGitRevision target}" "$job_path"
           if status=$(nomad validate "$job_path"); then
             echo "$status for $job_path"
           fi