Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add kubeadm alpha certs certificate-key command #77848

Merged
merged 1 commit into from May 29, 2019
Merged

Add kubeadm alpha certs certificate-key command #77848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/kubeadm/app/cmd/alpha/BUILD
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ go_library(
"//cmd/kubeadm/app/constants:go_default_library",
"//cmd/kubeadm/app/features:go_default_library",
"//cmd/kubeadm/app/phases/certs/renewal:go_default_library",
"//cmd/kubeadm/app/phases/copycerts:go_default_library",
"//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
"//cmd/kubeadm/app/phases/kubelet:go_default_library",
"//cmd/kubeadm/app/phases/selfhosting:go_default_library",
Expand All @@ -33,6 +34,7 @@ go_library(
"//pkg/util/normalizer:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/duration:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
"//vendor/github.com/lithammer/dedent:go_default_library",
"//vendor/github.com/pkg/errors:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
"//vendor/k8s.io/utils/exec:go_default_library",
Expand Down
26 changes: 26 additions & 0 deletions cmd/kubeadm/app/cmd/alpha/certs.go
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@ import (
"io"
"text/tabwriter"

"github.com/lithammer/dedent"
"github.com/pkg/errors"
"github.com/spf13/cobra"

Expand All @@ -33,6 +34,7 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/certs/renewal"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/copycerts"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config"
kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
Expand Down Expand Up @@ -61,6 +63,14 @@ var (
expirationLongDesc = normalizer.LongDesc(`
Checks expiration for the certificates in the local PKI managed by kubeadm.
`)

certificateKeyLongDesc = dedent.Dedent(`
This command will print out a secure randomly-generated certificate key that can be used with
the "init" command.

You can also use "kubeadm init --experimental-upload-certs" without specifying a certificate key and it will
generate and print one for you.
`)
)

// newCmdCertsUtility returns main command for certs phase
Expand All @@ -73,9 +83,25 @@ func newCmdCertsUtility(out io.Writer) *cobra.Command {

cmd.AddCommand(newCmdCertsRenewal())
cmd.AddCommand(newCmdCertsExpiration(out, kubeadmconstants.KubernetesDir))
cmd.AddCommand(NewCmdCertificateKey())
return cmd
}

// NewCmdCertificateKey returns cobra.Command for certificate key generate
func NewCmdCertificateKey() *cobra.Command {
return &cobra.Command{
Use: "certificate-key",
Short: "Generate certificate keys",
Long: certificateKeyLongDesc,

Run: func(cmd *cobra.Command, args []string) {
key, err := copycerts.CreateCertificateKey()
kubeadmutil.CheckErr(err)
fmt.Println(key)
},
}
}

// newCmdCertsRenewal creates a new `cert renew` command.
func newCmdCertsRenewal() *cobra.Command {
cmd := &cobra.Command{
Expand Down