633683c08d
A few months ago we refactored options to keep it independent of the implementations, so that it could be used in CLI tools to validate config or to generate config, without pulling in the full dependency tree of the master. This change restores that by separating server_run_options.go back to its own package. Also, options structs should never contain non-serializable types, which storagebackend.Config was doing with runtime.Codec. Split the codec out. Fix a typo on the name of the etcd2.go storage backend. Finally, move DefaultStorageMediaType to server_run_options.
90 lines
2.8 KiB
Go
90 lines
2.8 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors All rights reserved.
|
|
|
|
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 genericapiserver
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"k8s.io/kubernetes/pkg/api"
|
|
"k8s.io/kubernetes/pkg/api/unversioned"
|
|
"k8s.io/kubernetes/pkg/apis/extensions"
|
|
"k8s.io/kubernetes/pkg/genericapiserver/options"
|
|
"k8s.io/kubernetes/pkg/runtime"
|
|
"k8s.io/kubernetes/pkg/storage"
|
|
"k8s.io/kubernetes/pkg/storage/storagebackend"
|
|
)
|
|
|
|
func TestUpdateEtcdOverrides(t *testing.T) {
|
|
testCases := []struct {
|
|
resource unversioned.GroupResource
|
|
servers []string
|
|
}{
|
|
{
|
|
resource: unversioned.GroupResource{Group: api.GroupName, Resource: "resource"},
|
|
servers: []string{"http://127.0.0.1:10000"},
|
|
},
|
|
{
|
|
resource: unversioned.GroupResource{Group: api.GroupName, Resource: "resource"},
|
|
servers: []string{"http://127.0.0.1:10000", "http://127.0.0.1:20000"},
|
|
},
|
|
{
|
|
resource: unversioned.GroupResource{Group: extensions.GroupName, Resource: "resource"},
|
|
servers: []string{"http://127.0.0.1:10000"},
|
|
},
|
|
}
|
|
|
|
defaultEtcdLocation := []string{"http://127.0.0.1"}
|
|
for i, test := range testCases {
|
|
actualConfig := storagebackend.Config{}
|
|
newStorageFn := func(config storagebackend.Config, codec runtime.Codec) (_ storage.Interface, err error) {
|
|
actualConfig = config
|
|
return nil, nil
|
|
}
|
|
|
|
defaultConfig := storagebackend.Config{
|
|
Prefix: options.DefaultEtcdPathPrefix,
|
|
ServerList: defaultEtcdLocation,
|
|
}
|
|
storageFactory := NewDefaultStorageFactory(defaultConfig, "", api.Codecs, NewDefaultResourceEncodingConfig(), NewResourceConfig())
|
|
storageFactory.newStorageFn = newStorageFn
|
|
storageFactory.SetEtcdLocation(test.resource, test.servers)
|
|
|
|
var err error
|
|
_, err = storageFactory.New(test.resource)
|
|
if err != nil {
|
|
t.Errorf("%d: unexpected error %v", i, err)
|
|
continue
|
|
}
|
|
if !reflect.DeepEqual(actualConfig.ServerList, test.servers) {
|
|
t.Errorf("%d: expected %v, got %v", i, test.servers, actualConfig.ServerList)
|
|
continue
|
|
}
|
|
|
|
_, err = storageFactory.New(unversioned.GroupResource{Group: api.GroupName, Resource: "unlikely"})
|
|
if err != nil {
|
|
t.Errorf("%d: unexpected error %v", i, err)
|
|
continue
|
|
}
|
|
if !reflect.DeepEqual(actualConfig.ServerList, defaultEtcdLocation) {
|
|
t.Errorf("%d: expected %v, got %v", i, defaultEtcdLocation, actualConfig.ServerList)
|
|
continue
|
|
}
|
|
|
|
}
|
|
}
|