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

Issue kubelet cert on apiserver nodes for k8s before 1.19

This commit is contained in:
John Gardiner Myers 2021-07-16 10:13:20 -07:00
parent 378a3781a5
commit 3282549577
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,8 +117,15 @@ func (b *KubeletBuilder) Build(c *fi.ModelBuilderContext) error {
if b.HasAPIServer || !b.UseBootstrapTokens() { if b.HasAPIServer || !b.UseBootstrapTokens() {
var kubeconfig fi.Resource var kubeconfig fi.Resource
if b.HasAPIServer && (b.IsKubernetesGTE("1.19") || b.UseBootstrapTokens()) { if b.HasAPIServer {
kubeconfig, err = b.buildMasterKubeletKubeconfig(c) if b.IsKubernetesGTE("1.19") || b.UseBootstrapTokens() {
kubeconfig, err = b.buildMasterKubeletKubeconfig(c)
} else {
kubeconfig = b.BuildIssuedKubeconfig("kubelet", nodetasks.PKIXName{
CommonName: "kubelet",
Organization: []string{rbac.NodesGroup},
}, c)
}
} else { } else {
kubeconfig, err = b.BuildBootstrapKubeconfig("kubelet", c) kubeconfig, err = b.BuildBootstrapKubeconfig("kubelet", c)
} }