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

Add back --cert-dir option for kubeadm init phase certs sa

Merge pull request #73239 from mattkelly/bugfix/kubeadm-sa-cert-dir
20a11ac5 · Kubernetes Prow Robot · GitHub · d027ecfa · 35faaab5 · 20a11ac5
Unverified Commit 20a11ac5 authored Jan 24, 2019 by Kubernetes Prow Robot Committed by GitHub Jan 24, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

certs.go cmd/kubeadm/app/cmd/phases/certs.go +5 -4

No files found.
--- a/cmd/kubeadm/app/cmd/phases/certs.go
+++ b/cmd/kubeadm/app/cmd/phases/certs.go
@@ -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)