github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 20:50:24 +00:00
Code Issues Projects Releases Wiki Activity

Restore old apiserver cert CN

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2016-10-28 09:20:57 +02:00
parent fefdad2366
commit 05d290e5be
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/genericapiserver/serve.go
View File

@@ -22,11 +22,13 @@ import (
"fmt" "fmt"
"net" "net"
"net/http" "net/http"
"strings"
"sync" "sync"
"time" "time"
certutil "k8s.io/kubernetes/pkg/util/cert" certutil "k8s.io/kubernetes/pkg/util/cert"
utilruntime "k8s.io/kubernetes/pkg/util/runtime" utilruntime "k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/validation"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/pkg/errors" "github.com/pkg/errors"
@@ -220,8 +222,9 @@ func getNamedCertificateMap(namedCertKeys []NamedCertKey) (map[string]*tls.Certi
if err != nil { if err != nil {
return nil, fmt.Errorf("parse error for certificate in %q: %v", nkc.CertFile, err) return nil, fmt.Errorf("parse error for certificate in %q: %v", nkc.CertFile, err)
} }
if len(x509Cert.Subject.CommonName) > 0 { cn := x509Cert.Subject.CommonName
tlsCertsByName[x509Cert.Subject.CommonName] = cert if cn == "*" || len(validation.IsDNS1123Subdomain(strings.TrimPrefix(cn, "*."))) == 0 {
tlsCertsByName[cn] = cert
} }
for _, san := range x509Cert.DNSNames { for _, san := range x509Cert.DNSNames {
tlsCertsByName[san] = cert tlsCertsByName[san] = cert

2
pkg/util/cert/cert.go
View File

@@ -138,7 +138,7 @@ func GenerateSelfSignedCertKey(host string, alternateIPs []net.IP, alternateDNS
template := x509.Certificate{ template := x509.Certificate{
SerialNumber: big.NewInt(1), SerialNumber: big.NewInt(1),
Subject: pkix.Name{ Subject: pkix.Name{
CommonName: host, CommonName: fmt.Sprintf("%s@%d", host, time.Now().Unix()),
}, },
NotBefore: time.Now(), NotBefore: time.Now(),
NotAfter: time.Now().Add(time.Hour * 24 * 365), NotAfter: time.Now().Add(time.Hour * 24 * 365),