Skip to content

Commit

Permalink
Merge pull request #73239 from mattkelly/bugfix/kubeadm-sa-cert-dir
Browse files Browse the repository at this point in the history
Add back --cert-dir option for kubeadm init phase certs sa
  • Loading branch information
k8s-ci-robot committed Jan 24, 2019
2 parents d027ecf + 35faaab commit 20a11ac
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions cmd/kubeadm/app/cmd/phases/certs.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,11 @@ func newCertSubPhases() []workflow.Phase {

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

subPhases = append(subPhases, saPhase)
Expand Down

0 comments on commit 20a11ac

Please sign in to comment.