mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-22 06:59:03 +00:00
Currently ConfigFileAndDefaultsToInternalConfig and FetchConfigFromFileOrCluster are used to default and load InitConfiguration from file or cluster. These two APIs do a couple of completely separate things depending on how they were invoked. In the case of ConfigFileAndDefaultsToInternalConfig, an InitConfiguration could be either defaulted with external override parameters, or loaded from file. With FetchConfigFromFileOrCluster an InitConfiguration is either loaded from file or from the config map in the cluster. The two share both some functionality, but not enough code. They are also quite difficult to use and sometimes even error prone. To solve the issues, the following steps were taken: - Introduce DefaultedInitConfiguration which returns defaulted version agnostic InitConfiguration. The function takes InitConfiguration for overriding the defaults. - Introduce LoadInitConfigurationFromFile, which loads, converts, validates and defaults an InitConfiguration from file. - Introduce FetchInitConfigurationFromCluster that fetches InitConfiguration from the config map. - Reduce, when possible, the usage of ConfigFileAndDefaultsToInternalConfig by replacing it with DefaultedInitConfiguration or LoadInitConfigurationFromFile invocations. - Replace all usages of FetchConfigFromFileOrCluster with calls to LoadInitConfigurationFromFile or FetchInitConfigurationFromCluster. - Delete FetchConfigFromFileOrCluster as it's no longer used. - Rename ConfigFileAndDefaultsToInternalConfig to LoadOrDefaultInitConfiguration in order to better describe what the function is actually doing. Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
158 lines
5.2 KiB
Go
158 lines
5.2 KiB
Go
/*
|
|
Copyright 2017 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 uploadconfig
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
clientsetfake "k8s.io/client-go/kubernetes/fake"
|
|
core "k8s.io/client-go/testing"
|
|
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
|
kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
|
|
kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"
|
|
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
|
configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config"
|
|
)
|
|
|
|
func TestUploadConfiguration(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
errOnCreate error
|
|
errOnUpdate error
|
|
updateExisting bool
|
|
errExpected bool
|
|
verifyResult bool
|
|
}{
|
|
{
|
|
name: "basic validation with correct key",
|
|
verifyResult: true,
|
|
},
|
|
{
|
|
name: "update existing should report no error",
|
|
updateExisting: true,
|
|
verifyResult: true,
|
|
},
|
|
{
|
|
name: "unexpected errors for create should be returned",
|
|
errOnCreate: apierrors.NewUnauthorized(""),
|
|
errExpected: true,
|
|
},
|
|
{
|
|
name: "update existing show report error if unexpected error for update is returned",
|
|
errOnUpdate: apierrors.NewUnauthorized(""),
|
|
updateExisting: true,
|
|
errExpected: true,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t2 *testing.T) {
|
|
initialcfg := &kubeadmapiv1beta1.InitConfiguration{
|
|
LocalAPIEndpoint: kubeadmapiv1beta1.APIEndpoint{
|
|
AdvertiseAddress: "1.2.3.4",
|
|
},
|
|
ClusterConfiguration: kubeadmapiv1beta1.ClusterConfiguration{
|
|
KubernetesVersion: "v1.12.10",
|
|
},
|
|
BootstrapTokens: []kubeadmapiv1beta1.BootstrapToken{
|
|
{
|
|
Token: &kubeadmapiv1beta1.BootstrapTokenString{
|
|
ID: "abcdef",
|
|
Secret: "abcdef0123456789",
|
|
},
|
|
},
|
|
},
|
|
NodeRegistration: kubeadmapiv1beta1.NodeRegistrationOptions{
|
|
Name: "node-foo",
|
|
CRISocket: "/var/run/custom-cri.sock",
|
|
},
|
|
}
|
|
cfg, err := configutil.DefaultedInitConfiguration(initialcfg)
|
|
|
|
// cleans up component config to make cfg and decodedcfg comparable (now component config are not stored anymore in kubeadm-config config map)
|
|
cfg.ComponentConfigs = kubeadmapi.ComponentConfigs{}
|
|
|
|
if err != nil {
|
|
t2.Fatalf("UploadConfiguration() error = %v", err)
|
|
}
|
|
|
|
status := &kubeadmapi.ClusterStatus{
|
|
APIEndpoints: map[string]kubeadmapi.APIEndpoint{
|
|
"node-foo": cfg.LocalAPIEndpoint,
|
|
},
|
|
}
|
|
|
|
client := clientsetfake.NewSimpleClientset()
|
|
if tt.errOnCreate != nil {
|
|
client.PrependReactor("create", "configmaps", func(action core.Action) (bool, runtime.Object, error) {
|
|
return true, nil, tt.errOnCreate
|
|
})
|
|
}
|
|
// For idempotent test, we check the result of the second call.
|
|
if err := UploadConfiguration(cfg, client); !tt.updateExisting && (err != nil) != tt.errExpected {
|
|
t2.Fatalf("UploadConfiguration() error = %v, wantErr %v", err, tt.errExpected)
|
|
}
|
|
if tt.updateExisting {
|
|
if tt.errOnUpdate != nil {
|
|
client.PrependReactor("update", "configmaps", func(action core.Action) (bool, runtime.Object, error) {
|
|
return true, nil, tt.errOnUpdate
|
|
})
|
|
}
|
|
if err := UploadConfiguration(cfg, client); (err != nil) != tt.errExpected {
|
|
t2.Fatalf("UploadConfiguration() error = %v", err)
|
|
}
|
|
}
|
|
if tt.verifyResult {
|
|
masterCfg, err := client.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(kubeadmconstants.KubeadmConfigConfigMap, metav1.GetOptions{})
|
|
if err != nil {
|
|
t2.Fatalf("Fail to query ConfigMap error = %v", err)
|
|
}
|
|
configData := masterCfg.Data[kubeadmconstants.ClusterConfigurationConfigMapKey]
|
|
if configData == "" {
|
|
t2.Fatal("Fail to find ClusterConfigurationConfigMapKey key")
|
|
}
|
|
|
|
decodedCfg := &kubeadmapi.ClusterConfiguration{}
|
|
if err := runtime.DecodeInto(kubeadmscheme.Codecs.UniversalDecoder(), []byte(configData), decodedCfg); err != nil {
|
|
t2.Fatalf("unable to decode config from bytes: %v", err)
|
|
}
|
|
|
|
if !reflect.DeepEqual(decodedCfg, &cfg.ClusterConfiguration) {
|
|
t2.Errorf("the initial and decoded ClusterConfiguration didn't match")
|
|
}
|
|
|
|
statusData := masterCfg.Data[kubeadmconstants.ClusterStatusConfigMapKey]
|
|
if statusData == "" {
|
|
t2.Fatal("failed to find ClusterStatusConfigMapKey key")
|
|
}
|
|
|
|
decodedStatus := &kubeadmapi.ClusterStatus{}
|
|
if err := runtime.DecodeInto(kubeadmscheme.Codecs.UniversalDecoder(), []byte(statusData), decodedStatus); err != nil {
|
|
t2.Fatalf("unable to decode status from bytes: %v", err)
|
|
}
|
|
|
|
if !reflect.DeepEqual(decodedStatus, status) {
|
|
t2.Error("the initial and decoded ClusterStatus didn't match")
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|