diff --git a/build/debs/kubeadm-10.conf b/build/debs/kubeadm-10.conf index e306564de93..92f3fcb51ac 100644 --- a/build/debs/kubeadm-10.conf +++ b/build/debs/kubeadm-10.conf @@ -1,5 +1,5 @@ [Service] -Environment="KUBELET_KUBECONFIG_ARGS=--kubeconfig=/etc/kubernetes/kubelet.conf" +Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf" Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true" Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin" Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local" diff --git a/cmd/kubeadm/app/cmd/BUILD b/cmd/kubeadm/app/cmd/BUILD index d81e4e88b8b..599eecab783 100644 --- a/cmd/kubeadm/app/cmd/BUILD +++ b/cmd/kubeadm/app/cmd/BUILD @@ -27,7 +27,6 @@ go_library( "//cmd/kubeadm/app/cmd/phases:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/discovery:go_default_library", - "//cmd/kubeadm/app/node:go_default_library", "//cmd/kubeadm/app/phases/addons:go_default_library", "//cmd/kubeadm/app/phases/apiconfig:go_default_library", "//cmd/kubeadm/app/phases/controlplane:go_default_library", @@ -46,7 +45,6 @@ go_library( "//pkg/printers:go_default_library", "//pkg/util/i18n:go_default_library", "//pkg/util/initsystem:go_default_library", - "//pkg/util/node:go_default_library", "//pkg/util/version:go_default_library", "//pkg/version:go_default_library", "//vendor/github.com/ghodss/yaml:go_default_library", diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index 1a43befa338..39f921865eb 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -32,12 +32,10 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/discovery" - kubeadmnode "k8s.io/kubernetes/cmd/kubeadm/app/node" "k8s.io/kubernetes/cmd/kubeadm/app/preflight" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" "k8s.io/kubernetes/pkg/api" - nodeutil "k8s.io/kubernetes/pkg/util/node" ) var ( @@ -178,20 +176,7 @@ func (j *Join) Run(out io.Writer) error { return err } - hostname := nodeutil.GetHostname(j.cfg.NodeName) - - client, err := kubeconfigutil.KubeConfigToClientSet(cfg) - if err != nil { - return err - } - if err := kubeadmnode.ValidateAPIServer(client); err != nil { - return err - } - if err := kubeadmnode.PerformTLSBootstrap(cfg, hostname); err != nil { - return err - } - - kubeconfigFile := filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.KubeletKubeConfigFileName) + kubeconfigFile := filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.KubeletBootstrapKubeConfigFileName) if err := kubeconfigutil.WriteToDisk(kubeconfigFile, cfg); err != nil { return err } diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 0259e506d73..51d8134c44b 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -59,6 +59,7 @@ const ( FrontProxyClientCertCommonName = "front-proxy-client" //used as subject.commonname attribute (CN) AdminKubeConfigFileName = "admin.conf" + KubeletBootstrapKubeConfigFileName = "bootstrap-kubelet.conf" KubeletKubeConfigFileName = "kubelet.conf" ControllerManagerKubeConfigFileName = "controller-manager.conf" SchedulerKubeConfigFileName = "scheduler.conf" diff --git a/cmd/kubeadm/app/node/BUILD b/cmd/kubeadm/app/node/BUILD index bc5d95b7636..72441de453a 100644 --- a/cmd/kubeadm/app/node/BUILD +++ b/cmd/kubeadm/app/node/BUILD @@ -10,19 +10,11 @@ load( go_library( name = "go_default_library", - srcs = [ - "csr.go", - "validate.go", - ], + srcs = ["validate.go"], tags = ["automanaged"], deps = [ - "//cmd/kubeadm/app/util/kubeconfig:go_default_library", - "//pkg/kubelet/util/csr:go_default_library", "//vendor/k8s.io/api/certificates/v1beta1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", - "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library", - "//vendor/k8s.io/client-go/util/cert:go_default_library", ], ) diff --git a/cmd/kubeadm/app/node/csr.go b/cmd/kubeadm/app/node/csr.go deleted file mode 100644 index 2f4f2b44d61..00000000000 --- a/cmd/kubeadm/app/node/csr.go +++ /dev/null @@ -1,61 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package node - -import ( - "fmt" - - "k8s.io/apimachinery/pkg/types" - clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - certutil "k8s.io/client-go/util/cert" - kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - "k8s.io/kubernetes/pkg/kubelet/util/csr" -) - -const CSRContextAndUser = "kubelet-csr" - -// PerformTLSBootstrap executes a node certificate signing request. -func PerformTLSBootstrap(cfg *clientcmdapi.Config, hostName string) error { - client, err := kubeconfigutil.KubeConfigToClientSet(cfg) - if err != nil { - return err - } - - fmt.Println("[csr] Created API client to obtain unique certificate for this node, generating keys and certificate signing request") - - key, err := certutil.MakeEllipticPrivateKeyPEM() - if err != nil { - return fmt.Errorf("failed to generate private key [%v]", err) - } - - cert, err := csr.RequestNodeCertificate(client.CertificatesV1beta1().CertificateSigningRequests(), key, types.NodeName(hostName)) - if err != nil { - return fmt.Errorf("failed to request signed certificate from the API server [%v]", err) - } - fmt.Println("[csr] Received signed certificate from the API server, generating KubeConfig...") - - cfg.AuthInfos[CSRContextAndUser] = &clientcmdapi.AuthInfo{ - ClientKeyData: key, - ClientCertificateData: cert, - } - cfg.Contexts[CSRContextAndUser] = &clientcmdapi.Context{ - AuthInfo: CSRContextAndUser, - Cluster: cfg.Contexts[cfg.CurrentContext].Cluster, - } - cfg.CurrentContext = CSRContextAndUser - return nil -} diff --git a/hack/.golint_failures b/hack/.golint_failures index 62e1024c5c4..a14714e2847 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -18,7 +18,6 @@ cmd/kubeadm/app/discovery cmd/kubeadm/app/discovery/file cmd/kubeadm/app/discovery/token cmd/kubeadm/app/images -cmd/kubeadm/app/node cmd/kubeadm/app/phases/addons cmd/kubeadm/app/phases/certs/pkiutil cmd/kubeadm/app/phases/token