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

fix golint failures on cmd/kubeadm/app/util/config

Browse Source
This commit is contained in:
SataQiu 2019-02-14 12:11:24 +08:00
parent a3877b1776
commit 19c7f4cb0b
3 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
cmd/kubeadm/app/util/config/initconfiguration_test.go
View File

@ -34,16 +34,16 @@ import (
) )
const ( const (
master_v1alpha3YAML = "testdata/conversion/master/v1alpha3.yaml" masterV1alpha3YAML = "testdata/conversion/master/v1alpha3.yaml"
master_v1alpha3YAMLNonLinux = "testdata/conversion/master/v1alpha3_non_linux.yaml" masterV1alpha3YAMLNonLinux = "testdata/conversion/master/v1alpha3_non_linux.yaml"
master_v1beta1YAML = "testdata/conversion/master/v1beta1.yaml" masterV1beta1YAML = "testdata/conversion/master/v1beta1.yaml"
master_v1beta1YAMLNonLinux = "testdata/conversion/master/v1beta1_non_linux.yaml" masterV1beta1YAMLNonLinux = "testdata/conversion/master/v1beta1_non_linux.yaml"
master_internalYAML = "testdata/conversion/master/internal.yaml" masterInternalYAML = "testdata/conversion/master/internal.yaml"
master_internalYAMLNonLinux = "testdata/conversion/master/internal_non_linux.yaml" masterInternalYAMLNonLinux = "testdata/conversion/master/internal_non_linux.yaml"
master_incompleteYAML = "testdata/defaulting/master/incomplete.yaml" masterIncompleteYAML = "testdata/defaulting/master/incomplete.yaml"
master_defaultedYAML = "testdata/defaulting/master/defaulted.yaml" masterDefaultedYAML = "testdata/defaulting/master/defaulted.yaml"
master_defaultedYAMLNonLinux = "testdata/defaulting/master/defaulted_non_linux.yaml" masterDefaultedYAMLNonLinux = "testdata/defaulting/master/defaulted_non_linux.yaml"
master_invalidYAML = "testdata/validation/invalid_mastercfg.yaml" masterInvalidYAML = "testdata/validation/invalid_mastercfg.yaml"
) )
func diff(expected, actual []byte) string { func diff(expected, actual []byte) string {
@ -131,15 +131,15 @@ func TestLoadInitConfigurationFromFile(t *testing.T) {
} }
func TestInitConfigurationMarshallingFromFile(t *testing.T) { func TestInitConfigurationMarshallingFromFile(t *testing.T) {
master_v1alpha3YAMLAbstracted := master_v1alpha3YAML masterV1alpha3YAMLAbstracted := masterV1alpha3YAML
master_v1beta1YAMLAbstracted := master_v1beta1YAML masterV1beta1YAMLAbstracted := masterV1beta1YAML
master_internalYAMLAbstracted := master_internalYAML masterInternalYAMLAbstracted := masterInternalYAML
master_defaultedYAMLAbstracted := master_defaultedYAML masterDefaultedYAMLAbstracted := masterDefaultedYAML
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
master_v1alpha3YAMLAbstracted = master_v1alpha3YAMLNonLinux masterV1alpha3YAMLAbstracted = masterV1alpha3YAMLNonLinux
master_v1beta1YAMLAbstracted = master_v1beta1YAMLNonLinux masterV1beta1YAMLAbstracted = masterV1beta1YAMLNonLinux
master_internalYAMLAbstracted = master_internalYAMLNonLinux masterInternalYAMLAbstracted = masterInternalYAMLNonLinux
master_defaultedYAMLAbstracted = master_defaultedYAMLNonLinux masterDefaultedYAMLAbstracted = masterDefaultedYAMLNonLinux
} }
var tests = []struct { var tests = []struct {
@ -151,39 +151,39 @@ func TestInitConfigurationMarshallingFromFile(t *testing.T) {
// and then marshals the internal object to the expected groupVersion // and then marshals the internal object to the expected groupVersion
{ // v1alpha3 -> internal { // v1alpha3 -> internal
name: "v1alpha3ToInternal", name: "v1alpha3ToInternal",
in: master_v1alpha3YAMLAbstracted, in: masterV1alpha3YAMLAbstracted,
out: master_internalYAMLAbstracted, out: masterInternalYAMLAbstracted,
groupVersion: kubeadm.SchemeGroupVersion, groupVersion: kubeadm.SchemeGroupVersion,
}, },
{ // v1beta1 -> internal { // v1beta1 -> internal
name: "v1beta1ToInternal", name: "v1beta1ToInternal",
in: master_v1beta1YAMLAbstracted, in: masterV1beta1YAMLAbstracted,
out: master_internalYAMLAbstracted, out: masterInternalYAMLAbstracted,
groupVersion: kubeadm.SchemeGroupVersion, groupVersion: kubeadm.SchemeGroupVersion,
}, },
{ // v1alpha3 -> internal -> v1beta1 { // v1alpha3 -> internal -> v1beta1
name: "v1alpha3Tov1beta1", name: "v1alpha3Tov1beta1",
in: master_v1alpha3YAMLAbstracted, in: masterV1alpha3YAMLAbstracted,
out: master_v1beta1YAMLAbstracted, out: masterV1beta1YAMLAbstracted,
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion, groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
}, },
{ // v1beta1 -> internal -> v1beta1 { // v1beta1 -> internal -> v1beta1
name: "v1beta1Tov1beta1", name: "v1beta1Tov1beta1",
in: master_v1beta1YAMLAbstracted, in: masterV1beta1YAMLAbstracted,
out: master_v1beta1YAMLAbstracted, out: masterV1beta1YAMLAbstracted,
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion, groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
}, },
// These tests are reading one file that has only a subset of the fields populated, loading it using LoadInitConfigurationFromFile, // These tests are reading one file that has only a subset of the fields populated, loading it using LoadInitConfigurationFromFile,
// and then marshals the internal object to the expected groupVersion // and then marshals the internal object to the expected groupVersion
{ // v1beta1 -> default -> validate -> internal -> v1beta1 { // v1beta1 -> default -> validate -> internal -> v1beta1
name: "incompleteYAMLToDefaultedv1beta1", name: "incompleteYAMLToDefaultedv1beta1",
in: master_incompleteYAML, in: masterIncompleteYAML,
out: master_defaultedYAMLAbstracted, out: masterDefaultedYAMLAbstracted,
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion, groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
}, },
{ // v1alpha3 -> validation should fail { // v1alpha3 -> validation should fail
name: "invalidYAMLShouldFail", name: "invalidYAMLShouldFail",
in: master_invalidYAML, in: masterInvalidYAML,
expectedErr: true, expectedErr: true,
}, },
} }

