f507bc2553
This change updates the API server code to load the encryption config once at start up instead of multiple times. Previously the code would set up the storage transformers and the etcd healthz checks in separate parse steps. This is problematic for KMS v2 key ID based staleness checks which need to be able to assert that the API server has a single view into the KMS plugin's current key ID. Signed-off-by: Monis Khan <mok@microsoft.com>
53 lines
1.8 KiB
Go
53 lines
1.8 KiB
Go
/*
|
|
Copyright 2015 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 registrytest
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
"k8s.io/apiserver/pkg/server/options"
|
|
serverstorage "k8s.io/apiserver/pkg/server/storage"
|
|
etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
|
|
"k8s.io/apiserver/pkg/storage/storagebackend"
|
|
"k8s.io/kubernetes/pkg/kubeapiserver"
|
|
)
|
|
|
|
// NewEtcdStorage is for testing. It configures the etcd storage for a bogus resource; the test must not care.
|
|
func NewEtcdStorage(t *testing.T, group string) (*storagebackend.ConfigForResource, *etcd3testing.EtcdTestServer) {
|
|
return NewEtcdStorageForResource(t, schema.GroupResource{Group: group, Resource: "any"})
|
|
}
|
|
|
|
func NewEtcdStorageForResource(t *testing.T, resource schema.GroupResource) (*storagebackend.ConfigForResource, *etcd3testing.EtcdTestServer) {
|
|
t.Helper()
|
|
|
|
server, config := etcd3testing.NewUnsecuredEtcd3TestClientServer(t)
|
|
|
|
options := options.NewEtcdOptions(config)
|
|
completedConfig := kubeapiserver.NewStorageFactoryConfig().Complete(options)
|
|
completedConfig.APIResourceConfig = serverstorage.NewResourceConfig()
|
|
factory, err := completedConfig.New()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
resourceConfig, err := factory.NewConfig(resource)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return resourceConfig, server
|
|
}
|