github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73988 from SataQiu/kubeadm-cleanup-20190213

Browse Source 
kubeadm cleanup: master -> control-plane :)
This commit is contained in:
Kubernetes Prow Robot 2019-02-13 20:32:57 -08:00 committed by GitHub
commit 5b600c5ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/certs/certs.go
View File

@ -328,7 +328,7 @@ type certKeyLocation struct {
} }
// SharedCertificateExists verifies if the shared certificates - the certificates that must be // SharedCertificateExists verifies if the shared certificates - the certificates that must be
// equal across masters: ca.key, ca.crt, sa.key, sa.pub + etcd/ca.key, etcd/ca.crt if local/stacked etcd // equal across control-plane nodes: ca.key, ca.crt, sa.key, sa.pub + etcd/ca.key, etcd/ca.crt if local/stacked etcd
func SharedCertificateExists(cfg *kubeadmapi.ClusterConfiguration) (bool, error) { func SharedCertificateExists(cfg *kubeadmapi.ClusterConfiguration) (bool, error) {
if err := validateCACertAndKey(certKeyLocation{cfg.CertificatesDir, kubeadmconstants.CACertAndKeyBaseName, "", "CA"}); err != nil { if err := validateCACertAndKey(certKeyLocation{cfg.CertificatesDir, kubeadmconstants.CACertAndKeyBaseName, "", "CA"}); err != nil {

2
cmd/kubeadm/app/phases/etcd/local_test.go
View File

@ -31,7 +31,7 @@ import (
) )
func TestGetEtcdPodSpec(t *testing.T) { func TestGetEtcdPodSpec(t *testing.T) {
// Creates a Master Configuration // Creates a ClusterConfiguration
cfg := &kubeadmapi.ClusterConfiguration{ cfg := &kubeadmapi.ClusterConfiguration{
KubernetesVersion: "v1.7.0", KubernetesVersion: "v1.7.0",
Etcd: kubeadmapi.Etcd{ Etcd: kubeadmapi.Etcd{

2
cmd/kubeadm/app/phases/kubeconfig/doc.go
View File

@ -22,7 +22,7 @@ package kubeconfig
INPUTS: INPUTS:
From InitConfiguration From InitConfiguration
The Master API Server endpoint (AdvertiseAddress + BindPort) is required so the kubeconfig file knows where to find the master The API Server endpoint (AdvertiseAddress + BindPort) is required so the kubeconfig file knows where to find the control-plane
The KubernetesDir path is required for knowing where to put the kubeconfig files The KubernetesDir path is required for knowing where to put the kubeconfig files
The PKIPath is required for knowing where all certificates should be stored The PKIPath is required for knowing where all certificates should be stored

10
cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
View File

@ -45,7 +45,7 @@ func TestGetKubeConfigSpecsFailsIfCADoesntExists(t *testing.T) {
tmpdir := testutil.SetupTempDir(t) tmpdir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpdir) defer os.RemoveAll(tmpdir)
// Creates a Master Configuration pointing to the pkidir folder // Creates an InitConfiguration pointing to the pkidir folder
cfg := &kubeadmapi.InitConfiguration{ cfg := &kubeadmapi.InitConfiguration{
ClusterConfiguration: kubeadmapi.ClusterConfiguration{ ClusterConfiguration: kubeadmapi.ClusterConfiguration{
CertificatesDir: tmpdir, CertificatesDir: tmpdir,
@ -66,7 +66,7 @@ func TestGetKubeConfigSpecs(t *testing.T) {
// Adds a pki folder with a ca certs to the temp folder // Adds a pki folder with a ca certs to the temp folder
pkidir := testutil.SetupPkiDirWithCertificateAuthorithy(t, tmpdir) pkidir := testutil.SetupPkiDirWithCertificateAuthorithy(t, tmpdir)
// Creates Master Configurations pointing to the pkidir folder // Creates InitConfigurations pointing to the pkidir folder
cfgs := []*kubeadmapi.InitConfiguration{ cfgs := []*kubeadmapi.InitConfiguration{
{ {
LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234}, LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234},
@ -305,7 +305,7 @@ func TestCreateKubeconfigFilesAndWrappers(t *testing.T) {
// Adds a pki folder with a ca certs to the temp folder // Adds a pki folder with a ca certs to the temp folder
pkidir := testutil.SetupPkiDirWithCertificateAuthorithy(t, tmpdir) pkidir := testutil.SetupPkiDirWithCertificateAuthorithy(t, tmpdir)
// Creates a Master Configuration pointing to the pkidir folder // Creates an InitConfiguration pointing to the pkidir folder
cfg := &kubeadmapi.InitConfiguration{ cfg := &kubeadmapi.InitConfiguration{
LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234}, LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234},
ClusterConfiguration: kubeadmapi.ClusterConfiguration{ ClusterConfiguration: kubeadmapi.ClusterConfiguration{
@ -335,7 +335,7 @@ func TestWriteKubeConfigFailsIfCADoesntExists(t *testing.T) {
tmpdir := testutil.SetupTempDir(t) tmpdir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpdir) defer os.RemoveAll(tmpdir)
// Creates a Master Configuration pointing to the tmpdir folder // Creates an InitConfiguration pointing to the tmpdir folder
cfg := &kubeadmapi.InitConfiguration{ cfg := &kubeadmapi.InitConfiguration{
ClusterConfiguration: kubeadmapi.ClusterConfiguration{ ClusterConfiguration: kubeadmapi.ClusterConfiguration{
CertificatesDir: tmpdir, CertificatesDir: tmpdir,
@ -382,7 +382,7 @@ func TestWriteKubeConfig(t *testing.T) {
t.Fatalf("couldn't retrieve ca cert: %v", err) t.Fatalf("couldn't retrieve ca cert: %v", err)
} }
// Creates a Master Configuration pointing to the pkidir folder // Creates an InitConfiguration pointing to the pkidir folder
cfg := &kubeadmapi.InitConfiguration{ cfg := &kubeadmapi.InitConfiguration{
LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234}, LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234},
ClusterConfiguration: kubeadmapi.ClusterConfiguration{ ClusterConfiguration: kubeadmapi.ClusterConfiguration{