Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubeadm cleanup: master -> control-plane :) #73988

Merged
merged 1 commit into from
Feb 14, 2019
Merged

kubeadm cleanup: master -> control-plane :) #73988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/phases/certs/certs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ type certKeyLocation struct {
}

// 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) {

if err := validateCACertAndKey(certKeyLocation{cfg.CertificatesDir, kubeadmconstants.CACertAndKeyBaseName, "", "CA"}); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/phases/etcd/local_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
)

func TestGetEtcdPodSpec(t *testing.T) {
// Creates a Master Configuration
// Creates a ClusterConfiguration
cfg := &kubeadmapi.ClusterConfiguration{
KubernetesVersion: "v1.7.0",
Etcd: kubeadmapi.Etcd{
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/phases/kubeconfig/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package kubeconfig

INPUTS:
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 PKIPath is required for knowing where all certificates should be stored

Expand Down
10 changes: 5 additions & 5 deletions cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func TestGetKubeConfigSpecsFailsIfCADoesntExists(t *testing.T) {
tmpdir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpdir)

// Creates a Master Configuration pointing to the pkidir folder
// Creates an InitConfiguration pointing to the pkidir folder
cfg := &kubeadmapi.InitConfiguration{
ClusterConfiguration: kubeadmapi.ClusterConfiguration{
CertificatesDir: tmpdir,
Expand All @@ -66,7 +66,7 @@ func TestGetKubeConfigSpecs(t *testing.T) {
// Adds a pki folder with a ca certs to the temp folder
pkidir := testutil.SetupPkiDirWithCertificateAuthorithy(t, tmpdir)

// Creates Master Configurations pointing to the pkidir folder
// Creates InitConfigurations pointing to the pkidir folder
cfgs := []*kubeadmapi.InitConfiguration{
{
LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234},
Expand Down Expand Up @@ -305,7 +305,7 @@ func TestCreateKubeconfigFilesAndWrappers(t *testing.T) {
// Adds a pki folder with a ca certs to the temp folder
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{
LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234},
ClusterConfiguration: kubeadmapi.ClusterConfiguration{
Expand Down Expand Up @@ -335,7 +335,7 @@ func TestWriteKubeConfigFailsIfCADoesntExists(t *testing.T) {
tmpdir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpdir)

// Creates a Master Configuration pointing to the tmpdir folder
// Creates an InitConfiguration pointing to the tmpdir folder
cfg := &kubeadmapi.InitConfiguration{
ClusterConfiguration: kubeadmapi.ClusterConfiguration{
CertificatesDir: tmpdir,
Expand Down Expand Up @@ -382,7 +382,7 @@ func TestWriteKubeConfig(t *testing.T) {
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{
LocalAPIEndpoint: kubeadmapi.APIEndpoint{AdvertiseAddress: "1.2.3.4", BindPort: 1234},
ClusterConfiguration: kubeadmapi.ClusterConfiguration{
Expand Down