From e528c2f2925d61fa7a12313a895af5a312d36dd6 Mon Sep 17 00:00:00 2001 From: Pablo Mercado Date: Sun, 27 Oct 2019 02:37:23 +0200 Subject: [PATCH] Kubectl certificate signing: fix certificate deny message (#84400) * add certificate deny flag message * bring back NewCertificateOptions with operation parameter --- .../k8s.io/kubectl/pkg/cmd/certificates/certificates.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/certificates/certificates.go b/staging/src/k8s.io/kubectl/pkg/cmd/certificates/certificates.go index cacce27bc35..5c6e6a380d3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/certificates/certificates.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/certificates/certificates.go @@ -69,9 +69,9 @@ type CertificateOptions struct { } // NewCertificateOptions creates the options for certificate -func NewCertificateOptions(ioStreams genericclioptions.IOStreams) *CertificateOptions { +func NewCertificateOptions(ioStreams genericclioptions.IOStreams, operation string) *CertificateOptions { return &CertificateOptions{ - PrintFlags: genericclioptions.NewPrintFlags("approved").WithTypeSetter(scheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags(operation).WithTypeSetter(scheme.Scheme), IOStreams: ioStreams, } } @@ -111,7 +111,7 @@ func (o *CertificateOptions) Validate() error { } func NewCmdCertificateApprove(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command { - o := NewCertificateOptions(ioStreams) + o := NewCertificateOptions(ioStreams, "approved") cmd := &cobra.Command{ Use: "approve (-f FILENAME | NAME)", @@ -166,7 +166,7 @@ func (o *CertificateOptions) RunCertificateApprove(force bool) error { } func NewCmdCertificateDeny(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command { - o := NewCertificateOptions(ioStreams) + o := NewCertificateOptions(ioStreams, "denied") cmd := &cobra.Command{ Use: "deny (-f FILENAME | NAME)",