mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	remove test usage of apiregistration/v1beta1
This commit is contained in:
		@@ -43,7 +43,7 @@ import (
 | 
			
		||||
	"k8s.io/client-go/tools/clientcmd"
 | 
			
		||||
	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 | 
			
		||||
	"k8s.io/client-go/util/cert"
 | 
			
		||||
	apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
 | 
			
		||||
	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 | 
			
		||||
	aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
 | 
			
		||||
	kastesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
 | 
			
		||||
	"k8s.io/kubernetes/test/integration/framework"
 | 
			
		||||
@@ -111,10 +111,10 @@ func TestAggregatedAPIServer(t *testing.T) {
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		t.Fatal(err)
 | 
			
		||||
	}
 | 
			
		||||
	_, err = aggregatorClient.ApiregistrationV1beta1().APIServices().Create(context.TODO(), &apiregistrationv1beta1.APIService{
 | 
			
		||||
	_, err = aggregatorClient.ApiregistrationV1().APIServices().Create(context.TODO(), &apiregistrationv1.APIService{
 | 
			
		||||
		ObjectMeta: metav1.ObjectMeta{Name: "v1alpha1.wardle.example.com"},
 | 
			
		||||
		Spec: apiregistrationv1beta1.APIServiceSpec{
 | 
			
		||||
			Service: &apiregistrationv1beta1.ServiceReference{
 | 
			
		||||
		Spec: apiregistrationv1.APIServiceSpec{
 | 
			
		||||
			Service: &apiregistrationv1.ServiceReference{
 | 
			
		||||
				Namespace: "kube-wardle",
 | 
			
		||||
				Name:      "api",
 | 
			
		||||
			},
 | 
			
		||||
 
 | 
			
		||||
@@ -37,7 +37,7 @@ import (
 | 
			
		||||
	clientset "k8s.io/client-go/kubernetes"
 | 
			
		||||
	"k8s.io/client-go/rest"
 | 
			
		||||
	featuregatetesting "k8s.io/component-base/featuregate/testing"
 | 
			
		||||
	apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
 | 
			
		||||
	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 | 
			
		||||
	aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
 | 
			
		||||
	kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
 | 
			
		||||
	"k8s.io/kubernetes/test/integration/etcd"
 | 
			
		||||
@@ -94,10 +94,10 @@ func testCRDWrite(t *testing.T, cfg *rest.Config, shouldBlock bool) {
 | 
			
		||||
 | 
			
		||||
func testAPIServiceWrite(t *testing.T, cfg *rest.Config, shouldBlock bool) {
 | 
			
		||||
	aggregatorClient := aggregatorclient.NewForConfigOrDie(cfg)
 | 
			
		||||
	_, err := aggregatorClient.ApiregistrationV1beta1().APIServices().Create(context.TODO(), &apiregistrationv1beta1.APIService{
 | 
			
		||||
	_, err := aggregatorClient.ApiregistrationV1().APIServices().Create(context.TODO(), &apiregistrationv1.APIService{
 | 
			
		||||
		ObjectMeta: metav1.ObjectMeta{Name: "v1alpha1.wardle.example.com"},
 | 
			
		||||
		Spec: apiregistrationv1beta1.APIServiceSpec{
 | 
			
		||||
			Service: &apiregistrationv1beta1.ServiceReference{
 | 
			
		||||
		Spec: apiregistrationv1.APIServiceSpec{
 | 
			
		||||
			Service: &apiregistrationv1.ServiceReference{
 | 
			
		||||
				Namespace: "kube-wardle",
 | 
			
		||||
				Name:      "api",
 | 
			
		||||
			},
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user