kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor buildMasterKubeletKubeconfig

This commit is contained in:
John Gardiner Myers 2020-06-16 21:29:26 -07:00
parent c8b523e8b6
commit 8a2dfeb377
2 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nodeup/pkg/model/BUILD.bazel
View File

@ -52,7 +52,6 @@ go_library(
"//pkg/kubemanifest:go_default_library", "//pkg/kubemanifest:go_default_library",
"//pkg/model/components:go_default_library", "//pkg/model/components:go_default_library",
"//pkg/nodelabels:go_default_library", "//pkg/nodelabels:go_default_library",
"//pkg/pki:go_default_library",
"//pkg/rbac:go_default_library", "//pkg/rbac:go_default_library",
"//pkg/systemd:go_default_library", "//pkg/systemd:go_default_library",
"//pkg/tokens:go_default_library", "//pkg/tokens:go_default_library",

49
nodeup/pkg/model/kubelet.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package model package model
import ( import (
"crypto/x509/pkix"
"fmt" "fmt"
"path" "path"
"path/filepath" "path/filepath"
@ -34,7 +33,6 @@ import (
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/flagbuilder" "k8s.io/kops/pkg/flagbuilder"
"k8s.io/kops/pkg/nodelabels" "k8s.io/kops/pkg/nodelabels"
"k8s.io/kops/pkg/pki"
"k8s.io/kops/pkg/rbac" "k8s.io/kops/pkg/rbac"
"k8s.io/kops/pkg/systemd" "k8s.io/kops/pkg/systemd"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
@ -113,11 +111,10 @@ func (b *KubeletBuilder) Build(c *fi.ModelBuilderContext) error {
if b.IsMaster { if b.IsMaster {
klog.V(3).Info("kubelet bootstrap tokens are enabled and running on a master") klog.V(3).Info("kubelet bootstrap tokens are enabled and running on a master")
task, err := b.buildMasterKubeletKubeconfig() err := b.buildMasterKubeletKubeconfig(c)
if err != nil { if err != nil {
return err return err
} }
c.AddTask(task)
} }
} else { } else {
kubeconfig, err := b.BuildPKIKubeconfig("kubelet") kubeconfig, err := b.BuildPKIKubeconfig("kubelet")
@ -553,49 +550,23 @@ func (b *KubeletBuilder) buildKubeletConfigSpec() (*kops.KubeletConfigSpec, erro
} }
// buildMasterKubeletKubeconfig builds a kubeconfig for the master kubelet, self-signing the kubelet cert // buildMasterKubeletKubeconfig builds a kubeconfig for the master kubelet, self-signing the kubelet cert
func (b *KubeletBuilder) buildMasterKubeletKubeconfig() (*nodetasks.File, error) { func (b *KubeletBuilder) buildMasterKubeletKubeconfig(c *fi.ModelBuilderContext) error {
nodeName, err := b.NodeName() nodeName, err := b.NodeName()
if err != nil { if err != nil {
return nil, fmt.Errorf("error getting NodeName: %v", err) return fmt.Errorf("error getting NodeName: %v", err)
} }
certName := nodetasks.PKIXName{
req := &pki.IssueCertRequest{
Signer: fi.CertificateIDCA,
Type: "client",
Subject: pkix.Name{
CommonName: fmt.Sprintf("system:node:%s", nodeName), CommonName: fmt.Sprintf("system:node:%s", nodeName),
Organization: []string{rbac.NodesGroup}, Organization: []string{rbac.NodesGroup},
},
MinValidDays: 455,
} }
certificate, privateKey, caCert, err := pki.IssueCert(req, b.KeyStore) kubeconfig := b.BuildIssuedKubeconfig("kubelet", certName, c)
if err != nil { c.AddTask(&nodetasks.File{
return nil, fmt.Errorf("error signing certificate for master kubelet: %v", err)
}
caBytes, err := caCert.AsBytes()
if err != nil {
return nil, fmt.Errorf("failed to get certificate authority data: %s", err)
}
certBytes, err := certificate.AsBytes()
if err != nil {
return nil, fmt.Errorf("failed to get certificate data: %s", err)
}
keyBytes, err := privateKey.AsBytes()
if err != nil {
return nil, fmt.Errorf("failed to get private key data: %s", err)
}
content, err := b.BuildKubeConfig("kubelet", caBytes, certBytes, keyBytes)
if err != nil {
return nil, err
}
return &nodetasks.File{
Path: b.KubeletKubeConfig(), Path: b.KubeletKubeConfig(),
Contents: fi.NewStringResource(content), Contents: kubeconfig,
Type: nodetasks.FileType_File, Type: nodetasks.FileType_File,
Mode: s("600"), Mode: s("600"),
}, nil })
return nil
} }