opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 10:38:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix podman kube generate --help to show correct help message

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2022-08-16 09:58:02 -04:00
parent 3aa92010df
commit 5f09d9b60d
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/podman/kube/generate.go
View File

@ -22,7 +22,7 @@ var (
Whether the input is for a container or pod, Podman will always generate the specification as a pod.` Whether the input is for a container or pod, Podman will always generate the specification as a pod.`
generateKubeCmd = &cobra.Command{ kubeGenerateCmd = &cobra.Command{
Use: "generate [options] {CONTAINER...|POD...|VOLUME...}", Use: "generate [options] {CONTAINER...|POD...|VOLUME...}",
Short: "Generate Kubernetes YAML from containers, pods or volumes.", Short: "Generate Kubernetes YAML from containers, pods or volumes.",
Long: generateDescription, Long: generateDescription,
@ -35,33 +35,28 @@ var (
podman kube generate volumeName podman kube generate volumeName
podman kube generate ctrID podID volumeName --service`, podman kube generate ctrID podID volumeName --service`,
} }
kubeGenerateDescription = generateDescription
kubeGenerateCmd = &cobra.Command{ generateKubeCmd = &cobra.Command{
Use: "kube [options] {CONTAINER...|POD...|VOLUME...}", Use: "kube [options] {CONTAINER...|POD...|VOLUME...}",
Short: "Generate Kubernetes YAML from containers, pods or volumes.", Short: kubeGenerateCmd.Short,
Long: kubeGenerateDescription, Long: kubeGenerateCmd.Long,
RunE: kubeGenerate, RunE: kubeGenerateCmd.RunE,
Args: cobra.MinimumNArgs(1), Args: kubeGenerateCmd.Args,
ValidArgsFunction: common.AutocompleteForGenerate, ValidArgsFunction: kubeGenerateCmd.ValidArgsFunction,
Example: `podman kube generate ctrID Example: kubeGenerateCmd.Example,
podman kube generate podID
podman kube generate --service podID
podman kube generate volumeName
podman kube generate ctrID podID volumeName --service`,
} }
) )
func init() { func init() {
registry.Commands = append(registry.Commands, registry.CliCommand{ registry.Commands = append(registry.Commands, registry.CliCommand{
Command: generateKubeCmd, Command: generateKubeCmd,
Parent: kubeCmd, Parent: generate.GenerateCmd,
}) })
generateFlags(generateKubeCmd) generateFlags(generateKubeCmd)
registry.Commands = append(registry.Commands, registry.CliCommand{ registry.Commands = append(registry.Commands, registry.CliCommand{
Command: kubeGenerateCmd, Command: kubeGenerateCmd,
Parent: generate.GenerateCmd, Parent: kubeCmd,
}) })
generateFlags(kubeGenerateCmd) generateFlags(kubeGenerateCmd)
} }
@ -103,7 +98,3 @@ func generateKube(cmd *cobra.Command, args []string) error {
fmt.Println(string(content)) fmt.Println(string(content))
return nil return nil
} }
func kubeGenerate(cmd *cobra.Command, args []string) error {
return generateKube(cmd, args)
}

15
test/system/710-kube.bats Normal file
View File

@ -0,0 +1,15 @@
#!/usr/bin/env bats -*- bats -*-
#
# Test podman kube generate
#
load helpers
@test "podman kube generate - basic" {
run_podman kube generate --help
is "$output" ".*podman.* kube generate \[options\] {CONTAINER...|POD...|VOLUME...}"
run_podman generate kube --help
is "$output" ".*podman.* generate kube \[options\] {CONTAINER...|POD...|VOLUME...}"
}
# vim: filetype=sh