mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
rename
This commit is contained in:
parent
1f0305fe1b
commit
15e0e3e90e
@ -50,7 +50,7 @@ import (
|
|||||||
informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1"
|
informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1"
|
||||||
"k8s.io/kube-aggregator/pkg/controllers/autoregister"
|
"k8s.io/kube-aggregator/pkg/controllers/autoregister"
|
||||||
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
|
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
|
||||||
"k8s.io/kubernetes/pkg/master/controller/crdregistration"
|
"k8s.io/kubernetes/pkg/controlplane/controller/crdregistration"
|
||||||
)
|
)
|
||||||
|
|
||||||
func createAggregatorConfig(
|
func createAggregatorConfig(
|
||||||
|
@ -33,7 +33,7 @@ import (
|
|||||||
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
||||||
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
||||||
"k8s.io/kubernetes/pkg/cluster/ports"
|
"k8s.io/kubernetes/pkg/cluster/ports"
|
||||||
"k8s.io/kubernetes/pkg/master/reconcilers"
|
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
|
||||||
"k8s.io/kubernetes/pkg/serviceaccount"
|
"k8s.io/kubernetes/pkg/serviceaccount"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ import (
|
|||||||
kapi "k8s.io/kubernetes/pkg/apis/core"
|
kapi "k8s.io/kubernetes/pkg/apis/core"
|
||||||
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
||||||
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
||||||
"k8s.io/kubernetes/pkg/master/reconcilers"
|
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestAddFlags(t *testing.T) {
|
func TestAddFlags(t *testing.T) {
|
||||||
|
@ -76,9 +76,9 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
|
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
|
||||||
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
||||||
kubeserver "k8s.io/kubernetes/pkg/kubeapiserver/server"
|
kubeserver "k8s.io/kubernetes/pkg/kubeapiserver/server"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/pkg/master/reconcilers"
|
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
|
||||||
"k8s.io/kubernetes/pkg/master/tunneler"
|
"k8s.io/kubernetes/pkg/controlplane/tunneler"
|
||||||
rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
|
rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
|
||||||
"k8s.io/kubernetes/pkg/serviceaccount"
|
"k8s.io/kubernetes/pkg/serviceaccount"
|
||||||
)
|
)
|
||||||
@ -225,7 +225,7 @@ func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CreateKubeAPIServer creates and wires a workable kube-apiserver
|
// CreateKubeAPIServer creates and wires a workable kube-apiserver
|
||||||
func CreateKubeAPIServer(kubeAPIServerConfig *master.Config, delegateAPIServer genericapiserver.DelegationTarget) (*master.Master, error) {
|
func CreateKubeAPIServer(kubeAPIServerConfig *controlplane.Config, delegateAPIServer genericapiserver.DelegationTarget) (*controlplane.Master, error) {
|
||||||
kubeAPIServer, err := kubeAPIServerConfig.Complete().New(delegateAPIServer)
|
kubeAPIServer, err := kubeAPIServerConfig.Complete().New(delegateAPIServer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -287,7 +287,7 @@ func CreateKubeAPIServerConfig(
|
|||||||
nodeTunneler tunneler.Tunneler,
|
nodeTunneler tunneler.Tunneler,
|
||||||
proxyTransport *http.Transport,
|
proxyTransport *http.Transport,
|
||||||
) (
|
) (
|
||||||
*master.Config,
|
*controlplane.Config,
|
||||||
*genericapiserver.DeprecatedInsecureServingInfo,
|
*genericapiserver.DeprecatedInsecureServingInfo,
|
||||||
aggregatorapiserver.ServiceResolver,
|
aggregatorapiserver.ServiceResolver,
|
||||||
[]admission.PluginInitializer,
|
[]admission.PluginInitializer,
|
||||||
@ -320,7 +320,7 @@ func CreateKubeAPIServerConfig(
|
|||||||
|
|
||||||
s.Logs.Apply()
|
s.Logs.Apply()
|
||||||
|
|
||||||
serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange)
|
serviceIPRange, apiServerServiceIP, err := controlplane.ServiceIPRange(s.PrimaryServiceClusterIPRange)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, nil, nil, err
|
return nil, nil, nil, nil, err
|
||||||
}
|
}
|
||||||
@ -329,15 +329,15 @@ func CreateKubeAPIServerConfig(
|
|||||||
var secondaryServiceIPRange net.IPNet
|
var secondaryServiceIPRange net.IPNet
|
||||||
// process secondary range only if provided by user
|
// process secondary range only if provided by user
|
||||||
if s.SecondaryServiceClusterIPRange.IP != nil {
|
if s.SecondaryServiceClusterIPRange.IP != nil {
|
||||||
secondaryServiceIPRange, _, err = master.ServiceIPRange(s.SecondaryServiceClusterIPRange)
|
secondaryServiceIPRange, _, err = controlplane.ServiceIPRange(s.SecondaryServiceClusterIPRange)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, nil, nil, err
|
return nil, nil, nil, nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
config := &master.Config{
|
config := &controlplane.Config{
|
||||||
GenericConfig: genericConfig,
|
GenericConfig: genericConfig,
|
||||||
ExtraConfig: master.ExtraConfig{
|
ExtraConfig: controlplane.ExtraConfig{
|
||||||
APIResourceConfigSource: storageFactory.APIResourceConfigSource,
|
APIResourceConfigSource: storageFactory.APIResourceConfigSource,
|
||||||
StorageFactory: storageFactory,
|
StorageFactory: storageFactory,
|
||||||
EventTTL: s.EventTTL,
|
EventTTL: s.EventTTL,
|
||||||
@ -442,7 +442,7 @@ func buildGenericConfig(
|
|||||||
lastErr error,
|
lastErr error,
|
||||||
) {
|
) {
|
||||||
genericConfig = genericapiserver.NewConfig(legacyscheme.Codecs)
|
genericConfig = genericapiserver.NewConfig(legacyscheme.Codecs)
|
||||||
genericConfig.MergedResourceConfig = master.DefaultAPIResourceConfigSource()
|
genericConfig.MergedResourceConfig = controlplane.DefaultAPIResourceConfigSource()
|
||||||
|
|
||||||
if lastErr = s.GenericServerRunOptions.ApplyTo(genericConfig); lastErr != nil {
|
if lastErr = s.GenericServerRunOptions.ApplyTo(genericConfig); lastErr != nil {
|
||||||
return
|
return
|
||||||
@ -457,7 +457,7 @@ func buildGenericConfig(
|
|||||||
if lastErr = s.Features.ApplyTo(genericConfig); lastErr != nil {
|
if lastErr = s.Features.ApplyTo(genericConfig); lastErr != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if lastErr = s.APIEnablement.ApplyTo(genericConfig, master.DefaultAPIResourceConfigSource(), legacyscheme.Scheme); lastErr != nil {
|
if lastErr = s.APIEnablement.ApplyTo(genericConfig, controlplane.DefaultAPIResourceConfigSource(), legacyscheme.Scheme); lastErr != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if lastErr = s.EgressSelector.ApplyTo(genericConfig); lastErr != nil {
|
if lastErr = s.EgressSelector.ApplyTo(genericConfig); lastErr != nil {
|
||||||
@ -727,7 +727,7 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne
|
|||||||
// nothing provided by user, use default range (only applies to the Primary)
|
// nothing provided by user, use default range (only applies to the Primary)
|
||||||
if len(serviceClusterIPRangeList) == 0 {
|
if len(serviceClusterIPRangeList) == 0 {
|
||||||
var primaryServiceClusterCIDR net.IPNet
|
var primaryServiceClusterCIDR net.IPNet
|
||||||
primaryServiceIPRange, apiServerServiceIP, err = master.ServiceIPRange(primaryServiceClusterCIDR)
|
primaryServiceIPRange, apiServerServiceIP, err = controlplane.ServiceIPRange(primaryServiceClusterCIDR)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges: %v", err)
|
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges: %v", err)
|
||||||
}
|
}
|
||||||
@ -740,7 +740,7 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne
|
|||||||
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr")
|
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr")
|
||||||
}
|
}
|
||||||
|
|
||||||
primaryServiceIPRange, apiServerServiceIP, err = master.ServiceIPRange(*(primaryServiceClusterCIDR))
|
primaryServiceIPRange, apiServerServiceIP, err = controlplane.ServiceIPRange(*(primaryServiceClusterCIDR))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err)
|
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -34,7 +34,7 @@ import (
|
|||||||
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||||
"k8s.io/client-go/rest"
|
"k8s.io/client-go/rest"
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
"k8s.io/kubernetes/pkg/master/reconcilers"
|
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
|
||||||
"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
|
"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
|
||||||
corerest "k8s.io/kubernetes/pkg/registry/core/rest"
|
corerest "k8s.io/kubernetes/pkg/registry/core/rest"
|
||||||
servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller"
|
servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller"
|
||||||
|
@ -27,7 +27,7 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/util/intstr"
|
"k8s.io/apimachinery/pkg/util/intstr"
|
||||||
"k8s.io/client-go/kubernetes/fake"
|
"k8s.io/client-go/kubernetes/fake"
|
||||||
core "k8s.io/client-go/testing"
|
core "k8s.io/client-go/testing"
|
||||||
"k8s.io/kubernetes/pkg/master/reconcilers"
|
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestReconcileEndpoints(t *testing.T) {
|
func TestReconcileEndpoints(t *testing.T) {
|
||||||
|
@ -16,4 +16,4 @@ limitations under the License.
|
|||||||
|
|
||||||
// Package master contains code for setting up and running a Kubernetes
|
// Package master contains code for setting up and running a Kubernetes
|
||||||
// cluster master.
|
// cluster master.
|
||||||
package controlplane // import "k8s.io/kubernetes/pkg/master"
|
package controlplane // import "k8s.io/kubernetes/pkg/controlplane"
|
||||||
|
@ -82,9 +82,9 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/features"
|
"k8s.io/kubernetes/pkg/features"
|
||||||
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
||||||
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
||||||
"k8s.io/kubernetes/pkg/master/controller/clusterauthenticationtrust"
|
"k8s.io/kubernetes/pkg/controlplane/controller/clusterauthenticationtrust"
|
||||||
"k8s.io/kubernetes/pkg/master/reconcilers"
|
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
|
||||||
"k8s.io/kubernetes/pkg/master/tunneler"
|
"k8s.io/kubernetes/pkg/controlplane/tunneler"
|
||||||
"k8s.io/kubernetes/pkg/routes"
|
"k8s.io/kubernetes/pkg/routes"
|
||||||
"k8s.io/kubernetes/pkg/serviceaccount"
|
"k8s.io/kubernetes/pkg/serviceaccount"
|
||||||
nodeutil "k8s.io/kubernetes/pkg/util/node"
|
nodeutil "k8s.io/kubernetes/pkg/util/node"
|
||||||
|
@ -52,8 +52,8 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/apis/networking"
|
"k8s.io/kubernetes/pkg/apis/networking"
|
||||||
apisstorage "k8s.io/kubernetes/pkg/apis/storage"
|
apisstorage "k8s.io/kubernetes/pkg/apis/storage"
|
||||||
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
||||||
"k8s.io/kubernetes/pkg/master/reconcilers"
|
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
|
||||||
"k8s.io/kubernetes/pkg/master/storageversionhashdata"
|
"k8s.io/kubernetes/pkg/controlplane/storageversionhashdata"
|
||||||
certificatesrest "k8s.io/kubernetes/pkg/registry/certificates/rest"
|
certificatesrest "k8s.io/kubernetes/pkg/registry/certificates/rest"
|
||||||
corerest "k8s.io/kubernetes/pkg/registry/core/rest"
|
corerest "k8s.io/kubernetes/pkg/registry/core/rest"
|
||||||
"k8s.io/kubernetes/pkg/registry/registrytest"
|
"k8s.io/kubernetes/pkg/registry/registrytest"
|
||||||
|
@ -62,7 +62,7 @@ import (
|
|||||||
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
|
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/test/integration"
|
"k8s.io/kubernetes/test/integration"
|
||||||
"k8s.io/kubernetes/test/integration/framework"
|
"k8s.io/kubernetes/test/integration/framework"
|
||||||
)
|
)
|
||||||
@ -82,7 +82,7 @@ func setupWithResources(t *testing.T, groupVersions []schema.GroupVersion, resou
|
|||||||
func setupWithResourcesWithOptions(t *testing.T, opts *framework.MasterConfigOptions, groupVersions []schema.GroupVersion, resources []schema.GroupVersionResource) (*httptest.Server, clientset.Interface, framework.CloseFunc) {
|
func setupWithResourcesWithOptions(t *testing.T, opts *framework.MasterConfigOptions, groupVersions []schema.GroupVersion, resources []schema.GroupVersionResource) (*httptest.Server, clientset.Interface, framework.CloseFunc) {
|
||||||
masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(opts)
|
masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(opts)
|
||||||
if len(groupVersions) > 0 || len(resources) > 0 {
|
if len(groupVersions) > 0 || len(resources) > 0 {
|
||||||
resourceConfig := master.DefaultAPIResourceConfigSource()
|
resourceConfig := controlplane.DefaultAPIResourceConfigSource()
|
||||||
resourceConfig.EnableVersions(groupVersions...)
|
resourceConfig.EnableVersions(groupVersions...)
|
||||||
resourceConfig.EnableResources(resources...)
|
resourceConfig.EnableResources(resources...)
|
||||||
masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig
|
masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig
|
||||||
|
@ -45,7 +45,7 @@ import (
|
|||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
restclient "k8s.io/client-go/rest"
|
restclient "k8s.io/client-go/rest"
|
||||||
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/test/integration/framework"
|
"k8s.io/kubernetes/test/integration/framework"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -54,7 +54,7 @@ func setup(t testing.TB, groupVersions ...schema.GroupVersion) (*httptest.Server
|
|||||||
opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"
|
opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"
|
||||||
masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(&opts)
|
masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(&opts)
|
||||||
if len(groupVersions) > 0 {
|
if len(groupVersions) > 0 {
|
||||||
resourceConfig := master.DefaultAPIResourceConfigSource()
|
resourceConfig := controlplane.DefaultAPIResourceConfigSource()
|
||||||
resourceConfig.EnableVersions(groupVersions...)
|
resourceConfig.EnableVersions(groupVersions...)
|
||||||
masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig
|
masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ import (
|
|||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/client-go/rest"
|
"k8s.io/client-go/rest"
|
||||||
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/test/integration/framework"
|
"k8s.io/kubernetes/test/integration/framework"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ func setup(t testing.TB) (*httptest.Server, *rest.Config, framework.CloseFunc) {
|
|||||||
opts := framework.MasterConfigOptions{EtcdOptions: framework.DefaultEtcdOptions()}
|
opts := framework.MasterConfigOptions{EtcdOptions: framework.DefaultEtcdOptions()}
|
||||||
opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"
|
opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"
|
||||||
masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(&opts)
|
masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(&opts)
|
||||||
resourceConfig := master.DefaultAPIResourceConfigSource()
|
resourceConfig := controlplane.DefaultAPIResourceConfigSource()
|
||||||
resourceConfig.EnableVersions(schema.GroupVersion{
|
resourceConfig.EnableVersions(schema.GroupVersion{
|
||||||
Group: "flowcontrol.apiserver.k8s.io",
|
Group: "flowcontrol.apiserver.k8s.io",
|
||||||
Version: "v1alpha1",
|
Version: "v1alpha1",
|
||||||
|
@ -34,7 +34,7 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/controller"
|
"k8s.io/kubernetes/pkg/controller"
|
||||||
"k8s.io/kubernetes/pkg/features"
|
"k8s.io/kubernetes/pkg/features"
|
||||||
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/test/integration/framework"
|
"k8s.io/kubernetes/test/integration/framework"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -77,7 +77,7 @@ func TestDynamicClientBuilder(t *testing.T) {
|
|||||||
opts.Authentication.ServiceAccounts.Issuer = iss
|
opts.Authentication.ServiceAccounts.Issuer = iss
|
||||||
opts.Authentication.ServiceAccounts.KeyFiles = []string{tmpfile.Name()}
|
opts.Authentication.ServiceAccounts.KeyFiles = []string{tmpfile.Name()}
|
||||||
},
|
},
|
||||||
ModifyServerConfig: func(config *master.Config) {
|
ModifyServerConfig: func(config *controlplane.Config) {
|
||||||
config.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysAllowAuthorizer()
|
config.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysAllowAuthorizer()
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@ -49,7 +49,7 @@ import (
|
|||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
"k8s.io/kubernetes/pkg/api/legacyscheme"
|
"k8s.io/kubernetes/pkg/api/legacyscheme"
|
||||||
rbachelper "k8s.io/kubernetes/pkg/apis/rbac/v1"
|
rbachelper "k8s.io/kubernetes/pkg/apis/rbac/v1"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/pkg/registry/rbac/clusterrole"
|
"k8s.io/kubernetes/pkg/registry/rbac/clusterrole"
|
||||||
clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage"
|
clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage"
|
||||||
"k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding"
|
"k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding"
|
||||||
@ -78,7 +78,7 @@ func clientsetForToken(user string, config *restclient.Config) (clientset.Interf
|
|||||||
}
|
}
|
||||||
|
|
||||||
type testRESTOptionsGetter struct {
|
type testRESTOptionsGetter struct {
|
||||||
config *master.Config
|
config *controlplane.Config
|
||||||
}
|
}
|
||||||
|
|
||||||
func (getter *testRESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) {
|
func (getter *testRESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) {
|
||||||
@ -89,7 +89,7 @@ func (getter *testRESTOptionsGetter) GetRESTOptions(resource schema.GroupResourc
|
|||||||
return generic.RESTOptions{StorageConfig: storageConfig, Decorator: generic.UndecoratedStorage, ResourcePrefix: resource.Resource}, nil
|
return generic.RESTOptions{StorageConfig: storageConfig, Decorator: generic.UndecoratedStorage, ResourcePrefix: resource.Resource}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func newRBACAuthorizer(t *testing.T, config *master.Config) authorizer.Authorizer {
|
func newRBACAuthorizer(t *testing.T, config *controlplane.Config) authorizer.Authorizer {
|
||||||
optsGetter := &testRESTOptionsGetter{config}
|
optsGetter := &testRESTOptionsGetter{config}
|
||||||
roleRest, err := rolestore.NewREST(optsGetter)
|
roleRest, err := rolestore.NewREST(optsGetter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -50,7 +50,7 @@ import (
|
|||||||
"k8s.io/kubernetes/test/integration/framework"
|
"k8s.io/kubernetes/test/integration/framework"
|
||||||
|
|
||||||
// install all APIs
|
// install all APIs
|
||||||
_ "k8s.io/kubernetes/pkg/master"
|
_ "k8s.io/kubernetes/pkg/controlplane"
|
||||||
)
|
)
|
||||||
|
|
||||||
// StartRealMasterOrDie starts an API master that is appropriate for use in tests that require one of every resource
|
// StartRealMasterOrDie starts an API master that is appropriate for use in tests that require one of every resource
|
||||||
|
@ -29,8 +29,8 @@ import (
|
|||||||
auditinternal "k8s.io/apiserver/pkg/apis/audit"
|
auditinternal "k8s.io/apiserver/pkg/apis/audit"
|
||||||
"k8s.io/apiserver/pkg/authorization/authorizer"
|
"k8s.io/apiserver/pkg/authorization/authorizer"
|
||||||
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
|
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/pkg/master/reconcilers"
|
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
|
||||||
"k8s.io/kubernetes/test/integration/framework"
|
"k8s.io/kubernetes/test/integration/framework"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ func TestWebhookLoopback(t *testing.T) {
|
|||||||
client, _ := framework.StartTestServer(t, stopCh, framework.TestServerSetup{
|
client, _ := framework.StartTestServer(t, stopCh, framework.TestServerSetup{
|
||||||
ModifyServerRunOptions: func(opts *options.ServerRunOptions) {
|
ModifyServerRunOptions: func(opts *options.ServerRunOptions) {
|
||||||
},
|
},
|
||||||
ModifyServerConfig: func(config *master.Config) {
|
ModifyServerConfig: func(config *controlplane.Config) {
|
||||||
// Avoid resolveable kubernetes service
|
// Avoid resolveable kubernetes service
|
||||||
config.ExtraConfig.EndpointReconcilerType = reconcilers.NoneEndpointReconcilerType
|
config.ExtraConfig.EndpointReconcilerType = reconcilers.NoneEndpointReconcilerType
|
||||||
|
|
||||||
|
@ -56,13 +56,13 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/generated/openapi"
|
"k8s.io/kubernetes/pkg/generated/openapi"
|
||||||
"k8s.io/kubernetes/pkg/kubeapiserver"
|
"k8s.io/kubernetes/pkg/kubeapiserver"
|
||||||
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Config is a struct of configuration directives for NewMasterComponents.
|
// Config is a struct of configuration directives for NewMasterComponents.
|
||||||
type Config struct {
|
type Config struct {
|
||||||
// If nil, a default is used, partially filled configs will not get populated.
|
// If nil, a default is used, partially filled configs will not get populated.
|
||||||
MasterConfig *master.Config
|
MasterConfig *controlplane.Config
|
||||||
StartReplicationManager bool
|
StartReplicationManager bool
|
||||||
// Client throttling qps
|
// Client throttling qps
|
||||||
QPS float32
|
QPS float32
|
||||||
@ -89,17 +89,17 @@ func alwaysEmpty(req *http.Request) (*authauthenticator.Response, bool, error) {
|
|||||||
|
|
||||||
// MasterReceiver can be used to provide the master to a custom incoming server function
|
// MasterReceiver can be used to provide the master to a custom incoming server function
|
||||||
type MasterReceiver interface {
|
type MasterReceiver interface {
|
||||||
SetMaster(m *master.Master)
|
SetMaster(m *controlplane.Master)
|
||||||
}
|
}
|
||||||
|
|
||||||
// MasterHolder implements
|
// MasterHolder implements
|
||||||
type MasterHolder struct {
|
type MasterHolder struct {
|
||||||
Initialized chan struct{}
|
Initialized chan struct{}
|
||||||
M *master.Master
|
M *controlplane.Master
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetMaster assigns the current master.
|
// SetMaster assigns the current master.
|
||||||
func (h *MasterHolder) SetMaster(m *master.Master) {
|
func (h *MasterHolder) SetMaster(m *controlplane.Master) {
|
||||||
h.M = m
|
h.M = m
|
||||||
close(h.Initialized)
|
close(h.Initialized)
|
||||||
}
|
}
|
||||||
@ -124,8 +124,8 @@ func DefaultOpenAPIConfig() *openapicommon.Config {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// startMasterOrDie starts a kubernetes master and an httpserver to handle api requests
|
// startMasterOrDie starts a kubernetes master and an httpserver to handle api requests
|
||||||
func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Server, masterReceiver MasterReceiver) (*master.Master, *httptest.Server, CloseFunc) {
|
func startMasterOrDie(masterConfig *controlplane.Config, incomingServer *httptest.Server, masterReceiver MasterReceiver) (*controlplane.Master, *httptest.Server, CloseFunc) {
|
||||||
var m *master.Master
|
var m *controlplane.Master
|
||||||
var s *httptest.Server
|
var s *httptest.Server
|
||||||
|
|
||||||
// Ensure we log at least level 4
|
// Ensure we log at least level 4
|
||||||
@ -249,16 +249,16 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewIntegrationTestMasterConfig returns the master config appropriate for most integration tests.
|
// NewIntegrationTestMasterConfig returns the master config appropriate for most integration tests.
|
||||||
func NewIntegrationTestMasterConfig() *master.Config {
|
func NewIntegrationTestMasterConfig() *controlplane.Config {
|
||||||
return NewIntegrationTestMasterConfigWithOptions(&MasterConfigOptions{})
|
return NewIntegrationTestMasterConfigWithOptions(&MasterConfigOptions{})
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewIntegrationTestMasterConfigWithOptions returns the master config appropriate for most integration tests
|
// NewIntegrationTestMasterConfigWithOptions returns the master config appropriate for most integration tests
|
||||||
// configured with the provided options.
|
// configured with the provided options.
|
||||||
func NewIntegrationTestMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config {
|
func NewIntegrationTestMasterConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config {
|
||||||
masterConfig := NewMasterConfigWithOptions(opts)
|
masterConfig := NewMasterConfigWithOptions(opts)
|
||||||
masterConfig.GenericConfig.PublicAddress = net.ParseIP("192.168.10.4")
|
masterConfig.GenericConfig.PublicAddress = net.ParseIP("192.168.10.4")
|
||||||
masterConfig.ExtraConfig.APIResourceConfigSource = master.DefaultAPIResourceConfigSource()
|
masterConfig.ExtraConfig.APIResourceConfigSource = controlplane.DefaultAPIResourceConfigSource()
|
||||||
|
|
||||||
// TODO: get rid of these tests or port them to secure serving
|
// TODO: get rid of these tests or port them to secure serving
|
||||||
masterConfig.GenericConfig.SecureServing = &genericapiserver.SecureServingInfo{Listener: fakeLocalhost443Listener{}}
|
masterConfig.GenericConfig.SecureServing = &genericapiserver.SecureServingInfo{Listener: fakeLocalhost443Listener{}}
|
||||||
@ -282,12 +282,12 @@ func DefaultEtcdOptions() *options.EtcdOptions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewMasterConfig returns a basic master config.
|
// NewMasterConfig returns a basic master config.
|
||||||
func NewMasterConfig() *master.Config {
|
func NewMasterConfig() *controlplane.Config {
|
||||||
return NewMasterConfigWithOptions(&MasterConfigOptions{})
|
return NewMasterConfigWithOptions(&MasterConfigOptions{})
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewMasterConfigWithOptions returns a basic master config configured with the provided options.
|
// NewMasterConfigWithOptions returns a basic master config configured with the provided options.
|
||||||
func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config {
|
func NewMasterConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config {
|
||||||
etcdOptions := DefaultEtcdOptions()
|
etcdOptions := DefaultEtcdOptions()
|
||||||
if opts.EtcdOptions != nil {
|
if opts.EtcdOptions != nil {
|
||||||
etcdOptions = opts.EtcdOptions
|
etcdOptions = opts.EtcdOptions
|
||||||
@ -317,10 +317,10 @@ func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config {
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &master.Config{
|
return &controlplane.Config{
|
||||||
GenericConfig: genericConfig,
|
GenericConfig: genericConfig,
|
||||||
ExtraConfig: master.ExtraConfig{
|
ExtraConfig: controlplane.ExtraConfig{
|
||||||
APIResourceConfigSource: master.DefaultAPIResourceConfigSource(),
|
APIResourceConfigSource: controlplane.DefaultAPIResourceConfigSource(),
|
||||||
StorageFactory: storageFactory,
|
StorageFactory: storageFactory,
|
||||||
KubeletClientConfig: kubeletclient.KubeletClientConfig{Port: 10250},
|
KubeletClientConfig: kubeletclient.KubeletClientConfig{Port: 10250},
|
||||||
APIServerServicePort: 443,
|
APIServerServicePort: 443,
|
||||||
@ -333,7 +333,7 @@ func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config {
|
|||||||
type CloseFunc func()
|
type CloseFunc func()
|
||||||
|
|
||||||
// RunAMaster starts a master with the provided config.
|
// RunAMaster starts a master with the provided config.
|
||||||
func RunAMaster(masterConfig *master.Config) (*master.Master, *httptest.Server, CloseFunc) {
|
func RunAMaster(masterConfig *controlplane.Config) (*controlplane.Master, *httptest.Server, CloseFunc) {
|
||||||
if masterConfig == nil {
|
if masterConfig == nil {
|
||||||
masterConfig = NewMasterConfig()
|
masterConfig = NewMasterConfig()
|
||||||
masterConfig.GenericConfig.EnableProfiling = true
|
masterConfig.GenericConfig.EnableProfiling = true
|
||||||
@ -342,7 +342,7 @@ func RunAMaster(masterConfig *master.Config) (*master.Master, *httptest.Server,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// RunAMasterUsingServer starts up a master using the provided config on the specified server.
|
// RunAMasterUsingServer starts up a master using the provided config on the specified server.
|
||||||
func RunAMasterUsingServer(masterConfig *master.Config, s *httptest.Server, masterReceiver MasterReceiver) (*master.Master, *httptest.Server, CloseFunc) {
|
func RunAMasterUsingServer(masterConfig *controlplane.Config, s *httptest.Server, masterReceiver MasterReceiver) (*controlplane.Master, *httptest.Server, CloseFunc) {
|
||||||
return startMasterOrDie(masterConfig, s, masterReceiver)
|
return startMasterOrDie(masterConfig, s, masterReceiver)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,14 +37,14 @@ import (
|
|||||||
"k8s.io/client-go/util/cert"
|
"k8s.io/client-go/util/cert"
|
||||||
"k8s.io/kubernetes/cmd/kube-apiserver/app"
|
"k8s.io/kubernetes/cmd/kube-apiserver/app"
|
||||||
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
|
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/test/utils"
|
"k8s.io/kubernetes/test/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestServerSetup holds configuration information for a kube-apiserver test server.
|
// TestServerSetup holds configuration information for a kube-apiserver test server.
|
||||||
type TestServerSetup struct {
|
type TestServerSetup struct {
|
||||||
ModifyServerRunOptions func(*options.ServerRunOptions)
|
ModifyServerRunOptions func(*options.ServerRunOptions)
|
||||||
ModifyServerConfig func(*master.Config)
|
ModifyServerConfig func(*controlplane.Config)
|
||||||
}
|
}
|
||||||
|
|
||||||
// StartTestServer runs a kube-apiserver, optionally calling out to the setup.ModifyServerRunOptions and setup.ModifyServerConfig functions
|
// StartTestServer runs a kube-apiserver, optionally calling out to the setup.ModifyServerRunOptions and setup.ModifyServerConfig functions
|
||||||
|
@ -48,7 +48,7 @@ import (
|
|||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
clienttypedv1 "k8s.io/client-go/kubernetes/typed/core/v1"
|
clienttypedv1 "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||||
restclient "k8s.io/client-go/rest"
|
restclient "k8s.io/client-go/rest"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/test/integration"
|
"k8s.io/kubernetes/test/integration"
|
||||||
"k8s.io/kubernetes/test/integration/framework"
|
"k8s.io/kubernetes/test/integration/framework"
|
||||||
)
|
)
|
||||||
@ -143,13 +143,13 @@ func TestEmptyList(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func initStatusForbiddenMasterCongfig() *master.Config {
|
func initStatusForbiddenMasterCongfig() *controlplane.Config {
|
||||||
masterConfig := framework.NewIntegrationTestMasterConfig()
|
masterConfig := framework.NewIntegrationTestMasterConfig()
|
||||||
masterConfig.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysDenyAuthorizer()
|
masterConfig.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysDenyAuthorizer()
|
||||||
return masterConfig
|
return masterConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
func initUnauthorizedMasterCongfig() *master.Config {
|
func initUnauthorizedMasterCongfig() *controlplane.Config {
|
||||||
masterConfig := framework.NewIntegrationTestMasterConfig()
|
masterConfig := framework.NewIntegrationTestMasterConfig()
|
||||||
tokenAuthenticator := tokentest.New()
|
tokenAuthenticator := tokentest.New()
|
||||||
tokenAuthenticator.Tokens[AliceToken] = &user.DefaultInfo{Name: "alice", UID: "1"}
|
tokenAuthenticator.Tokens[AliceToken] = &user.DefaultInfo{Name: "alice", UID: "1"}
|
||||||
@ -162,7 +162,7 @@ func initUnauthorizedMasterCongfig() *master.Config {
|
|||||||
func TestStatus(t *testing.T) {
|
func TestStatus(t *testing.T) {
|
||||||
testCases := []struct {
|
testCases := []struct {
|
||||||
name string
|
name string
|
||||||
masterConfig *master.Config
|
masterConfig *controlplane.Config
|
||||||
statusCode int
|
statusCode int
|
||||||
reqPath string
|
reqPath string
|
||||||
reason string
|
reason string
|
||||||
|
@ -20,21 +20,21 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
genericapiserver "k8s.io/apiserver/pkg/server"
|
genericapiserver "k8s.io/apiserver/pkg/server"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
)
|
)
|
||||||
|
|
||||||
// This test references methods that OpenShift uses to customize the master on startup, that
|
// This test references methods that OpenShift uses to customize the master on startup, that
|
||||||
// are not referenced directly by a master.
|
// are not referenced directly by a master.
|
||||||
func TestMasterExportsSymbols(t *testing.T) {
|
func TestMasterExportsSymbols(t *testing.T) {
|
||||||
_ = &master.Config{
|
_ = &controlplane.Config{
|
||||||
GenericConfig: &genericapiserver.Config{
|
GenericConfig: &genericapiserver.Config{
|
||||||
EnableMetrics: true,
|
EnableMetrics: true,
|
||||||
},
|
},
|
||||||
ExtraConfig: master.ExtraConfig{
|
ExtraConfig: controlplane.ExtraConfig{
|
||||||
EnableLogsSupport: false,
|
EnableLogsSupport: false,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
_ = &master.Master{
|
_ = &controlplane.Master{
|
||||||
GenericAPIServer: &genericapiserver.GenericAPIServer{},
|
GenericAPIServer: &genericapiserver.GenericAPIServer{},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ import (
|
|||||||
"k8s.io/client-go/tools/events"
|
"k8s.io/client-go/tools/events"
|
||||||
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
|
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
|
||||||
"k8s.io/kubernetes/pkg/features"
|
"k8s.io/kubernetes/pkg/features"
|
||||||
"k8s.io/kubernetes/pkg/master"
|
"k8s.io/kubernetes/pkg/controlplane"
|
||||||
"k8s.io/kubernetes/pkg/scheduler"
|
"k8s.io/kubernetes/pkg/scheduler"
|
||||||
"k8s.io/kubernetes/pkg/scheduler/profile"
|
"k8s.io/kubernetes/pkg/scheduler/profile"
|
||||||
"k8s.io/kubernetes/test/integration/framework"
|
"k8s.io/kubernetes/test/integration/framework"
|
||||||
@ -72,7 +72,7 @@ func initTestMaster(t *testing.T, nsPrefix string, admission admission.Interface
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
masterConfig := framework.NewIntegrationTestMasterConfig()
|
masterConfig := framework.NewIntegrationTestMasterConfig()
|
||||||
resourceConfig := master.DefaultAPIResourceConfigSource()
|
resourceConfig := controlplane.DefaultAPIResourceConfigSource()
|
||||||
if utilfeature.DefaultFeatureGate.Enabled(features.CSIStorageCapacity) {
|
if utilfeature.DefaultFeatureGate.Enabled(features.CSIStorageCapacity) {
|
||||||
resourceConfig.EnableVersions(schema.GroupVersion{
|
resourceConfig.EnableVersions(schema.GroupVersion{
|
||||||
Group: "storage.k8s.io",
|
Group: "storage.k8s.io",
|
||||||
|
Loading…
Reference in New Issue
Block a user