rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-11 19:53:02 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1540 from superseb/certsshagent

Browse Source 
Make commonflags work with rke cert commands
This commit is contained in:
Dan Ramich 2019-08-15 15:30:17 -07:00 committed by GitHub
commit e21da55270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cmd/cert.go
View File

@ -15,6 +15,30 @@ import (
) )
func CertificateCommand() cli.Command { func CertificateCommand() cli.Command {
rotateFlags := []cli.Flag{
cli.StringFlag{
Name: "config",
Usage: "Specify an alternate cluster YAML file",
Value: pki.ClusterConfig,
EnvVar: "RKE_CONFIG",
},
cli.StringSliceFlag{
Name: "service",
Usage: fmt.Sprintf("Specify a k8s service to rotate certs, (allowed values: %s, %s, %s, %s, %s, %s)",
services.KubeAPIContainerName,
services.KubeControllerContainerName,
services.SchedulerContainerName,
services.KubeletContainerName,
services.KubeproxyContainerName,
services.EtcdContainerName,
),
},
cli.BoolFlag{
Name: "rotate-ca",
Usage: "Rotate all certificates including CA certs",
},
}
rotateFlags = append(rotateFlags, commonFlags...)
return cli.Command{ return cli.Command{
Name: "cert", Name: "cert",
Usage: "Certificates management for RKE cluster", Usage: "Certificates management for RKE cluster",
@ -23,29 +47,7 @@ func CertificateCommand() cli.Command {
Name: "rotate", Name: "rotate",
Usage: "Rotate RKE cluster certificates", Usage: "Rotate RKE cluster certificates",
Action: rotateRKECertificatesFromCli, Action: rotateRKECertificatesFromCli,
Flags: []cli.Flag{ Flags: rotateFlags,
cli.StringFlag{
Name: "config",
Usage: "Specify an alternate cluster YAML file",
Value: pki.ClusterConfig,
EnvVar: "RKE_CONFIG",
},
cli.StringSliceFlag{
Name: "service",
Usage: fmt.Sprintf("Specify a k8s service to rotate certs, (allowed values: %s, %s, %s, %s, %s, %s)",
services.KubeAPIContainerName,
services.KubeControllerContainerName,
services.SchedulerContainerName,
services.KubeletContainerName,
services.KubeproxyContainerName,
services.EtcdContainerName,
),
},
cli.BoolFlag{
Name: "rotate-ca",
Usage: "Rotate all certificates including CA certs",
},
},
}, },
cli.Command{ cli.Command{
Name: "generate-csr", Name: "generate-csr",