Skip to content

K
k3s
Unverified Commit 218b334d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #65031 from detiber/etcd_grpc_gateway

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubadm - add comment for etcd server cert clientauth usage workaround Adds TODO requested in https://github.com/kubernetes/kubernetes/pull/65020#discussion_r194801712 **Release note**: ```release-note NONE ```
parents 95c3b399 b6450c75
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cmd/kubeadm/app/phases/certs/certs.go
View file @ 218b334d
...@@ -374,6 +374,10 @@ func NewEtcdServerCertAndKey(cfg *kubeadmapi.MasterConfiguration, caCert *x509.C ...@@ -374,6 +374,10 @@ func NewEtcdServerCertAndKey(cfg *kubeadmapi.MasterConfiguration, caCert *x509.C
return nil, nil, fmt.Errorf("failure while composing altnames for etcd: %v", err) return nil, nil, fmt.Errorf("failure while composing altnames for etcd: %v", err)
} }
// TODO: etcd 3.2 introduced an undocumented requirement for ClientAuth usage on the
// server cert: https://github.com/coreos/etcd/issues/9785#issuecomment-396715692
// Once the upstream issue is resolved, this should be returned to only allowing
// ServerAuth usage.
config := certutil.Config{ config := certutil.Config{
CommonName: cfg.NodeRegistration.Name, CommonName: cfg.NodeRegistration.Name,
AltNames: *altNames, AltNames: *altNames,
......
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