github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73239 from mattkelly/bugfix/kubeadm-sa-cert-dir 

Add back --cert-dir option for kubeadm init phase certs sa
pull/564/head
Kubernetes Prow Robot 2019-01-24 08:45:36 -08:00 committed by GitHub
parent d027ecfa97 35faaab570
commit 20a11ac5cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/cmd/phases/certs.go
View File

@ -111,10 +111,11 @@ func newCertSubPhases() []workflow.Phase {
// SA creates the private/public key pair, which doesn't use x509 at all // SA creates the private/public key pair, which doesn't use x509 at all
saPhase := workflow.Phase{ saPhase := workflow.Phase{
Name: "sa", Name: "sa",
Short: "Generates a private key for signing service account tokens along with its public key", Short: "Generates a private key for signing service account tokens along with its public key",
Long: saKeyLongDesc, Long: saKeyLongDesc,
Run: runCertsSa, Run: runCertsSa,
InheritFlags: []string{options.CertificatesDir},
} }
subPhases = append(subPhases, saPhase) subPhases = append(subPhases, saPhase)