Skip to content

Commit e2fd943

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #20587 from soltysh/io_streams
Update admin commands to use IOStreams
2 parents 5009149 + 83bc410 commit e2fd943

File tree

72 files changed

+1094
-1086
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1094
-1086
lines changed

‎contrib/completions/bash/oc

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contrib/completions/zsh/oc

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/cmd/server/admin/create_bootstrappolicy_file.go

+16-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package admin
33
import (
44
"bytes"
55
"errors"
6-
"io"
76
"io/ioutil"
87
"os"
98
"path"
@@ -12,13 +11,14 @@ import (
1211

1312
corev1 "k8s.io/api/core/v1"
1413
rbacv1 "k8s.io/api/rbac/v1"
14+
"k8s.io/apimachinery/pkg/runtime"
1515
"k8s.io/apimachinery/pkg/util/sets"
1616
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
17+
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
1718
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers"
1819
"k8s.io/kubernetes/pkg/kubectl/scheme"
1920

2021
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
21-
"k8s.io/apimachinery/pkg/runtime"
2222
)
2323

2424
const (
@@ -28,28 +28,29 @@ const (
2828

2929
type CreateBootstrapPolicyFileOptions struct {
3030
File string
31+
32+
genericclioptions.IOStreams
3133
}
3234

33-
func NewCommandCreateBootstrapPolicyFile(commandName string, fullName string, out io.Writer) *cobra.Command {
34-
options := &CreateBootstrapPolicyFileOptions{}
35+
func NewCreateBootstrapPolicyFileOptions(streams genericclioptions.IOStreams) *CreateBootstrapPolicyFileOptions {
36+
return &CreateBootstrapPolicyFileOptions{
37+
File: DefaultPolicyFile,
38+
IOStreams: streams,
39+
}
40+
}
3541

42+
func NewCommandCreateBootstrapPolicyFile(commandName string, fullName string, streams genericclioptions.IOStreams) *cobra.Command {
43+
o := NewCreateBootstrapPolicyFileOptions(streams)
3644
cmd := &cobra.Command{
3745
Use: commandName,
3846
Short: "Create the default bootstrap policy",
3947
Run: func(cmd *cobra.Command, args []string) {
40-
if err := options.Validate(args); err != nil {
41-
kcmdutil.CheckErr(kcmdutil.UsageErrorf(cmd, err.Error()))
42-
}
43-
44-
if err := options.CreateBootstrapPolicyFile(); err != nil {
45-
kcmdutil.CheckErr(err)
46-
}
48+
kcmdutil.CheckErr(o.Validate(args))
49+
kcmdutil.CheckErr(o.Run())
4750
},
4851
}
4952

50-
flags := cmd.Flags()
51-
52-
flags.StringVar(&options.File, "filename", DefaultPolicyFile, "The policy template file that will be written with roles and bindings.")
53+
cmd.Flags().StringVar(&o.File, "filename", o.File, "The policy template file that will be written with roles and bindings.")
5354

5455
// autocompletion hints
5556
cmd.MarkFlagFilename("filename")
@@ -68,7 +69,7 @@ func (o CreateBootstrapPolicyFileOptions) Validate(args []string) error {
6869
return nil
6970
}
7071

71-
func (o CreateBootstrapPolicyFileOptions) CreateBootstrapPolicyFile() error {
72+
func (o CreateBootstrapPolicyFileOptions) Run() error {
7273
if err := os.MkdirAll(path.Dir(o.File), os.FileMode(0755)); err != nil {
7374
return err
7475
}

‎pkg/cmd/server/admin/create_client.go

+24-25
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package admin
33
import (
44
"errors"
55
"fmt"
6-
"io"
76
"io/ioutil"
87

98
"github.com/golang/glog"
@@ -13,6 +12,7 @@ import (
1312
"k8s.io/client-go/util/cert"
1413
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1514
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
15+
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
1616

1717
"github.com/openshift/library-go/pkg/crypto"
1818
)
@@ -33,7 +33,8 @@ type CreateClientOptions struct {
3333
APIServerCAFiles []string
3434
APIServerURL string
3535
PublicAPIServerURL string
36-
Output io.Writer
36+
37+
genericclioptions.IOStreams
3738
}
3839

3940
var createClientLong = templates.LongDesc(`
@@ -43,42 +44,40 @@ var createClientLong = templates.LongDesc(`
4344
a server certificate authority, and a .kubeconfig file for connecting to the
4445
master as the provided user.`)
4546

46-
func NewCommandCreateClient(commandName string, fullName string, out io.Writer) *cobra.Command {
47-
options := &CreateClientOptions{
47+
func NewCreateClientOptions(streams genericclioptions.IOStreams) *CreateClientOptions {
48+
return &CreateClientOptions{
4849
SignerCertOptions: NewDefaultSignerCertOptions(),
4950
ExpireDays: crypto.DefaultCertificateLifetimeInDays,
50-
Output: out,
51+
APIServerURL: "https://localhost:8443",
52+
APIServerCAFiles: []string{"openshift.local.config/master/ca.crt"},
53+
IOStreams: streams,
5154
}
55+
}
5256

57+
func NewCommandCreateClient(commandName string, fullName string, streams genericclioptions.IOStreams) *cobra.Command {
58+
o := NewCreateClientOptions(streams)
5359
cmd := &cobra.Command{
5460
Use: commandName,
5561
Short: "Create a config file for connecting to the server as a user",
5662
Long: createClientLong,
5763
Run: func(cmd *cobra.Command, args []string) {
58-
if err := options.Validate(args); err != nil {
59-
kcmdutil.CheckErr(kcmdutil.UsageErrorf(cmd, err.Error()))
60-
}
61-
62-
if err := options.CreateClientFolder(); err != nil {
63-
kcmdutil.CheckErr(err)
64-
}
64+
kcmdutil.CheckErr(o.Validate(args))
65+
kcmdutil.CheckErr(o.CreateClientFolder())
6566
},
6667
}
6768

68-
flags := cmd.Flags()
69-
70-
BindSignerCertOptions(options.SignerCertOptions, flags, "")
69+
BindSignerCertOptions(o.SignerCertOptions, cmd.Flags(), "")
7170

72-
flags.StringVar(&options.ClientDir, "client-dir", "", "The client data directory.")
73-
flags.StringVar(&options.BaseName, "basename", "", "The base filename to use for the .crt, .key, and .kubeconfig files. Defaults to the username.")
71+
cmd.Flags().StringVar(&o.ClientDir, "client-dir", o.ClientDir, "The client data directory.")
72+
cmd.Flags().StringVar(&o.BaseName, "basename", o.BaseName, "The base filename to use for the .crt, .key, and .kubeconfig files. Defaults to the username.")
7473

75-
flags.StringVar(&options.User, "user", "", "The scope qualified username.")
76-
flags.StringSliceVar(&options.Groups, "groups", options.Groups, "The list of groups this user belongs to. Comma delimited list")
74+
cmd.Flags().StringVar(&o.User, "user", o.User, "The scope qualified username.")
75+
cmd.Flags().StringSliceVar(&o.Groups, "groups", o.Groups, "The list of groups this user belongs to. Comma delimited list")
7776

78-
flags.StringVar(&options.APIServerURL, "master", "https://localhost:8443", "The API server's URL.")
79-
flags.StringVar(&options.PublicAPIServerURL, "public-master", "", "The API public facing server's URL (if applicable).")
80-
flags.StringSliceVar(&options.APIServerCAFiles, "certificate-authority", []string{"openshift.local.config/master/ca.crt"}, "Files containing signing authorities to use to verify the API server's serving certificate.")
81-
flags.IntVar(&options.ExpireDays, "expire-days", options.ExpireDays, "Validity of the certificates in days (defaults to 2 years). WARNING: extending this above default value is highly discouraged.")
77+
cmd.Flags().StringVar(&o.APIServerURL, "master", o.APIServerURL, "The API server's URL.")
78+
cmd.Flags().StringVar(&o.PublicAPIServerURL, "public-master", o.PublicAPIServerURL, "The API public facing server's URL (if applicable).")
79+
cmd.Flags().StringSliceVar(&o.APIServerCAFiles, "certificate-authority", o.APIServerCAFiles, "Files containing signing authorities to use to verify the API server's serving certificate.")
80+
cmd.Flags().IntVar(&o.ExpireDays, "expire-days", o.ExpireDays, "Validity of the certificates in days (defaults to 2 years). WARNING: extending this above default value is highly discouraged.")
8281

8382
// autocompletion hints
8483
cmd.MarkFlagFilename("client-dir")
@@ -143,7 +142,7 @@ func (o CreateClientOptions) CreateClientFolder() error {
143142
User: o.User,
144143
Groups: o.Groups,
145144
Overwrite: true,
146-
Output: o.Output,
145+
Output: o.Out,
147146
}
148147
if err := createClientCertOptions.Validate(nil); err != nil {
149148
return err
@@ -170,7 +169,7 @@ func (o CreateClientOptions) CreateClientFolder() error {
170169
ContextNamespace: metav1.NamespaceDefault,
171170

172171
KubeConfigFile: kubeConfigFile,
173-
Output: o.Output,
172+
IOStreams: genericclioptions.IOStreams{Out: o.Out},
174173
}
175174
if _, err := createKubeConfigOptions.CreateKubeConfig(); err != nil {
176175
return err

‎pkg/cmd/server/admin/create_keypair.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"encoding/pem"
99
"errors"
1010
"fmt"
11-
"io"
1211
"io/ioutil"
1312
"os"
1413
"path/filepath"
@@ -18,6 +17,7 @@ import (
1817

1918
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
2019
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
20+
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
2121
)
2222

2323
const CreateKeyPairCommandName = "create-key-pair"
@@ -27,7 +27,8 @@ type CreateKeyPairOptions struct {
2727
PrivateKeyFile string
2828

2929
Overwrite bool
30-
Output io.Writer
30+
31+
genericclioptions.IOStreams
3132
}
3233

3334
var createKeyPairLong = templates.LongDesc(`
@@ -39,28 +40,27 @@ var createKeyPairLong = templates.LongDesc(`
3940
%[1]s --public-key=$CONFIG/serviceaccounts.public.key --private-key=$CONFIG/serviceaccounts.private.key
4041
`)
4142

42-
func NewCommandCreateKeyPair(commandName string, fullName string, out io.Writer) *cobra.Command {
43-
options := &CreateKeyPairOptions{Output: out}
43+
func NewCreateKeyPairOptions(streams genericclioptions.IOStreams) *CreateKeyPairOptions {
44+
return &CreateKeyPairOptions{
45+
IOStreams: streams,
46+
}
47+
}
4448

49+
func NewCommandCreateKeyPair(commandName string, fullName string, streams genericclioptions.IOStreams) *cobra.Command {
50+
o := NewCreateKeyPairOptions(streams)
4551
cmd := &cobra.Command{
4652
Use: commandName,
4753
Short: "Create a public/private key pair",
4854
Long: fmt.Sprintf(createKeyPairLong, fullName),
4955
Run: func(cmd *cobra.Command, args []string) {
50-
if err := options.Validate(args); err != nil {
51-
kcmdutil.CheckErr(kcmdutil.UsageErrorf(cmd, err.Error()))
52-
}
53-
54-
err := options.CreateKeyPair()
55-
kcmdutil.CheckErr(err)
56+
kcmdutil.CheckErr(o.Validate(args))
57+
kcmdutil.CheckErr(o.CreateKeyPair())
5658
},
5759
}
5860

59-
flags := cmd.Flags()
60-
61-
flags.StringVar(&options.PublicKeyFile, "public-key", "", "The public key file.")
62-
flags.StringVar(&options.PrivateKeyFile, "private-key", "", "The private key file.")
63-
flags.BoolVar(&options.Overwrite, "overwrite", false, "Overwrite existing key files if found. If false, either file existing will prevent creation.")
61+
cmd.Flags().StringVar(&o.PublicKeyFile, "public-key", o.PublicKeyFile, "The public key file.")
62+
cmd.Flags().StringVar(&o.PrivateKeyFile, "private-key", o.PrivateKeyFile, "The private key file.")
63+
cmd.Flags().BoolVar(&o.Overwrite, "overwrite", o.Overwrite, "Overwrite existing key files if found. If false, either file existing will prevent creation.")
6464

6565
// autocompletion hints
6666
cmd.MarkFlagFilename("public-key")
@@ -113,7 +113,7 @@ func (o CreateKeyPairOptions) CreateKeyPair() error {
113113
return err
114114
}
115115

116-
fmt.Fprintf(o.Output, "Generated new key pair as %s and %s\n", o.PublicKeyFile, o.PrivateKeyFile)
116+
fmt.Fprintf(o.Out, "Generated new key pair as %s and %s\n", o.PublicKeyFile, o.PrivateKeyFile)
117117

118118
return nil
119119
}

‎pkg/cmd/server/admin/create_kubeconfig.go

+23-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package admin
33
import (
44
"errors"
55
"fmt"
6-
"io"
76
"io/ioutil"
87
"os"
98
"path/filepath"
@@ -15,6 +14,7 @@ import (
1514
"k8s.io/client-go/util/cert"
1615
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1716
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
17+
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
1818

1919
"github.com/openshift/library-go/pkg/crypto"
2020
"github.com/openshift/origin/pkg/client/config"
@@ -66,36 +66,41 @@ type CreateKubeConfigOptions struct {
6666
ContextNamespace string
6767

6868
KubeConfigFile string
69-
Output io.Writer
69+
70+
genericclioptions.IOStreams
7071
}
7172

72-
func NewCommandCreateKubeConfig(commandName string, fullName string, out io.Writer) *cobra.Command {
73-
options := &CreateKubeConfigOptions{Output: out}
73+
func NewCreateKubeConfigOptions(streams genericclioptions.IOStreams) *CreateKubeConfigOptions {
74+
return &CreateKubeConfigOptions{
75+
APIServerURL: "https://localhost:8443",
76+
APIServerCAFiles: []string{"openshift.local.config/master/ca.crt"},
77+
ContextNamespace: metav1.NamespaceDefault,
78+
KubeConfigFile: ".kubeconfig",
79+
IOStreams: streams,
80+
}
81+
}
7482

83+
func NewCommandCreateKubeConfig(commandName string, fullName string, streams genericclioptions.IOStreams) *cobra.Command {
84+
o := NewCreateKubeConfigOptions(streams)
7585
cmd := &cobra.Command{
7686
Use: commandName,
7787
Short: "Create a basic .kubeconfig file from client certs",
7888
Long: createKubeConfigLongDesc,
7989
Run: func(cmd *cobra.Command, args []string) {
80-
if err := options.Validate(args); err != nil {
81-
kcmdutil.CheckErr(kcmdutil.UsageErrorf(cmd, err.Error()))
82-
}
83-
84-
if _, err := options.CreateKubeConfig(); err != nil {
90+
kcmdutil.CheckErr(o.Validate(args))
91+
if _, err := o.CreateKubeConfig(); err != nil {
8592
kcmdutil.CheckErr(err)
8693
}
8794
},
8895
}
8996

90-
flags := cmd.Flags()
91-
92-
flags.StringVar(&options.APIServerURL, "master", "https://localhost:8443", "The API server's URL.")
93-
flags.StringVar(&options.PublicAPIServerURL, "public-master", "", "The API public facing server's URL (if applicable).")
94-
flags.StringSliceVar(&options.APIServerCAFiles, "certificate-authority", []string{"openshift.local.config/master/ca.crt"}, "Files containing signing authorities to use to verify the API server's serving certificate.")
95-
flags.StringVar(&options.CertFile, "client-certificate", "", "The client cert file.")
96-
flags.StringVar(&options.KeyFile, "client-key", "", "The client key file.")
97-
flags.StringVar(&options.ContextNamespace, "namespace", metav1.NamespaceDefault, "Namespace for this context in .kubeconfig.")
98-
flags.StringVar(&options.KubeConfigFile, "kubeconfig", ".kubeconfig", "Path for the resulting .kubeconfig file.")
97+
cmd.Flags().StringVar(&o.APIServerURL, "master", o.APIServerURL, "The API server's URL.")
98+
cmd.Flags().StringVar(&o.PublicAPIServerURL, "public-master", o.PublicAPIServerURL, "The API public facing server's URL (if applicable).")
99+
cmd.Flags().StringSliceVar(&o.APIServerCAFiles, "certificate-authority", o.APIServerCAFiles, "Files containing signing authorities to use to verify the API server's serving certificate.")
100+
cmd.Flags().StringVar(&o.CertFile, "client-certificate", o.CertFile, "The client cert file.")
101+
cmd.Flags().StringVar(&o.KeyFile, "client-key", o.KeyFile, "The client key file.")
102+
cmd.Flags().StringVar(&o.ContextNamespace, "namespace", o.ContextNamespace, "Namespace for this context in .kubeconfig.")
103+
cmd.Flags().StringVar(&o.KubeConfigFile, "kubeconfig", o.KubeConfigFile, "Path for the resulting .kubeconfig file.")
99104

100105
// autocompletion hints
101106
cmd.MarkFlagFilename("certificate-authority")

0 commit comments

Comments
 (0)