use cwd instead of home directory for kotsadm and app manifests (#2029)

* use cwd instead of home directory for kotsadm and app manifests
replicatedhq · Aug 4, 2021 · 55dee34 · 55dee34
1 parent 2fae75b
commit 55dee34
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -622,7 +622,7 @@ jobs:
           kubectl create ns nginx-test
           kubectl create ns redis-test
           kubectl create ns postgres-test
-          kustomize build $HOME/$APP_SLUG/overlays/midstream | kubectl apply -f -
+          kustomize build $PWD/$APP_SLUG/overlays/midstream | kubectl apply -f -
 
           EXIT_CODE=$?
           if [ $EXIT_CODE -ne 0 ]; then

diff --git a/cmd/kots/cli/admin-generate-manifests.go → ...s/cli/admin-console-generate-manifests.go b/cmd/kots/cli/admin-generate-manifests.go → ...s/cli/admin-console-generate-manifests.go
@@ -60,7 +60,7 @@ func AdminGenerateManifestsCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().String("rootdir", homeDir(), "root directory that will be used to write the yaml to")
+	cmd.Flags().String("rootdir", ".", "root directory that will be used to write the yaml to")
 	cmd.Flags().String("http-proxy", "", "sets HTTP_PROXY environment variable in all KOTS Admin Console components")
 	cmd.Flags().String("https-proxy", "", "sets HTTPS_PROXY environment variable in all KOTS Admin Console components")
 	cmd.Flags().String("no-proxy", "", "sets NO_PROXY environment variable in all KOTS Admin Console components")

diff --git a/cmd/kots/cli/download.go b/cmd/kots/cli/download.go
@@ -55,13 +55,7 @@ func DownloadCmd() *cobra.Command {
 		},
 	}
 
-	defaultDest := homeDir()
-	cwd, err := os.Getwd()
-	if err == nil {
-		defaultDest = cwd
-	}
-
-	cmd.Flags().String("dest", defaultDest, "the directory to store the application in")
+	cmd.Flags().String("dest", ".", "the directory to store the application in")
 	cmd.Flags().Bool("overwrite", false, "overwrite any local files, if present")
 	cmd.Flags().String("slug", "", "the application slug to download")
 	cmd.Flags().Bool("decrypt-password-values", false, "decrypt password values to plaintext")

diff --git a/cmd/kots/cli/pull.go b/cmd/kots/cli/pull.go
@@ -98,7 +98,7 @@ func PullCmd() *cobra.Command {
 
 	cmd.Flags().StringSlice("set", []string{}, "values to pass to helm when running helm template")
 	cmd.Flags().String("repo", "", "repo uri to use when downloading a helm chart")
-	cmd.Flags().String("rootdir", homeDir(), "root directory that will be used to write the yaml to")
+	cmd.Flags().String("rootdir", ".", "root directory that will be used to write the yaml to")
 	cmd.Flags().StringP("namespace", "n", "default", "namespace to render the upstream to in the base")
 	cmd.Flags().StringSlice("downstream", []string{}, "the list of any downstreams to create/update")
 	cmd.Flags().String("local-path", "", "specify a local-path to pull a locally available replicated app (only supported on replicated app types currently)")