Skip to content

cleanup: remove container-engine flag from the delete config #3987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nXtCyberNet wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −12
Open

cleanup: remove container-engine flag from the delete config #3987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions cmd/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ NAME
{{rootCmdUse}} cluster delete - Delete a local development cluster

SYNOPSIS
{{rootCmdUse}} cluster delete [name] [--container-engine]
{{rootCmdUse}} cluster delete [name]
[--skip-registry-config]

DESCRIPTION
Expand Down Expand Up @@ -225,14 +225,11 @@ EXAMPLES

`,

PreRunE: bindEnv("container-engine", "skip-registry-config"),
RunE: func(cmd *cobra.Command, args []string) error {
return runClusterDelete(cmd, args)
},
}

cmd.Flags().String("container-engine", "",
"Container engine: docker or podman; auto-detected if unset, preferring docker when both are installed ($FUNC_CONTAINER_ENGINE)")
cmd.Flags().Bool("skip-registry-config", false,
"Skip host registry configuration revert ($FUNC_SKIP_REGISTRY_CONFIG)")

Expand All @@ -241,13 +238,12 @@ EXAMPLES

func newClusterDeleteConfig() cluster.ClusterConfig {
return cluster.ClusterConfig{
Name: "func",
ContainerEngineOverride: viper.GetString("container-engine"),
SkipRegistryConfig: viper.GetBool("skip-registry-config"),
KubectlOverride: os.Getenv("FUNC_TEST_KUBECTL"),
KindOverride: os.Getenv("FUNC_TEST_KIND"),
ActOverride: os.Getenv("FUNC_TEST_ACT"),
GitHubActions: os.Getenv("GITHUB_ACTIONS") == "true",
Name: "func",
SkipRegistryConfig: viper.GetBool("skip-registry-config"),
KubectlOverride: os.Getenv("FUNC_TEST_KUBECTL"),
KindOverride: os.Getenv("FUNC_TEST_KIND"),
ActOverride: os.Getenv("FUNC_TEST_ACT"),
GitHubActions: os.Getenv("GITHUB_ACTIONS") == "true",
}
}

Expand Down
1 change: 0 additions & 1 deletion docs/reference/func_cluster_delete.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ func cluster delete [name]
### Options

```
--container-engine string Container engine: docker or podman ($FUNC_CONTAINER_ENGINE) (default "docker")
-h, --help help for delete
-n, --name string Cluster name ($FUNC_CLUSTER_NAME) (default "func")
-v, --verbose Print verbose logs ($FUNC_VERBOSE)
Expand Down