github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

remove unnecessary path.Join

Browse Source 
Signed-off-by: bruceauyeung <ouyang.qinhua@zte.com.cn>
This commit is contained in:
bruceauyeung 2016-12-13 16:13:42 +08:00
parent f45e918b8b
commit 02c1814113
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubeadm/app/apis/kubeadm/env.go
View File

@ -19,6 +19,7 @@ package kubeadm
import ( import (
"fmt" "fmt"
"os" "os"
"path"
"runtime" "runtime"
"strings" "strings"
) )
@ -46,9 +47,9 @@ func SetEnvParams() *EnvParams {
} }
return &EnvParams{ return &EnvParams{
KubernetesDir: envParams["kubernetes_dir"], KubernetesDir: path.Clean(envParams["kubernetes_dir"]),
HostPKIPath: envParams["host_pki_path"], HostPKIPath: path.Clean(envParams["host_pki_path"]),
HostEtcdPath: envParams["host_etcd_path"], HostEtcdPath: path.Clean(envParams["host_etcd_path"]),
HyperkubeImage: envParams["hyperkube_image"], HyperkubeImage: envParams["hyperkube_image"],
RepositoryPrefix: envParams["repo_prefix"], RepositoryPrefix: envParams["repo_prefix"],
DiscoveryImage: envParams["discovery_image"], DiscoveryImage: envParams["discovery_image"],

2
cmd/kubeadm/app/master/discovery.go
View File

@ -66,7 +66,7 @@ func encodeKubeDiscoverySecretData(cfg *kubeadmapi.MasterConfiguration, caCert *
func newKubeDiscoveryPodSpec(cfg *kubeadmapi.MasterConfiguration) v1.PodSpec { func newKubeDiscoveryPodSpec(cfg *kubeadmapi.MasterConfiguration) v1.PodSpec {
return v1.PodSpec{ return v1.PodSpec{
// We have to use host network namespace, as `HostPort`/`HostIP` are Docker's // We have to use host network namespace, as `HostPort`/`HostIP` are Docker's
// buisness and CNI support isn't quite there yet (except for kubenet) // business and CNI support isn't quite there yet (except for kubenet)
// (see https://github.com/kubernetes/kubernetes/issues/31307) // (see https://github.com/kubernetes/kubernetes/issues/31307)
// TODO update this when #31307 is resolved // TODO update this when #31307 is resolved
HostNetwork: true, HostNetwork: true,

2
cmd/kubeadm/app/master/pki.go
View File

@ -158,7 +158,7 @@ func CreatePKIAssets(cfg *kubeadmapi.MasterConfiguration) (*rsa.PrivateKey, *x50
} }
altNames.DNSNames = append(altNames.DNSNames, cfg.API.ExternalDNSNames...) altNames.DNSNames = append(altNames.DNSNames, cfg.API.ExternalDNSNames...)
pkiPath := path.Join(kubeadmapi.GlobalEnvParams.HostPKIPath) pkiPath := kubeadmapi.GlobalEnvParams.HostPKIPath
caKey, caCert, err := newCertificateAuthority() caKey, caCert, err := newCertificateAuthority()
if err != nil { if err != nil {

2
cmd/kubeadm/app/node/bootstrap.go
View File

@ -126,7 +126,7 @@ func createClients(caCert []byte, endpoint, token string, nodeName types.NodeNam
return clientSet, nil return clientSet, nil
} }
// check to see if there are other nodes in the cluster with identical node names. // CheckForNodeNameDuplicates checks whether there are other nodes in the cluster with identical node names.
func CheckForNodeNameDuplicates(connection *ConnectionDetails) error { func CheckForNodeNameDuplicates(connection *ConnectionDetails) error {
hostName, err := os.Hostname() hostName, err := os.Hostname()
if err != nil { if err != nil {

2
cmd/kubeadm/app/util/version_test.go
View File

@ -28,7 +28,7 @@ func TestEmptyVersion(t *testing.T) {
ver, err := KubernetesReleaseVersion("") ver, err := KubernetesReleaseVersion("")
if err == nil { if err == nil {
t.Error("KubernetesReleaseVersion returned succesfully, but error expected") t.Error("KubernetesReleaseVersion returned successfully, but error expected")
} }
if ver != "" { if ver != "" {
t.Error("KubernetesReleaseVersion returned value, expected only error") t.Error("KubernetesReleaseVersion returned value, expected only error")