34
cmd/kubeadm/app/util/config/joinconfiguration_test.go
View File

@ -29,12 +29,12 @@ import (
) )
const ( const (
node_v1alpha3YAML = "testdata/conversion/node/v1alpha3.yaml" nodeV1alpha3YAML = "testdata/conversion/node/v1alpha3.yaml"
node_v1beta1YAML = "testdata/conversion/node/v1beta1.yaml" nodeV1beta1YAML = "testdata/conversion/node/v1beta1.yaml"
node_internalYAML = "testdata/conversion/node/internal.yaml" nodeInternalYAML = "testdata/conversion/node/internal.yaml"
node_incompleteYAML = "testdata/defaulting/node/incomplete.yaml" nodeIncompleteYAML = "testdata/defaulting/node/incomplete.yaml"
node_defaultedYAML = "testdata/defaulting/node/defaulted.yaml" nodeDefaultedYAML = "testdata/defaulting/node/defaulted.yaml"
node_invalidYAML = "testdata/validation/invalid_nodecfg.yaml" nodeInvalidYAML = "testdata/validation/invalid_nodecfg.yaml"
) )
func TestLoadJoinConfigurationFromFile(t *testing.T) { func TestLoadJoinConfigurationFromFile(t *testing.T) {
@ -47,39 +47,39 @@ func TestLoadJoinConfigurationFromFile(t *testing.T) {
// and then marshals the internal object to the expected groupVersion // and then marshals the internal object to the expected groupVersion
{ // v1alpha3 -> internal { // v1alpha3 -> internal
name: "v1alpha3ToInternal", name: "v1alpha3ToInternal",
in: node_v1alpha3YAML, in: nodeV1alpha3YAML,
out: node_internalYAML, out: nodeInternalYAML,
groupVersion: kubeadm.SchemeGroupVersion, groupVersion: kubeadm.SchemeGroupVersion,
}, },
{ // v1beta1 -> internal { // v1beta1 -> internal
name: "v1beta1ToInternal", name: "v1beta1ToInternal",
in: node_v1beta1YAML, in: nodeV1beta1YAML,
out: node_internalYAML, out: nodeInternalYAML,
groupVersion: kubeadm.SchemeGroupVersion, groupVersion: kubeadm.SchemeGroupVersion,
}, },
{ // v1alpha3 -> internal -> v1beta1 { // v1alpha3 -> internal -> v1beta1
name: "v1alpha3Tov1beta1", name: "v1alpha3Tov1beta1",
in: node_v1alpha3YAML, in: nodeV1alpha3YAML,
out: node_v1beta1YAML, out: nodeV1beta1YAML,
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion, groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
}, },
{ // v1beta1 -> internal -> v1beta1 { // v1beta1 -> internal -> v1beta1
name: "v1beta1Tov1beta1", name: "v1beta1Tov1beta1",
in: node_v1beta1YAML, in: nodeV1beta1YAML,
out: node_v1beta1YAML, out: nodeV1beta1YAML,
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion, groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
}, },
// These tests are reading one file that has only a subset of the fields populated, loading it using LoadJoinConfigurationFromFile, // These tests are reading one file that has only a subset of the fields populated, loading it using LoadJoinConfigurationFromFile,
// and then marshals the internal object to the expected groupVersion // and then marshals the internal object to the expected groupVersion
{ // v1beta1 -> default -> validate -> internal -> v1beta1 { // v1beta1 -> default -> validate -> internal -> v1beta1
name: "incompleteYAMLToDefaultedv1beta1", name: "incompleteYAMLToDefaultedv1beta1",
in: node_incompleteYAML, in: nodeIncompleteYAML,
out: node_defaultedYAML, out: nodeDefaultedYAML,
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion, groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
}, },
{ // v1alpha3 -> validation should fail { // v1alpha3 -> validation should fail
name: "invalidYAMLShouldFail", name: "invalidYAMLShouldFail",
in: node_invalidYAML, in: nodeInvalidYAML,
expectedErr: true, expectedErr: true,
}, },
} }

1
hack/.golint_failures
View File

@ -4,7 +4,6 @@ cmd/kube-controller-manager/app
cmd/kube-proxy/app cmd/kube-proxy/app
cmd/kubeadm/app/apis/kubeadm/v1alpha3 cmd/kubeadm/app/apis/kubeadm/v1alpha3
cmd/kubeadm/app/apis/kubeadm/v1beta1 cmd/kubeadm/app/apis/kubeadm/v1beta1
cmd/kubeadm/app/util/config
cmd/kubeadm/app/util/system cmd/kubeadm/app/util/system
pkg/apis/abac/latest pkg/apis/abac/latest
pkg/apis/admission pkg/apis/admission