Skip to content

Commit e528c2f

Browse files
odacremolbapk8s-ci-robot
authored andcommitted
Kubectl certificate signing: fix certificate deny message (kubernetes#84400)
* add certificate deny flag message * bring back NewCertificateOptions with operation parameter
1 parent 41730db commit e528c2f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

staging/src/k8s.io/kubectl/pkg/cmd/certificates/certificates.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ type CertificateOptions struct {
6969
}
7070

7171
// NewCertificateOptions creates the options for certificate
72-
func NewCertificateOptions(ioStreams genericclioptions.IOStreams) *CertificateOptions {
72+
func NewCertificateOptions(ioStreams genericclioptions.IOStreams, operation string) *CertificateOptions {
7373
return &CertificateOptions{
74-
PrintFlags: genericclioptions.NewPrintFlags("approved").WithTypeSetter(scheme.Scheme),
74+
PrintFlags: genericclioptions.NewPrintFlags(operation).WithTypeSetter(scheme.Scheme),
7575
IOStreams: ioStreams,
7676
}
7777
}
@@ -111,7 +111,7 @@ func (o *CertificateOptions) Validate() error {
111111
}
112112

113113
func NewCmdCertificateApprove(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
114-
o := NewCertificateOptions(ioStreams)
114+
o := NewCertificateOptions(ioStreams, "approved")
115115

116116
cmd := &cobra.Command{
117117
Use: "approve (-f FILENAME | NAME)",
@@ -166,7 +166,7 @@ func (o *CertificateOptions) RunCertificateApprove(force bool) error {
166166
}
167167

168168
func NewCmdCertificateDeny(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
169-
o := NewCertificateOptions(ioStreams)
169+
o := NewCertificateOptions(ioStreams, "denied")
170170

171171
cmd := &cobra.Command{
172172
Use: "deny (-f FILENAME | NAME)",

0 commit comments

Comments
 (0)