github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94535 from liggitt/kubeadm-unit-fix

Browse Source 
Speed up slow Kubeadm unit tests, avoid mutating global variables
This commit is contained in:
Kubernetes Prow Robot 2020-09-04 20:01:42 -07:00 committed by GitHub
commit 32ab6713df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 140 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cmd/kubeadm/app/cmd/alpha/certs_test.go
View File

@ -98,9 +98,9 @@ func TestRunRenewCommands(t *testing.T) {
CACerts := map[string]*x509.Certificate{} CACerts := map[string]*x509.Certificate{}
CAKeys := map[string]crypto.Signer{} CAKeys := map[string]crypto.Signer{}
for _, ca := range []*certsphase.KubeadmCert{ for _, ca := range []*certsphase.KubeadmCert{
&certsphase.KubeadmCertRootCA, certsphase.KubeadmCertRootCA(),
&certsphase.KubeadmCertFrontProxyCA, certsphase.KubeadmCertFrontProxyCA(),
&certsphase.KubeadmCertEtcdCA, certsphase.KubeadmCertEtcdCA(),
} { } {
caCert, caKey, err := ca.CreateAsCA(cfg) caCert, caKey, err := ca.CreateAsCA(cfg)
if err != nil { if err != nil {
@ -112,13 +112,13 @@ func TestRunRenewCommands(t *testing.T) {
// Generate all the signed certificates // Generate all the signed certificates
for _, cert := range []*certsphase.KubeadmCert{ for _, cert := range []*certsphase.KubeadmCert{
&certsphase.KubeadmCertAPIServer, certsphase.KubeadmCertAPIServer(),
&certsphase.KubeadmCertKubeletClient, certsphase.KubeadmCertKubeletClient(),
&certsphase.KubeadmCertFrontProxyClient, certsphase.KubeadmCertFrontProxyClient(),
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
&certsphase.KubeadmCertEtcdServer, certsphase.KubeadmCertEtcdServer(),
&certsphase.KubeadmCertEtcdPeer, certsphase.KubeadmCertEtcdPeer(),
&certsphase.KubeadmCertEtcdHealthcheck, certsphase.KubeadmCertEtcdHealthcheck(),
} { } {
caCert := CACerts[cert.CAName] caCert := CACerts[cert.CAName]
caKey := CAKeys[cert.CAName] caKey := CAKeys[cert.CAName]
@ -146,13 +146,13 @@ func TestRunRenewCommands(t *testing.T) {
{ {
command: "all", command: "all",
Certs: []*certsphase.KubeadmCert{ Certs: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertAPIServer, certsphase.KubeadmCertAPIServer(),
&certsphase.KubeadmCertKubeletClient, certsphase.KubeadmCertKubeletClient(),
&certsphase.KubeadmCertFrontProxyClient, certsphase.KubeadmCertFrontProxyClient(),
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
&certsphase.KubeadmCertEtcdServer, certsphase.KubeadmCertEtcdServer(),
&certsphase.KubeadmCertEtcdPeer, certsphase.KubeadmCertEtcdPeer(),
&certsphase.KubeadmCertEtcdHealthcheck, certsphase.KubeadmCertEtcdHealthcheck(),
}, },
KubeconfigFiles: []string{ KubeconfigFiles: []string{
kubeadmconstants.AdminKubeConfigFileName, kubeadmconstants.AdminKubeConfigFileName,
@ -163,43 +163,43 @@ func TestRunRenewCommands(t *testing.T) {
{ {
command: "apiserver", command: "apiserver",
Certs: []*certsphase.KubeadmCert{ Certs: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertAPIServer, certsphase.KubeadmCertAPIServer(),
}, },
}, },
{ {
command: "apiserver-kubelet-client", command: "apiserver-kubelet-client",
Certs: []*certsphase.KubeadmCert{ Certs: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertKubeletClient, certsphase.KubeadmCertKubeletClient(),
}, },
}, },
{ {
command: "apiserver-etcd-client", command: "apiserver-etcd-client",
Certs: []*certsphase.KubeadmCert{ Certs: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
}, },
}, },
{ {
command: "front-proxy-client", command: "front-proxy-client",
Certs: []*certsphase.KubeadmCert{ Certs: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertFrontProxyClient, certsphase.KubeadmCertFrontProxyClient(),
}, },
}, },
{ {
command: "etcd-server", command: "etcd-server",
Certs: []*certsphase.KubeadmCert{ Certs: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdServer, certsphase.KubeadmCertEtcdServer(),
}, },
}, },
{ {
command: "etcd-peer", command: "etcd-peer",
Certs: []*certsphase.KubeadmCert{ Certs: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdPeer, certsphase.KubeadmCertEtcdPeer(),
}, },
}, },
{ {
command: "etcd-healthcheck-client", command: "etcd-healthcheck-client",
Certs: []*certsphase.KubeadmCert{ Certs: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdHealthcheck, certsphase.KubeadmCertEtcdHealthcheck(),
}, },
}, },
{ {
@ -271,14 +271,14 @@ func TestRunRenewCommands(t *testing.T) {
func TestRenewUsingCSR(t *testing.T) { func TestRenewUsingCSR(t *testing.T) {
tmpDir := testutil.SetupTempDir(t) tmpDir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
cert := &certsphase.KubeadmCertEtcdServer cert := certsphase.KubeadmCertEtcdServer()
cfg := testutil.GetDefaultInternalConfig(t) cfg := testutil.GetDefaultInternalConfig(t)
cfg.CertificatesDir = tmpDir cfg.CertificatesDir = tmpDir
caCert, caKey, err := certsphase.KubeadmCertEtcdCA.CreateAsCA(cfg) caCert, caKey, err := certsphase.KubeadmCertEtcdCA().CreateAsCA(cfg)
if err != nil { if err != nil {
t.Fatalf("couldn't write out CA %s: %v", certsphase.KubeadmCertEtcdCA.Name, err) t.Fatalf("couldn't write out CA %s: %v", certsphase.KubeadmCertEtcdCA().Name, err)
} }
if err := cert.CreateFromCA(cfg, caCert, caKey); err != nil { if err := cert.CreateFromCA(cfg, caCert, caKey); err != nil {

2
cmd/kubeadm/app/cmd/phases/init/certs_test.go
View File

@ -44,7 +44,7 @@ func TestCertsWithCSRs(t *testing.T) {
defer os.RemoveAll(csrDir) defer os.RemoveAll(csrDir)
certDir := testutil.SetupTempDir(t) certDir := testutil.SetupTempDir(t)
defer os.RemoveAll(certDir) defer os.RemoveAll(certDir)
cert := &certs.KubeadmCertAPIServer cert := certs.KubeadmCertAPIServer()
certsData := &testCertsData{ certsData := &testCertsData{
cfg: testutil.GetDefaultInternalConfig(t), cfg: testutil.GetDefaultInternalConfig(t),

78
cmd/kubeadm/app/phases/certs/certlist.go
View File

@ -212,36 +212,36 @@ func (c Certificates) AsMap() CertificateMap {
// GetDefaultCertList returns all of the certificates kubeadm requires to function. // GetDefaultCertList returns all of the certificates kubeadm requires to function.
func GetDefaultCertList() Certificates { func GetDefaultCertList() Certificates {
return Certificates{ return Certificates{
&KubeadmCertRootCA, KubeadmCertRootCA(),
&KubeadmCertAPIServer, KubeadmCertAPIServer(),
&KubeadmCertKubeletClient, KubeadmCertKubeletClient(),
// Front Proxy certs // Front Proxy certs
&KubeadmCertFrontProxyCA, KubeadmCertFrontProxyCA(),
&KubeadmCertFrontProxyClient, KubeadmCertFrontProxyClient(),
// etcd certs // etcd certs
&KubeadmCertEtcdCA, KubeadmCertEtcdCA(),
&KubeadmCertEtcdServer, KubeadmCertEtcdServer(),
&KubeadmCertEtcdPeer, KubeadmCertEtcdPeer(),
&KubeadmCertEtcdHealthcheck, KubeadmCertEtcdHealthcheck(),
&KubeadmCertEtcdAPIClient, KubeadmCertEtcdAPIClient(),
} }
} }
// GetCertsWithoutEtcd returns all of the certificates kubeadm needs when etcd is hosted externally. // GetCertsWithoutEtcd returns all of the certificates kubeadm needs when etcd is hosted externally.
func GetCertsWithoutEtcd() Certificates { func GetCertsWithoutEtcd() Certificates {
return Certificates{ return Certificates{
&KubeadmCertRootCA, KubeadmCertRootCA(),
&KubeadmCertAPIServer, KubeadmCertAPIServer(),
&KubeadmCertKubeletClient, KubeadmCertKubeletClient(),
// Front Proxy certs // Front Proxy certs
&KubeadmCertFrontProxyCA, KubeadmCertFrontProxyCA(),
&KubeadmCertFrontProxyClient, KubeadmCertFrontProxyClient(),
} }
} }
var (
// KubeadmCertRootCA is the definition of the Kubernetes Root CA for the API Server and kubelet. // KubeadmCertRootCA is the definition of the Kubernetes Root CA for the API Server and kubelet.
KubeadmCertRootCA = KubeadmCert{ func KubeadmCertRootCA() *KubeadmCert {
return &KubeadmCert{
Name: "ca", Name: "ca",
LongName: "self-signed Kubernetes CA to provision identities for other Kubernetes components", LongName: "self-signed Kubernetes CA to provision identities for other Kubernetes components",
BaseName: kubeadmconstants.CACertAndKeyBaseName, BaseName: kubeadmconstants.CACertAndKeyBaseName,
@ -251,8 +251,11 @@ var (
}, },
}, },
} }
}
// KubeadmCertAPIServer is the definition of the cert used to serve the Kubernetes API. // KubeadmCertAPIServer is the definition of the cert used to serve the Kubernetes API.
KubeadmCertAPIServer = KubeadmCert{ func KubeadmCertAPIServer() *KubeadmCert {
return &KubeadmCert{
Name: "apiserver", Name: "apiserver",
LongName: "certificate for serving the Kubernetes API", LongName: "certificate for serving the Kubernetes API",
BaseName: kubeadmconstants.APIServerCertAndKeyBaseName, BaseName: kubeadmconstants.APIServerCertAndKeyBaseName,
@ -267,8 +270,11 @@ var (
makeAltNamesMutator(pkiutil.GetAPIServerAltNames), makeAltNamesMutator(pkiutil.GetAPIServerAltNames),
}, },
} }
}
// KubeadmCertKubeletClient is the definition of the cert used by the API server to access the kubelet. // KubeadmCertKubeletClient is the definition of the cert used by the API server to access the kubelet.
KubeadmCertKubeletClient = KubeadmCert{ func KubeadmCertKubeletClient() *KubeadmCert {
return &KubeadmCert{
Name: "apiserver-kubelet-client", Name: "apiserver-kubelet-client",
LongName: "certificate for the API server to connect to kubelet", LongName: "certificate for the API server to connect to kubelet",
BaseName: kubeadmconstants.APIServerKubeletClientCertAndKeyBaseName, BaseName: kubeadmconstants.APIServerKubeletClientCertAndKeyBaseName,
@ -281,9 +287,11 @@ var (
}, },
}, },
} }
}
// KubeadmCertFrontProxyCA is the definition of the CA used for the front end proxy. // KubeadmCertFrontProxyCA is the definition of the CA used for the front end proxy.
KubeadmCertFrontProxyCA = KubeadmCert{ func KubeadmCertFrontProxyCA() *KubeadmCert {
return &KubeadmCert{
Name: "front-proxy-ca", Name: "front-proxy-ca",
LongName: "self-signed CA to provision identities for front proxy", LongName: "self-signed CA to provision identities for front proxy",
BaseName: kubeadmconstants.FrontProxyCACertAndKeyBaseName, BaseName: kubeadmconstants.FrontProxyCACertAndKeyBaseName,
@ -293,9 +301,11 @@ var (
}, },
}, },
} }
}
// KubeadmCertFrontProxyClient is the definition of the cert used by the API server to access the front proxy. // KubeadmCertFrontProxyClient is the definition of the cert used by the API server to access the front proxy.
KubeadmCertFrontProxyClient = KubeadmCert{ func KubeadmCertFrontProxyClient() *KubeadmCert {
return &KubeadmCert{
Name: "front-proxy-client", Name: "front-proxy-client",
BaseName: kubeadmconstants.FrontProxyClientCertAndKeyBaseName, BaseName: kubeadmconstants.FrontProxyClientCertAndKeyBaseName,
LongName: "certificate for the front proxy client", LongName: "certificate for the front proxy client",
@ -307,9 +317,11 @@ var (
}, },
}, },
} }
}
// KubeadmCertEtcdCA is the definition of the root CA used by the hosted etcd server. // KubeadmCertEtcdCA is the definition of the root CA used by the hosted etcd server.
KubeadmCertEtcdCA = KubeadmCert{ func KubeadmCertEtcdCA() *KubeadmCert {
return &KubeadmCert{
Name: "etcd-ca", Name: "etcd-ca",
LongName: "self-signed CA to provision identities for etcd", LongName: "self-signed CA to provision identities for etcd",
BaseName: kubeadmconstants.EtcdCACertAndKeyBaseName, BaseName: kubeadmconstants.EtcdCACertAndKeyBaseName,
@ -319,8 +331,11 @@ var (
}, },
}, },
} }
}
// KubeadmCertEtcdServer is the definition of the cert used to serve etcd to clients. // KubeadmCertEtcdServer is the definition of the cert used to serve etcd to clients.
KubeadmCertEtcdServer = KubeadmCert{ func KubeadmCertEtcdServer() *KubeadmCert {
return &KubeadmCert{
Name: "etcd-server", Name: "etcd-server",
LongName: "certificate for serving etcd", LongName: "certificate for serving etcd",
BaseName: kubeadmconstants.EtcdServerCertAndKeyBaseName, BaseName: kubeadmconstants.EtcdServerCertAndKeyBaseName,
@ -339,8 +354,11 @@ var (
setCommonNameToNodeName(), setCommonNameToNodeName(),
}, },
} }
}
// KubeadmCertEtcdPeer is the definition of the cert used by etcd peers to access each other. // KubeadmCertEtcdPeer is the definition of the cert used by etcd peers to access each other.
KubeadmCertEtcdPeer = KubeadmCert{ func KubeadmCertEtcdPeer() *KubeadmCert {
return &KubeadmCert{
Name: "etcd-peer", Name: "etcd-peer",
LongName: "certificate for etcd nodes to communicate with each other", LongName: "certificate for etcd nodes to communicate with each other",
BaseName: kubeadmconstants.EtcdPeerCertAndKeyBaseName, BaseName: kubeadmconstants.EtcdPeerCertAndKeyBaseName,
@ -355,8 +373,11 @@ var (
setCommonNameToNodeName(), setCommonNameToNodeName(),
}, },
} }
}
// KubeadmCertEtcdHealthcheck is the definition of the cert used by Kubernetes to check the health of the etcd server. // KubeadmCertEtcdHealthcheck is the definition of the cert used by Kubernetes to check the health of the etcd server.
KubeadmCertEtcdHealthcheck = KubeadmCert{ func KubeadmCertEtcdHealthcheck() *KubeadmCert {
return &KubeadmCert{
Name: "etcd-healthcheck-client", Name: "etcd-healthcheck-client",
LongName: "certificate for liveness probes to healthcheck etcd", LongName: "certificate for liveness probes to healthcheck etcd",
BaseName: kubeadmconstants.EtcdHealthcheckClientCertAndKeyBaseName, BaseName: kubeadmconstants.EtcdHealthcheckClientCertAndKeyBaseName,
@ -369,8 +390,11 @@ var (
}, },
}, },
} }
}
// KubeadmCertEtcdAPIClient is the definition of the cert used by the API server to access etcd. // KubeadmCertEtcdAPIClient is the definition of the cert used by the API server to access etcd.
KubeadmCertEtcdAPIClient = KubeadmCert{ func KubeadmCertEtcdAPIClient() *KubeadmCert {
return &KubeadmCert{
Name: "apiserver-etcd-client", Name: "apiserver-etcd-client",
LongName: "certificate the apiserver uses to access etcd", LongName: "certificate the apiserver uses to access etcd",
BaseName: kubeadmconstants.APIServerEtcdClientCertAndKeyBaseName, BaseName: kubeadmconstants.APIServerEtcdClientCertAndKeyBaseName,
@ -383,7 +407,7 @@ var (
}, },
}, },
} }
) }
func makeAltNamesMutator(f func(*kubeadmapi.InitConfiguration) (*certutil.AltNames, error)) configMutatorsFunc { func makeAltNamesMutator(f func(*kubeadmapi.InitConfiguration) (*certutil.AltNames, error)) configMutatorsFunc {
return func(mc *kubeadmapi.InitConfiguration, cc *pkiutil.CertConfig) error { return func(mc *kubeadmapi.InitConfiguration, cc *pkiutil.CertConfig) error {

4
cmd/kubeadm/app/phases/certs/certs_test.go
View File

@ -685,7 +685,7 @@ func TestValidateMethods(t *testing.T) {
} }
func TestNewCSR(t *testing.T) { func TestNewCSR(t *testing.T) {
kubeadmCert := KubeadmCertAPIServer kubeadmCert := KubeadmCertAPIServer()
cfg := testutil.GetDefaultInternalConfig(t) cfg := testutil.GetDefaultInternalConfig(t)
certConfig, err := kubeadmCert.GetConfig(cfg) certConfig, err := kubeadmCert.GetConfig(cfg)
@ -693,7 +693,7 @@ func TestNewCSR(t *testing.T) {
t.Fatalf("couldn't get cert config: %v", err) t.Fatalf("couldn't get cert config: %v", err)
} }
csr, _, err := NewCSR(&kubeadmCert, cfg) csr, _, err := NewCSR(kubeadmCert, cfg)
if err != nil { if err != nil {
t.Errorf("invalid signature on CSR: %v", err) t.Errorf("invalid signature on CSR: %v", err)

14
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@ -554,9 +554,9 @@ func renewCertsByComponent(cfg *kubeadmapi.InitConfiguration, component string,
if component == constants.Etcd { if component == constants.Etcd {
if cfg.Etcd.Local != nil { if cfg.Etcd.Local != nil {
certificates = []string{ certificates = []string{
certsphase.KubeadmCertEtcdServer.Name, certsphase.KubeadmCertEtcdServer().Name,
certsphase.KubeadmCertEtcdPeer.Name, certsphase.KubeadmCertEtcdPeer().Name,
certsphase.KubeadmCertEtcdHealthcheck.Name, certsphase.KubeadmCertEtcdHealthcheck().Name,
} }
} }
} }
@ -565,12 +565,12 @@ func renewCertsByComponent(cfg *kubeadmapi.InitConfiguration, component string,
//if local etcd, renew also the etcd client certificate //if local etcd, renew also the etcd client certificate
if component == constants.KubeAPIServer { if component == constants.KubeAPIServer {
certificates = []string{ certificates = []string{
certsphase.KubeadmCertAPIServer.Name, certsphase.KubeadmCertAPIServer().Name,
certsphase.KubeadmCertKubeletClient.Name, certsphase.KubeadmCertKubeletClient().Name,
certsphase.KubeadmCertFrontProxyClient.Name, certsphase.KubeadmCertFrontProxyClient().Name,
} }
if cfg.Etcd.Local != nil { if cfg.Etcd.Local != nil {
certificates = append(certificates, certsphase.KubeadmCertEtcdAPIClient.Name) certificates = append(certificates, certsphase.KubeadmCertEtcdAPIClient().Name)
} }
} }

73
cmd/kubeadm/app/phases/upgrade/staticpods_test.go
View File

@ -325,7 +325,7 @@ func TestStaticPodControlPlane(t *testing.T) {
manifestShouldChange: true, manifestShouldChange: true,
}, },
{ {
description: "any wait error should result in a rollback and an abort", description: "any wait error should result in a rollback and an abort 1",
waitErrsToReturn: map[string]error{ waitErrsToReturn: map[string]error{
waitForHashes: errors.New("boo! failed"), waitForHashes: errors.New("boo! failed"),
waitForHashChange: nil, waitForHashChange: nil,
@ -338,7 +338,7 @@ func TestStaticPodControlPlane(t *testing.T) {
manifestShouldChange: false, manifestShouldChange: false,
}, },
{ {
description: "any wait error should result in a rollback and an abort", description: "any wait error should result in a rollback and an abort 2",
waitErrsToReturn: map[string]error{ waitErrsToReturn: map[string]error{
waitForHashes: nil, waitForHashes: nil,
waitForHashChange: errors.New("boo! failed"), waitForHashChange: errors.New("boo! failed"),
@ -351,7 +351,7 @@ func TestStaticPodControlPlane(t *testing.T) {
manifestShouldChange: false, manifestShouldChange: false,
}, },
{ {
description: "any wait error should result in a rollback and an abort", description: "any wait error should result in a rollback and an abort 3",
waitErrsToReturn: map[string]error{ waitErrsToReturn: map[string]error{
waitForHashes: nil, waitForHashes: nil,
waitForHashChange: nil, waitForHashChange: nil,
@ -364,7 +364,7 @@ func TestStaticPodControlPlane(t *testing.T) {
manifestShouldChange: false, manifestShouldChange: false,
}, },
{ {
description: "any path-moving error should result in a rollback and an abort", description: "any path-moving error should result in a rollback and an abort 1",
waitErrsToReturn: map[string]error{ waitErrsToReturn: map[string]error{
waitForHashes: nil, waitForHashes: nil,
waitForHashChange: nil, waitForHashChange: nil,
@ -381,7 +381,7 @@ func TestStaticPodControlPlane(t *testing.T) {
manifestShouldChange: false, manifestShouldChange: false,
}, },
{ {
description: "any path-moving error should result in a rollback and an abort", description: "any path-moving error should result in a rollback and an abort 2",
waitErrsToReturn: map[string]error{ waitErrsToReturn: map[string]error{
waitForHashes: nil, waitForHashes: nil,
waitForHashChange: nil, waitForHashChange: nil,
@ -444,8 +444,10 @@ func TestStaticPodControlPlane(t *testing.T) {
}, },
} }
for _, rt := range tests { for i := range tests {
rt := tests[i]
t.Run(rt.description, func(t *testing.T) { t.Run(rt.description, func(t *testing.T) {
t.Parallel()
waiter := NewFakeStaticPodWaiter(rt.waitErrsToReturn) waiter := NewFakeStaticPodWaiter(rt.waitErrsToReturn)
pathMgr, err := NewFakeStaticPodPathManager(rt.moveFileFunc) pathMgr, err := NewFakeStaticPodPathManager(rt.moveFileFunc)
if err != nil { if err != nil {
@ -513,15 +515,15 @@ func TestStaticPodControlPlane(t *testing.T) {
} }
// create the kubeadm etcd certs // create the kubeadm etcd certs
caCert, caKey, err := certsphase.KubeadmCertEtcdCA.CreateAsCA(newcfg) caCert, caKey, err := certsphase.KubeadmCertEtcdCA().CreateAsCA(newcfg)
if err != nil { if err != nil {
t.Fatalf("couldn't create new CA certificate: %v", err) t.Fatalf("couldn't create new CA certificate: %v", err)
} }
for _, cert := range []*certsphase.KubeadmCert{ for _, cert := range []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdServer, certsphase.KubeadmCertEtcdServer(),
&certsphase.KubeadmCertEtcdPeer, certsphase.KubeadmCertEtcdPeer(),
&certsphase.KubeadmCertEtcdHealthcheck, certsphase.KubeadmCertEtcdHealthcheck(),
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
} { } {
if err := cert.CreateFromCA(newcfg, caCert, caKey); err != nil { if err := cert.CreateFromCA(newcfg, caCert, caKey); err != nil {
t.Fatalf("couldn't create certificate %s: %v", cert.Name, err) t.Fatalf("couldn't create certificate %s: %v", cert.Name, err)
@ -685,33 +687,33 @@ func TestRenewCertsByComponent(t *testing.T) {
name: "all CA exist, all certs should be rotated for etcd", name: "all CA exist, all certs should be rotated for etcd",
component: constants.Etcd, component: constants.Etcd,
certsShouldExist: []*certsphase.KubeadmCert{ certsShouldExist: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdServer, certsphase.KubeadmCertEtcdServer(),
&certsphase.KubeadmCertEtcdPeer, certsphase.KubeadmCertEtcdPeer(),
&certsphase.KubeadmCertEtcdHealthcheck, certsphase.KubeadmCertEtcdHealthcheck(),
}, },
}, },
{ {
name: "all CA exist, all certs should be rotated for apiserver", name: "all CA exist, all certs should be rotated for apiserver",
component: constants.KubeAPIServer, component: constants.KubeAPIServer,
certsShouldExist: []*certsphase.KubeadmCert{ certsShouldExist: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
&certsphase.KubeadmCertAPIServer, certsphase.KubeadmCertAPIServer(),
&certsphase.KubeadmCertKubeletClient, certsphase.KubeadmCertKubeletClient(),
&certsphase.KubeadmCertFrontProxyClient, certsphase.KubeadmCertFrontProxyClient(),
}, },
}, },
{ {
name: "external CA, renew only certificates not signed by CA for apiserver", name: "external CA, renew only certificates not signed by CA for apiserver",
component: constants.KubeAPIServer, component: constants.KubeAPIServer,
certsShouldExist: []*certsphase.KubeadmCert{ certsShouldExist: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
&certsphase.KubeadmCertFrontProxyClient, certsphase.KubeadmCertFrontProxyClient(),
&certsphase.KubeadmCertAPIServer, certsphase.KubeadmCertAPIServer(),
&certsphase.KubeadmCertKubeletClient, certsphase.KubeadmCertKubeletClient(),
}, },
certsShouldBeRenewed: []*certsphase.KubeadmCert{ certsShouldBeRenewed: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
&certsphase.KubeadmCertFrontProxyClient, certsphase.KubeadmCertFrontProxyClient(),
}, },
externalCA: true, externalCA: true,
}, },
@ -719,15 +721,15 @@ func TestRenewCertsByComponent(t *testing.T) {
name: "external front-proxy-CA, renew only certificates not signed by front-proxy-CA for apiserver", name: "external front-proxy-CA, renew only certificates not signed by front-proxy-CA for apiserver",
component: constants.KubeAPIServer, component: constants.KubeAPIServer,
certsShouldExist: []*certsphase.KubeadmCert{ certsShouldExist: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
&certsphase.KubeadmCertFrontProxyClient, certsphase.KubeadmCertFrontProxyClient(),
&certsphase.KubeadmCertAPIServer, certsphase.KubeadmCertAPIServer(),
&certsphase.KubeadmCertKubeletClient, certsphase.KubeadmCertKubeletClient(),
}, },
certsShouldBeRenewed: []*certsphase.KubeadmCert{ certsShouldBeRenewed: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdAPIClient, certsphase.KubeadmCertEtcdAPIClient(),
&certsphase.KubeadmCertAPIServer, certsphase.KubeadmCertAPIServer(),
&certsphase.KubeadmCertKubeletClient, certsphase.KubeadmCertKubeletClient(),
}, },
externalFrontProxyCA: true, externalFrontProxyCA: true,
}, },
@ -750,8 +752,8 @@ func TestRenewCertsByComponent(t *testing.T) {
component: constants.Etcd, component: constants.Etcd,
shouldErrorOnRenew: true, shouldErrorOnRenew: true,
certsShouldExist: []*certsphase.KubeadmCert{ certsShouldExist: []*certsphase.KubeadmCert{
&certsphase.KubeadmCertEtcdServer, certsphase.KubeadmCertEtcdServer(),
&certsphase.KubeadmCertEtcdPeer, certsphase.KubeadmCertEtcdPeer(),
}, },
}, },
{ {
@ -762,8 +764,11 @@ func TestRenewCertsByComponent(t *testing.T) {
}, },
} }
for _, test := range tests { for i := range tests {
test := tests[i]
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
t.Parallel()
// Setup up basic requities // Setup up basic requities
tmpDir := testutil.SetupTempDir(t) tmpDir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)

6
cmd/kubeadm/test/cmd/init_test.go
View File

@ -212,11 +212,11 @@ func TestCmdInitCertPhaseCSR(t *testing.T) {
}{ }{
{ {
name: "generate CSR", name: "generate CSR",
baseName: certs.KubeadmCertKubeletClient.BaseName, baseName: certs.KubeadmCertKubeletClient().BaseName,
}, },
{ {
name: "fails on CSR", name: "fails on CSR",
baseName: certs.KubeadmCertRootCA.BaseName, baseName: certs.KubeadmCertRootCA().BaseName,
expectedError: "unknown flag: --csr-only", expectedError: "unknown flag: --csr-only",
}, },
{ {
@ -229,7 +229,7 @@ func TestCmdInitCertPhaseCSR(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
csrDir := testutil.SetupTempDir(t) csrDir := testutil.SetupTempDir(t)
cert := &certs.KubeadmCertKubeletClient cert := certs.KubeadmCertKubeletClient()
kubeadmPath := getKubeadmPath() kubeadmPath := getKubeadmPath()
_, stderr, _, err := RunCmd(kubeadmPath, _, stderr, _, err := RunCmd(kubeadmPath,
"init", "init",