Skip to content

K
k3s
Unverified Commit 262262b7 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #73283 from mattkelly/automated-cherry-pick-of-#73239-upstream-release-1.13

Automated cherry pick of #73239: Add back --cert-dir option for init phase certs sa
parents 6260c81b 054ccad2
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
cmd/kubeadm/app/cmd/phases/certs.go
View file @ 262262b7
...@@ -111,10 +111,11 @@ func newCertSubPhases() []workflow.Phase { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment