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

Merge pull request #5351 from gambol99/remove_unrequired 

Removing Duplication
This commit is contained in:
k8s-ci-robot 2018-06-20 02:06:06 -07:00 committed by GitHub
parent a92ee72153 f4e90e1035
commit cd820a6be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
nodeup/pkg/model/convenience.go
View File

@ -18,16 +18,15 @@ package model
import (
"fmt"
"path/filepath"
"sort"
"strconv"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
"github.com/golang/glog"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
)
// s is a helper that builds a *string from a string value
@ -93,68 +92,6 @@ func getProxyEnvVars(proxies *kops.EgressProxySpec) []v1.EnvVar {
}
}
// buildCertificateRequest retrieves the certificate from a keystore
func buildCertificateRequest(c *fi.ModelBuilderContext, b *NodeupModelContext, name, path string) error {
cert, err := b.KeyStore.FindCert(name)
if err != nil {
return err
}
if cert == nil {
return fmt.Errorf("certificate %q not found", name)
}
serialized, err := cert.AsString()
if err != nil {
return err
}
location := filepath.Join(b.PathSrvKubernetes(), fmt.Sprintf("%s.pem", name))
if path != "" {
location = path
}
c.AddTask(&nodetasks.File{
Path: location,
Contents: fi.NewStringResource(serialized),
Type: nodetasks.FileType_File,
Mode: s("0600"),
})
return nil
}
// buildPrivateKeyRequest retrieves a private key from the store
func buildPrivateKeyRequest(c *fi.ModelBuilderContext, b *NodeupModelContext, name, path string) error {
k, err := b.KeyStore.FindPrivateKey(name)
if err != nil {
return err
}
if k == nil {
return fmt.Errorf("private key %q not found", name)
}
serialized, err := k.AsString()
if err != nil {
return err
}
location := filepath.Join(b.PathSrvKubernetes(), fmt.Sprintf("%s-key.pem", name))
if path != "" {
location = path
}
c.AddTask(&nodetasks.File{
Path: location,
Contents: fi.NewStringResource(serialized),
Type: nodetasks.FileType_File,
Mode: s("0600"),
})
return nil
}
// sortedStrings is just a one liner helper methods
func sortedStrings(list []string) []string {
sort.Strings(list)

4
nodeup/pkg/model/kube_apiserver.go
View File

@ -94,10 +94,10 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error {
// @check if we are using secure client certificates for kubelet and grab the certificates
if b.UseSecureKubelet() {
name := "kubelet-api"
if err := buildCertificateRequest(c, b.NodeupModelContext, name, ""); err != nil {
if err := b.BuildCertificateTask(c, name, name+".pem"); err != nil {
return err
}
if err := buildPrivateKeyRequest(c, b.NodeupModelContext, name, ""); err != nil {
if err := b.BuildPrivateKeyTask(c, name, name+"-key.pem"); err != nil {
return err
}
}