diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc index 5c3733f3d849..6fab45fbb0b1 100644 --- a/contrib/completions/bash/oc +++ b/contrib/completions/bash/oc @@ -16908,331 +16908,6 @@ _oc_secrets_link() noun_aliases=() } -_oc_secrets_new() -{ - last_command="oc_secrets_new" - commands=() - - flags=() - two_word_flags=() - local_nonpersistent_flags=() - flags_with_completion=() - flags_completion=() - - flags+=("--allow-missing-template-keys") - local_nonpersistent_flags+=("--allow-missing-template-keys") - flags+=("--confirm") - local_nonpersistent_flags+=("--confirm") - flags+=("--no-headers") - local_nonpersistent_flags+=("--no-headers") - flags+=("--output=") - two_word_flags+=("-o") - local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") - flags+=("--quiet") - flags+=("-q") - local_nonpersistent_flags+=("--quiet") - flags+=("--show-all") - flags+=("-a") - local_nonpersistent_flags+=("--show-all") - flags+=("--show-labels") - local_nonpersistent_flags+=("--show-labels") - flags+=("--sort-by=") - local_nonpersistent_flags+=("--sort-by=") - flags+=("--template=") - flags_with_completion+=("--template") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--template=") - flags+=("--type=") - local_nonpersistent_flags+=("--type=") - flags+=("--as=") - flags+=("--as-group=") - flags+=("--cache-dir=") - flags+=("--certificate-authority=") - flags_with_completion+=("--certificate-authority") - flags_completion+=("_filedir") - flags+=("--client-certificate=") - flags_with_completion+=("--client-certificate") - flags_completion+=("_filedir") - flags+=("--client-key=") - flags_with_completion+=("--client-key") - flags_completion+=("_filedir") - flags+=("--cluster=") - flags+=("--config=") - flags_with_completion+=("--config") - flags_completion+=("_filedir") - flags+=("--context=") - flags+=("--insecure-skip-tls-verify") - flags+=("--log-flush-frequency=") - flags+=("--loglevel=") - flags+=("--logspec=") - flags+=("--match-server-version") - flags+=("--namespace=") - flags_with_completion+=("--namespace") - flags_completion+=("__oc_get_namespaces") - two_word_flags+=("-n") - flags_with_completion+=("-n") - flags_completion+=("__oc_get_namespaces") - flags+=("--request-timeout=") - flags+=("--server=") - flags+=("--token=") - flags+=("--user=") - flags+=("--v=") - flags+=("--vmodule=") - - must_have_one_flag=() - must_have_one_noun=() - noun_aliases=() -} - -_oc_secrets_new-basicauth() -{ - last_command="oc_secrets_new-basicauth" - commands=() - - flags=() - two_word_flags=() - local_nonpersistent_flags=() - flags_with_completion=() - flags_completion=() - - flags+=("--allow-missing-template-keys") - local_nonpersistent_flags+=("--allow-missing-template-keys") - flags+=("--ca-cert=") - flags_with_completion+=("--ca-cert") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--ca-cert=") - flags+=("--gitconfig=") - flags_with_completion+=("--gitconfig") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--gitconfig=") - flags+=("--no-headers") - local_nonpersistent_flags+=("--no-headers") - flags+=("--output=") - two_word_flags+=("-o") - local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") - flags+=("--password=") - local_nonpersistent_flags+=("--password=") - flags+=("--prompt") - local_nonpersistent_flags+=("--prompt") - flags+=("--show-all") - flags+=("-a") - local_nonpersistent_flags+=("--show-all") - flags+=("--show-labels") - local_nonpersistent_flags+=("--show-labels") - flags+=("--sort-by=") - local_nonpersistent_flags+=("--sort-by=") - flags+=("--template=") - flags_with_completion+=("--template") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--template=") - flags+=("--username=") - local_nonpersistent_flags+=("--username=") - flags+=("--as=") - flags+=("--as-group=") - flags+=("--cache-dir=") - flags+=("--certificate-authority=") - flags_with_completion+=("--certificate-authority") - flags_completion+=("_filedir") - flags+=("--client-certificate=") - flags_with_completion+=("--client-certificate") - flags_completion+=("_filedir") - flags+=("--client-key=") - flags_with_completion+=("--client-key") - flags_completion+=("_filedir") - flags+=("--cluster=") - flags+=("--config=") - flags_with_completion+=("--config") - flags_completion+=("_filedir") - flags+=("--context=") - flags+=("--insecure-skip-tls-verify") - flags+=("--log-flush-frequency=") - flags+=("--loglevel=") - flags+=("--logspec=") - flags+=("--match-server-version") - flags+=("--namespace=") - flags_with_completion+=("--namespace") - flags_completion+=("__oc_get_namespaces") - two_word_flags+=("-n") - flags_with_completion+=("-n") - flags_completion+=("__oc_get_namespaces") - flags+=("--request-timeout=") - flags+=("--server=") - flags+=("--token=") - flags+=("--user=") - flags+=("--v=") - flags+=("--vmodule=") - - must_have_one_flag=() - must_have_one_noun=() - noun_aliases=() -} - -_oc_secrets_new-dockercfg() -{ - last_command="oc_secrets_new-dockercfg" - commands=() - - flags=() - two_word_flags=() - local_nonpersistent_flags=() - flags_with_completion=() - flags_completion=() - - flags+=("--allow-missing-template-keys") - local_nonpersistent_flags+=("--allow-missing-template-keys") - flags+=("--docker-email=") - local_nonpersistent_flags+=("--docker-email=") - flags+=("--docker-password=") - local_nonpersistent_flags+=("--docker-password=") - flags+=("--docker-server=") - local_nonpersistent_flags+=("--docker-server=") - flags+=("--docker-username=") - local_nonpersistent_flags+=("--docker-username=") - flags+=("--no-headers") - local_nonpersistent_flags+=("--no-headers") - flags+=("--output=") - two_word_flags+=("-o") - local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") - flags+=("--show-all") - flags+=("-a") - local_nonpersistent_flags+=("--show-all") - flags+=("--show-labels") - local_nonpersistent_flags+=("--show-labels") - flags+=("--sort-by=") - local_nonpersistent_flags+=("--sort-by=") - flags+=("--template=") - flags_with_completion+=("--template") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--template=") - flags+=("--as=") - flags+=("--as-group=") - flags+=("--cache-dir=") - flags+=("--certificate-authority=") - flags_with_completion+=("--certificate-authority") - flags_completion+=("_filedir") - flags+=("--client-certificate=") - flags_with_completion+=("--client-certificate") - flags_completion+=("_filedir") - flags+=("--client-key=") - flags_with_completion+=("--client-key") - flags_completion+=("_filedir") - flags+=("--cluster=") - flags+=("--config=") - flags_with_completion+=("--config") - flags_completion+=("_filedir") - flags+=("--context=") - flags+=("--insecure-skip-tls-verify") - flags+=("--log-flush-frequency=") - flags+=("--loglevel=") - flags+=("--logspec=") - flags+=("--match-server-version") - flags+=("--namespace=") - flags_with_completion+=("--namespace") - flags_completion+=("__oc_get_namespaces") - two_word_flags+=("-n") - flags_with_completion+=("-n") - flags_completion+=("__oc_get_namespaces") - flags+=("--request-timeout=") - flags+=("--server=") - flags+=("--token=") - flags+=("--user=") - flags+=("--v=") - flags+=("--vmodule=") - - must_have_one_flag=() - must_have_one_noun=() - noun_aliases=() -} - -_oc_secrets_new-sshauth() -{ - last_command="oc_secrets_new-sshauth" - commands=() - - flags=() - two_word_flags=() - local_nonpersistent_flags=() - flags_with_completion=() - flags_completion=() - - flags+=("--allow-missing-template-keys") - local_nonpersistent_flags+=("--allow-missing-template-keys") - flags+=("--ca-cert=") - flags_with_completion+=("--ca-cert") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--ca-cert=") - flags+=("--gitconfig=") - flags_with_completion+=("--gitconfig") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--gitconfig=") - flags+=("--no-headers") - local_nonpersistent_flags+=("--no-headers") - flags+=("--output=") - two_word_flags+=("-o") - local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") - flags+=("--show-all") - flags+=("-a") - local_nonpersistent_flags+=("--show-all") - flags+=("--show-labels") - local_nonpersistent_flags+=("--show-labels") - flags+=("--sort-by=") - local_nonpersistent_flags+=("--sort-by=") - flags+=("--ssh-privatekey=") - flags_with_completion+=("--ssh-privatekey") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--ssh-privatekey=") - flags+=("--template=") - flags_with_completion+=("--template") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--template=") - flags+=("--as=") - flags+=("--as-group=") - flags+=("--cache-dir=") - flags+=("--certificate-authority=") - flags_with_completion+=("--certificate-authority") - flags_completion+=("_filedir") - flags+=("--client-certificate=") - flags_with_completion+=("--client-certificate") - flags_completion+=("_filedir") - flags+=("--client-key=") - flags_with_completion+=("--client-key") - flags_completion+=("_filedir") - flags+=("--cluster=") - flags+=("--config=") - flags_with_completion+=("--config") - flags_completion+=("_filedir") - flags+=("--context=") - flags+=("--insecure-skip-tls-verify") - flags+=("--log-flush-frequency=") - flags+=("--loglevel=") - flags+=("--logspec=") - flags+=("--match-server-version") - flags+=("--namespace=") - flags_with_completion+=("--namespace") - flags_completion+=("__oc_get_namespaces") - two_word_flags+=("-n") - flags_with_completion+=("-n") - flags_completion+=("__oc_get_namespaces") - flags+=("--request-timeout=") - flags+=("--server=") - flags+=("--token=") - flags+=("--user=") - flags+=("--v=") - flags+=("--vmodule=") - - must_have_one_flag=() - must_have_one_noun=() - noun_aliases=() -} - _oc_secrets_unlink() { last_command="oc_secrets_unlink" @@ -17290,10 +16965,6 @@ _oc_secrets() commands=() commands+=("add") commands+=("link") - commands+=("new") - commands+=("new-basicauth") - commands+=("new-dockercfg") - commands+=("new-sshauth") commands+=("unlink") flags=() diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc index d23a8366ec29..0099ebe20a54 100644 --- a/contrib/completions/zsh/oc +++ b/contrib/completions/zsh/oc @@ -17050,331 +17050,6 @@ _oc_secrets_link() noun_aliases=() } -_oc_secrets_new() -{ - last_command="oc_secrets_new" - commands=() - - flags=() - two_word_flags=() - local_nonpersistent_flags=() - flags_with_completion=() - flags_completion=() - - flags+=("--allow-missing-template-keys") - local_nonpersistent_flags+=("--allow-missing-template-keys") - flags+=("--confirm") - local_nonpersistent_flags+=("--confirm") - flags+=("--no-headers") - local_nonpersistent_flags+=("--no-headers") - flags+=("--output=") - two_word_flags+=("-o") - local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") - flags+=("--quiet") - flags+=("-q") - local_nonpersistent_flags+=("--quiet") - flags+=("--show-all") - flags+=("-a") - local_nonpersistent_flags+=("--show-all") - flags+=("--show-labels") - local_nonpersistent_flags+=("--show-labels") - flags+=("--sort-by=") - local_nonpersistent_flags+=("--sort-by=") - flags+=("--template=") - flags_with_completion+=("--template") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--template=") - flags+=("--type=") - local_nonpersistent_flags+=("--type=") - flags+=("--as=") - flags+=("--as-group=") - flags+=("--cache-dir=") - flags+=("--certificate-authority=") - flags_with_completion+=("--certificate-authority") - flags_completion+=("_filedir") - flags+=("--client-certificate=") - flags_with_completion+=("--client-certificate") - flags_completion+=("_filedir") - flags+=("--client-key=") - flags_with_completion+=("--client-key") - flags_completion+=("_filedir") - flags+=("--cluster=") - flags+=("--config=") - flags_with_completion+=("--config") - flags_completion+=("_filedir") - flags+=("--context=") - flags+=("--insecure-skip-tls-verify") - flags+=("--log-flush-frequency=") - flags+=("--loglevel=") - flags+=("--logspec=") - flags+=("--match-server-version") - flags+=("--namespace=") - flags_with_completion+=("--namespace") - flags_completion+=("__oc_get_namespaces") - two_word_flags+=("-n") - flags_with_completion+=("-n") - flags_completion+=("__oc_get_namespaces") - flags+=("--request-timeout=") - flags+=("--server=") - flags+=("--token=") - flags+=("--user=") - flags+=("--v=") - flags+=("--vmodule=") - - must_have_one_flag=() - must_have_one_noun=() - noun_aliases=() -} - -_oc_secrets_new-basicauth() -{ - last_command="oc_secrets_new-basicauth" - commands=() - - flags=() - two_word_flags=() - local_nonpersistent_flags=() - flags_with_completion=() - flags_completion=() - - flags+=("--allow-missing-template-keys") - local_nonpersistent_flags+=("--allow-missing-template-keys") - flags+=("--ca-cert=") - flags_with_completion+=("--ca-cert") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--ca-cert=") - flags+=("--gitconfig=") - flags_with_completion+=("--gitconfig") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--gitconfig=") - flags+=("--no-headers") - local_nonpersistent_flags+=("--no-headers") - flags+=("--output=") - two_word_flags+=("-o") - local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") - flags+=("--password=") - local_nonpersistent_flags+=("--password=") - flags+=("--prompt") - local_nonpersistent_flags+=("--prompt") - flags+=("--show-all") - flags+=("-a") - local_nonpersistent_flags+=("--show-all") - flags+=("--show-labels") - local_nonpersistent_flags+=("--show-labels") - flags+=("--sort-by=") - local_nonpersistent_flags+=("--sort-by=") - flags+=("--template=") - flags_with_completion+=("--template") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--template=") - flags+=("--username=") - local_nonpersistent_flags+=("--username=") - flags+=("--as=") - flags+=("--as-group=") - flags+=("--cache-dir=") - flags+=("--certificate-authority=") - flags_with_completion+=("--certificate-authority") - flags_completion+=("_filedir") - flags+=("--client-certificate=") - flags_with_completion+=("--client-certificate") - flags_completion+=("_filedir") - flags+=("--client-key=") - flags_with_completion+=("--client-key") - flags_completion+=("_filedir") - flags+=("--cluster=") - flags+=("--config=") - flags_with_completion+=("--config") - flags_completion+=("_filedir") - flags+=("--context=") - flags+=("--insecure-skip-tls-verify") - flags+=("--log-flush-frequency=") - flags+=("--loglevel=") - flags+=("--logspec=") - flags+=("--match-server-version") - flags+=("--namespace=") - flags_with_completion+=("--namespace") - flags_completion+=("__oc_get_namespaces") - two_word_flags+=("-n") - flags_with_completion+=("-n") - flags_completion+=("__oc_get_namespaces") - flags+=("--request-timeout=") - flags+=("--server=") - flags+=("--token=") - flags+=("--user=") - flags+=("--v=") - flags+=("--vmodule=") - - must_have_one_flag=() - must_have_one_noun=() - noun_aliases=() -} - -_oc_secrets_new-dockercfg() -{ - last_command="oc_secrets_new-dockercfg" - commands=() - - flags=() - two_word_flags=() - local_nonpersistent_flags=() - flags_with_completion=() - flags_completion=() - - flags+=("--allow-missing-template-keys") - local_nonpersistent_flags+=("--allow-missing-template-keys") - flags+=("--docker-email=") - local_nonpersistent_flags+=("--docker-email=") - flags+=("--docker-password=") - local_nonpersistent_flags+=("--docker-password=") - flags+=("--docker-server=") - local_nonpersistent_flags+=("--docker-server=") - flags+=("--docker-username=") - local_nonpersistent_flags+=("--docker-username=") - flags+=("--no-headers") - local_nonpersistent_flags+=("--no-headers") - flags+=("--output=") - two_word_flags+=("-o") - local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") - flags+=("--show-all") - flags+=("-a") - local_nonpersistent_flags+=("--show-all") - flags+=("--show-labels") - local_nonpersistent_flags+=("--show-labels") - flags+=("--sort-by=") - local_nonpersistent_flags+=("--sort-by=") - flags+=("--template=") - flags_with_completion+=("--template") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--template=") - flags+=("--as=") - flags+=("--as-group=") - flags+=("--cache-dir=") - flags+=("--certificate-authority=") - flags_with_completion+=("--certificate-authority") - flags_completion+=("_filedir") - flags+=("--client-certificate=") - flags_with_completion+=("--client-certificate") - flags_completion+=("_filedir") - flags+=("--client-key=") - flags_with_completion+=("--client-key") - flags_completion+=("_filedir") - flags+=("--cluster=") - flags+=("--config=") - flags_with_completion+=("--config") - flags_completion+=("_filedir") - flags+=("--context=") - flags+=("--insecure-skip-tls-verify") - flags+=("--log-flush-frequency=") - flags+=("--loglevel=") - flags+=("--logspec=") - flags+=("--match-server-version") - flags+=("--namespace=") - flags_with_completion+=("--namespace") - flags_completion+=("__oc_get_namespaces") - two_word_flags+=("-n") - flags_with_completion+=("-n") - flags_completion+=("__oc_get_namespaces") - flags+=("--request-timeout=") - flags+=("--server=") - flags+=("--token=") - flags+=("--user=") - flags+=("--v=") - flags+=("--vmodule=") - - must_have_one_flag=() - must_have_one_noun=() - noun_aliases=() -} - -_oc_secrets_new-sshauth() -{ - last_command="oc_secrets_new-sshauth" - commands=() - - flags=() - two_word_flags=() - local_nonpersistent_flags=() - flags_with_completion=() - flags_completion=() - - flags+=("--allow-missing-template-keys") - local_nonpersistent_flags+=("--allow-missing-template-keys") - flags+=("--ca-cert=") - flags_with_completion+=("--ca-cert") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--ca-cert=") - flags+=("--gitconfig=") - flags_with_completion+=("--gitconfig") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--gitconfig=") - flags+=("--no-headers") - local_nonpersistent_flags+=("--no-headers") - flags+=("--output=") - two_word_flags+=("-o") - local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") - flags+=("--show-all") - flags+=("-a") - local_nonpersistent_flags+=("--show-all") - flags+=("--show-labels") - local_nonpersistent_flags+=("--show-labels") - flags+=("--sort-by=") - local_nonpersistent_flags+=("--sort-by=") - flags+=("--ssh-privatekey=") - flags_with_completion+=("--ssh-privatekey") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--ssh-privatekey=") - flags+=("--template=") - flags_with_completion+=("--template") - flags_completion+=("_filedir") - local_nonpersistent_flags+=("--template=") - flags+=("--as=") - flags+=("--as-group=") - flags+=("--cache-dir=") - flags+=("--certificate-authority=") - flags_with_completion+=("--certificate-authority") - flags_completion+=("_filedir") - flags+=("--client-certificate=") - flags_with_completion+=("--client-certificate") - flags_completion+=("_filedir") - flags+=("--client-key=") - flags_with_completion+=("--client-key") - flags_completion+=("_filedir") - flags+=("--cluster=") - flags+=("--config=") - flags_with_completion+=("--config") - flags_completion+=("_filedir") - flags+=("--context=") - flags+=("--insecure-skip-tls-verify") - flags+=("--log-flush-frequency=") - flags+=("--loglevel=") - flags+=("--logspec=") - flags+=("--match-server-version") - flags+=("--namespace=") - flags_with_completion+=("--namespace") - flags_completion+=("__oc_get_namespaces") - two_word_flags+=("-n") - flags_with_completion+=("-n") - flags_completion+=("__oc_get_namespaces") - flags+=("--request-timeout=") - flags+=("--server=") - flags+=("--token=") - flags+=("--user=") - flags+=("--v=") - flags+=("--vmodule=") - - must_have_one_flag=() - must_have_one_noun=() - noun_aliases=() -} - _oc_secrets_unlink() { last_command="oc_secrets_unlink" @@ -17432,10 +17107,6 @@ _oc_secrets() commands=() commands+=("add") commands+=("link") - commands+=("new") - commands+=("new-basicauth") - commands+=("new-dockercfg") - commands+=("new-sshauth") commands+=("unlink") flags=() diff --git a/pkg/oc/cli/cli.go b/pkg/oc/cli/cli.go index d0980c002fa1..f278633bbe15 100644 --- a/pkg/oc/cli/cli.go +++ b/pkg/oc/cli/cli.go @@ -92,7 +92,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) * f := clientcmd.New(cmds.PersistentFlags()) loginCmd := login.NewCmdLogin(fullName, f, in, out, errout) - secretcmds := secrets.NewCmdSecrets(secrets.SecretsRecommendedName, fullName+" "+secrets.SecretsRecommendedName, f, in, out, errout, fullName+" edit") + secretcmds := secrets.NewCmdSecrets(secrets.SecretsRecommendedName, fullName+" "+secrets.SecretsRecommendedName, f, out, errout) groups := ktemplates.CommandGroups{ { @@ -185,6 +185,10 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) * } groups.Add(cmds) + ocEditFullName := fullName + " edit" + ocSecretsFullName := fullName + " " + secrets.SecretsRecommendedName + ocSecretsNewFullName := ocSecretsFullName + " " + secrets.NewSecretRecommendedCommandName + filters := []string{ "options", "deploy", @@ -193,6 +197,10 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) * moved(fullName, "set volume", cmds, set.NewCmdVolume(fullName, f, out, errout)), moved(fullName, "logs", cmds, cmd.NewCmdBuildLogs(fullName, f, out)), moved(fullName, "secrets link", secretcmds, secrets.NewCmdLinkSecret("add", fullName, f, out)), + moved(fullName, "create secret", secretcmds, secrets.NewCmdCreateSecret(secrets.NewSecretRecommendedCommandName, fullName, f, out)), + moved(fullName, "create secret", secretcmds, secrets.NewCmdCreateDockerConfigSecret(secrets.CreateDockerConfigSecretRecommendedName, fullName, f, out, ocSecretsNewFullName, ocEditFullName)), + moved(fullName, "create secret", secretcmds, secrets.NewCmdCreateBasicAuthSecret(secrets.CreateBasicAuthSecretRecommendedCommandName, fullName, f, in, out, ocSecretsNewFullName, ocEditFullName)), + moved(fullName, "create secret", secretcmds, secrets.NewCmdCreateSSHAuthSecret(secrets.CreateSSHAuthSecretRecommendedCommandName, fullName, f, out, ocSecretsNewFullName, ocEditFullName)), } changeSharedFlagDefaults(cmds) diff --git a/pkg/oc/cli/secrets/basicauth.go b/pkg/oc/cli/secrets/basicauth.go index a5865787dcb8..11571af04611 100644 --- a/pkg/oc/cli/secrets/basicauth.go +++ b/pkg/oc/cli/secrets/basicauth.go @@ -65,10 +65,11 @@ func NewCmdCreateBasicAuthSecret(name, fullName string, f kcmdutil.Factory, read } cmd := &cobra.Command{ - Use: fmt.Sprintf("%s SECRET --username=USERNAME --password=PASSWORD [--ca-cert=FILENAME] [--gitconfig=FILENAME]", name), - Short: "Create a new secret for basic authentication", - Long: createBasicAuthSecretLong, - Example: fmt.Sprintf(createBasicAuthSecretExample, fullName, newSecretFullName, ocEditFullName), + Use: fmt.Sprintf("%s SECRET --username=USERNAME --password=PASSWORD [--ca-cert=FILENAME] [--gitconfig=FILENAME]", name), + Short: "Create a new secret for basic authentication", + Long: createBasicAuthSecretLong, + Example: fmt.Sprintf(createBasicAuthSecretExample, fullName, newSecretFullName, ocEditFullName), + Deprecated: "use oc create secret", Run: func(c *cobra.Command, args []string) { if err := o.Complete(f, args); err != nil { kcmdutil.CheckErr(kcmdutil.UsageErrorf(c, err.Error())) diff --git a/pkg/oc/cli/secrets/dockercfg.go b/pkg/oc/cli/secrets/dockercfg.go index 4f76cf19b124..f161389866f6 100644 --- a/pkg/oc/cli/secrets/dockercfg.go +++ b/pkg/oc/cli/secrets/dockercfg.go @@ -65,10 +65,11 @@ func NewCmdCreateDockerConfigSecret(name, fullName string, f kcmdutil.Factory, o o := &CreateDockerConfigOptions{Out: out} cmd := &cobra.Command{ - Use: fmt.Sprintf("%s SECRET --docker-server=DOCKER_REGISTRY_SERVER --docker-username=DOCKER_USER --docker-password=DOCKER_PASSWORD --docker-email=DOCKER_EMAIL", name), - Short: "Create a new dockercfg secret", - Long: createDockercfgLong, - Example: fmt.Sprintf(createDockercfgExample, fullName, newSecretFullName, ocEditFullName), + Use: fmt.Sprintf("%s SECRET --docker-server=DOCKER_REGISTRY_SERVER --docker-username=DOCKER_USER --docker-password=DOCKER_PASSWORD --docker-email=DOCKER_EMAIL", name), + Short: "Create a new dockercfg secret", + Long: createDockercfgLong, + Example: fmt.Sprintf(createDockercfgExample, fullName, newSecretFullName, ocEditFullName), + Deprecated: "use oc create secret", Run: func(c *cobra.Command, args []string) { if err := o.Complete(f, args); err != nil { kcmdutil.CheckErr(kcmdutil.UsageErrorf(c, err.Error())) diff --git a/pkg/oc/cli/secrets/link_secret_to_obj.go b/pkg/oc/cli/secrets/link_secret_to_obj.go index 68b776a8e32b..3027c544076a 100644 --- a/pkg/oc/cli/secrets/link_secret_to_obj.go +++ b/pkg/oc/cli/secrets/link_secret_to_obj.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "io" + "os" "strings" kapi "k8s.io/kubernetes/pkg/apis/core" @@ -51,6 +52,11 @@ func NewCmdLinkSecret(name, fullName string, f kcmdutil.Factory, out io.Writer) Short: "Link secrets to a ServiceAccount", Long: linkSecretLong, Example: fmt.Sprintf(linkSecretExample, fullName), + PreRun: func(cmd *cobra.Command, args []string) { + if len(os.Args) > 1 && os.Args[1] == "add" { + printDeprecationWarning("secrets add", "secrets link") + } + }, Run: func(c *cobra.Command, args []string) { if err := o.Complete(f, args); err != nil { kcmdutil.CheckErr(kcmdutil.UsageErrorf(c, err.Error())) @@ -160,3 +166,7 @@ func (o LinkSecretOptions) linkSecretsToServiceAccount(serviceaccount *kapi.Serv return nil } + +func printDeprecationWarning(command, alias string) { + fmt.Fprintf(os.Stderr, "%s is DEPRECATED and will be removed in a future version. Use %s instead.\n", alias, command) +} diff --git a/pkg/oc/cli/secrets/new.go b/pkg/oc/cli/secrets/new.go index 23e542c4d3c6..55b7c4fb669e 100644 --- a/pkg/oc/cli/secrets/new.go +++ b/pkg/oc/cli/secrets/new.go @@ -76,10 +76,11 @@ func NewCmdCreateSecret(name, fullName string, f *clientcmd.Factory, out io.Writ options.Out = out cmd := &cobra.Command{ - Use: fmt.Sprintf("%s NAME [KEY=]SOURCE ...", name), - Short: "Create a new secret based on a key file or on files within a directory", - Long: newLong, - Example: fmt.Sprintf(newExample, fullName), + Use: fmt.Sprintf("%s NAME [KEY=]SOURCE ...", name), + Short: "Create a new secret based on a key file or on files within a directory", + Long: newLong, + Example: fmt.Sprintf(newExample, fullName), + Deprecated: "use oc create secret", Run: func(c *cobra.Command, args []string) { if err := options.Complete(args, f); err != nil { kcmdutil.CheckErr(kcmdutil.UsageErrorf(c, err.Error())) diff --git a/pkg/oc/cli/secrets/sshauth.go b/pkg/oc/cli/secrets/sshauth.go index f79db359d93e..38ad56873546 100644 --- a/pkg/oc/cli/secrets/sshauth.go +++ b/pkg/oc/cli/secrets/sshauth.go @@ -59,10 +59,11 @@ func NewCmdCreateSSHAuthSecret(name, fullName string, f kcmdutil.Factory, out io } cmd := &cobra.Command{ - Use: fmt.Sprintf("%s SECRET --ssh-privatekey=FILENAME [--ca-cert=FILENAME] [--gitconfig=FILENAME]", name), - Short: "Create a new secret for SSH authentication", - Long: createSSHAuthSecretLong, - Example: fmt.Sprintf(createSSHAuthSecretExample, fullName, newSecretFullName, ocEditFullName), + Use: fmt.Sprintf("%s SECRET --ssh-privatekey=FILENAME [--ca-cert=FILENAME] [--gitconfig=FILENAME]", name), + Short: "Create a new secret for SSH authentication", + Long: createSSHAuthSecretLong, + Example: fmt.Sprintf(createSSHAuthSecretExample, fullName, newSecretFullName, ocEditFullName), + Deprecated: "use oc create secret", Run: func(c *cobra.Command, args []string) { if err := o.Complete(f, args); err != nil { kcmdutil.CheckErr(kcmdutil.UsageErrorf(c, err.Error())) diff --git a/pkg/oc/cli/secrets/subcommand.go b/pkg/oc/cli/secrets/subcommand.go index 67ef3408056e..127757d866a7 100644 --- a/pkg/oc/cli/secrets/subcommand.go +++ b/pkg/oc/cli/secrets/subcommand.go @@ -34,7 +34,7 @@ var ( Docker registries.`) ) -func NewCmdSecrets(name, fullName string, f *clientcmd.Factory, reader io.Reader, out, errOut io.Writer, ocEditFullName string) *cobra.Command { +func NewCmdSecrets(name, fullName string, f *clientcmd.Factory, out, errOut io.Writer) *cobra.Command { // Parent command to which all subcommands are added. cmds := &cobra.Command{ Use: name, @@ -44,11 +44,6 @@ func NewCmdSecrets(name, fullName string, f *clientcmd.Factory, reader io.Reader Run: cmdutil.DefaultSubCommandRun(errOut), } - newSecretFullName := fullName + " " + NewSecretRecommendedCommandName - cmds.AddCommand(NewCmdCreateSecret(NewSecretRecommendedCommandName, newSecretFullName, f, out)) - cmds.AddCommand(NewCmdCreateDockerConfigSecret(CreateDockerConfigSecretRecommendedName, fullName+" "+CreateDockerConfigSecretRecommendedName, f, out, newSecretFullName, ocEditFullName)) - cmds.AddCommand(NewCmdCreateBasicAuthSecret(CreateBasicAuthSecretRecommendedCommandName, fullName+" "+CreateBasicAuthSecretRecommendedCommandName, f, reader, out, newSecretFullName, ocEditFullName)) - cmds.AddCommand(NewCmdCreateSSHAuthSecret(CreateSSHAuthSecretRecommendedCommandName, fullName+" "+CreateSSHAuthSecretRecommendedCommandName, f, out, newSecretFullName, ocEditFullName)) cmds.AddCommand(NewCmdLinkSecret(LinkSecretRecommendedName, fullName+" "+LinkSecretRecommendedName, f, out)) cmds.AddCommand(NewCmdUnlinkSecret(UnlinkSecretRecommendedName, fullName+" "+UnlinkSecretRecommendedName, f, out))