09f753a94c
Currently JoinConfigFileAndDefaultsToInternalConfig is doing a couple of different things depending on its parameters. It: - loads a versioned JoinConfiguration from an YAML file. - returns defaulted JoinConfiguration allowing for some overrides. In order to make code more manageable, the following steps are taken: - Introduce LoadJoinConfigurationFromFile, which loads a versioned JoinConfiguration from an YAML file, defaults it (both dynamically and statically), converts it to internal JoinConfiguration and validates it. - Introduce DefaultedJoinConfiguration, which returns defaulted (both dynamically and statically) and verified internal JoinConfiguration. The possibility of overwriting defaults via versioned JoinConfiguration is retained. - Re-implement JoinConfigFileAndDefaultsToInternalConfig to use LoadJoinConfigurationFromFile and DefaultedJoinConfiguration. - Replace some calls to JoinConfigFileAndDefaultsToInternalConfig with calls to either LoadJoinConfigurationFromFile or DefaultedJoinConfiguration where appropriate. - Rename JoinConfigFileAndDefaultsToInternalConfig to the more appropriate name LoadOrDefaultJoinConfiguration. Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
115 lines
3.8 KiB
Go
115 lines
3.8 KiB
Go
/*
|
|
Copyright 2018 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package config
|
|
|
|
import (
|
|
"bytes"
|
|
"io/ioutil"
|
|
"testing"
|
|
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
|
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
|
|
kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"
|
|
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
|
|
)
|
|
|
|
const (
|
|
node_v1alpha3YAML = "testdata/conversion/node/v1alpha3.yaml"
|
|
node_v1beta1YAML = "testdata/conversion/node/v1beta1.yaml"
|
|
node_internalYAML = "testdata/conversion/node/internal.yaml"
|
|
node_incompleteYAML = "testdata/defaulting/node/incomplete.yaml"
|
|
node_defaultedYAML = "testdata/defaulting/node/defaulted.yaml"
|
|
node_invalidYAML = "testdata/validation/invalid_nodecfg.yaml"
|
|
)
|
|
|
|
func TestLoadJoinConfigurationFromFile(t *testing.T) {
|
|
var tests = []struct {
|
|
name, in, out string
|
|
groupVersion schema.GroupVersion
|
|
expectedErr bool
|
|
}{
|
|
// These tests are reading one file, loading it using LoadJoinConfigurationFromFile that all of kubeadm is using for unmarshal of our API types,
|
|
// and then marshals the internal object to the expected groupVersion
|
|
{ // v1alpha3 -> internal
|
|
name: "v1alpha3ToInternal",
|
|
in: node_v1alpha3YAML,
|
|
out: node_internalYAML,
|
|
groupVersion: kubeadm.SchemeGroupVersion,
|
|
},
|
|
{ // v1beta1 -> internal
|
|
name: "v1beta1ToInternal",
|
|
in: node_v1beta1YAML,
|
|
out: node_internalYAML,
|
|
groupVersion: kubeadm.SchemeGroupVersion,
|
|
},
|
|
{ // v1alpha3 -> internal -> v1beta1
|
|
name: "v1alpha3Tov1beta1",
|
|
in: node_v1alpha3YAML,
|
|
out: node_v1beta1YAML,
|
|
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
|
|
},
|
|
{ // v1beta1 -> internal -> v1beta1
|
|
name: "v1beta1Tov1beta1",
|
|
in: node_v1beta1YAML,
|
|
out: node_v1beta1YAML,
|
|
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
|
|
},
|
|
// 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
|
|
{ // v1beta1 -> default -> validate -> internal -> v1beta1
|
|
name: "incompleteYAMLToDefaultedv1beta1",
|
|
in: node_incompleteYAML,
|
|
out: node_defaultedYAML,
|
|
groupVersion: kubeadmapiv1beta1.SchemeGroupVersion,
|
|
},
|
|
{ // v1alpha3 -> validation should fail
|
|
name: "invalidYAMLShouldFail",
|
|
in: node_invalidYAML,
|
|
expectedErr: true,
|
|
},
|
|
}
|
|
|
|
for _, rt := range tests {
|
|
t.Run(rt.name, func(t2 *testing.T) {
|
|
|
|
internalcfg, err := LoadJoinConfigurationFromFile(rt.in)
|
|
if err != nil {
|
|
if rt.expectedErr {
|
|
return
|
|
}
|
|
t2.Fatalf("couldn't unmarshal test data: %v", err)
|
|
}
|
|
|
|
actual, err := kubeadmutil.MarshalToYamlForCodecs(internalcfg, rt.groupVersion, scheme.Codecs)
|
|
if err != nil {
|
|
t2.Fatalf("couldn't marshal internal object: %v", err)
|
|
}
|
|
|
|
expected, err := ioutil.ReadFile(rt.out)
|
|
if err != nil {
|
|
t2.Fatalf("couldn't read test data: %v", err)
|
|
}
|
|
|
|
if !bytes.Equal(expected, actual) {
|
|
t2.Errorf("the expected and actual output differs.\n\tin: %s\n\tout: %s\n\tgroupversion: %s\n\tdiff: \n%s\n",
|
|
rt.in, rt.out, rt.groupVersion.String(), diff(expected, actual))
|
|
}
|
|
})
|
|
}
|
|
}
|