vendor updates

This commit is contained in:
Serguei Bezverkhi
2018-03-06 17:33:18 -05:00
parent 4b3ebc171b
commit e9033989a0
5854 changed files with 248382 additions and 119809 deletions

View File

@ -22,10 +22,10 @@ go_test(
"token_test.go",
"version_test.go",
],
args = ["--kubeadm-path=../../kubeadm"],
args = ["--kubeadm-path=$(location //cmd/kubeadm:kubeadm)"],
data = ["//cmd/kubeadm"],
importpath = "k8s.io/kubernetes/cmd/kubeadm/test/cmd",
library = ":go_default_library",
embed = [":go_default_library"],
rundir = ".",
tags = [
"integration",
"skip",

View File

@ -117,12 +117,12 @@ func TestCmdVersionOutputJsonOrYaml(t *testing.T) {
m := obj.(map[string]interface{})
if m["clientVersion"] == nil {
t.Errorf("failed to get the infomation of clientVersion from 'kubeadm version %s'", rt.args)
t.Errorf("failed to get the information of clientVersion from 'kubeadm version %s'", rt.args)
}
info := m["clientVersion"].(map[string]interface{})
for _, key := range VersionInfo {
if len(info[key].(string)) == 0 {
t.Errorf("failed to get the infomation of %s from 'kubeadm version %s'", key, rt.args)
t.Errorf("failed to get the information of %s from 'kubeadm version %s'", key, rt.args)
}
}
}

View File

@ -44,7 +44,7 @@ func SetupTempDir(t *testing.T) string {
// SetupMasterConfigurationFile is a utility function for kubeadm testing that writes a master configuration file
// into /config subfolder of a given temporary directory.
// The funtion returns the path of the created master configuration file.
// The function returns the path of the created master configuration file.
func SetupMasterConfigurationFile(t *testing.T, tmpdir string, cfg *kubeadmapi.MasterConfiguration) string {
cfgPath := filepath.Join(tmpdir, "config/masterconfig.yaml")
@ -89,7 +89,7 @@ func SetupEmptyFiles(t *testing.T, tmpdir string, fileNames ...string) {
// SetupPkiDirWithCertificateAuthorithy is a utility function for kubeadm testing that creates a
// CertificateAuthorithy cert/key pair into /pki subfolder of a given temporary directory.
// The funtion returns the path of the created pki.
// The function returns the path of the created pki.
func SetupPkiDirWithCertificateAuthorithy(t *testing.T, tmpdir string) string {
caCert, caKey := certtestutil.SetupCertificateAuthorithy(t)