fix(kubectl): diff action and differ command

divnix · Aug 21, 2023 · 460d53a · 460d53a
1 parent f6e09ec
commit 460d53a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/std/fwlib/blockTypes/kubectl.nix b/src/std/fwlib/blockTypes/kubectl.nix
@@ -123,11 +123,11 @@ in
         ${build}
         build
 
-        KUBECTL_EXTERNAL_DIFF="icdiff -N -u"
+        KUBECTL_EXTERNAL_DIFF="icdiff -N -r"
         export KUBECTL_EXTERNAL_DIFF
 
         diff() {
-          kubectl diff --server-side=true --field-manager="std-action-$(whoami)" ${
+          kubectl diff ${
           if usesKustomize
           then "--kustomize"
           else "--filename --recursive"
@@ -140,7 +140,7 @@ in
         ${build}
         build
 
-        KUBECTL_EXTERNAL_DIFF="icdiff -N -u"
+        KUBECTL_EXTERNAL_DIFF="icdiff -N -r"
         export KUBECTL_EXTERNAL_DIFF
 
         diff() {