Merge pull request #944 from paulfantom/apiservicesv1

Bug 1882294: bump APIService to v1

go.mod

@@ -19,10 +19,10 @@ require (
 	k8s.io/api v0.19.2
 	k8s.io/apiextensions-apiserver v0.18.3
 	k8s.io/apimachinery v0.19.2
-	k8s.io/apiserver v0.18.3
+	k8s.io/apiserver v0.19.2
 	k8s.io/client-go v12.0.0+incompatible
 	k8s.io/klog v1.0.0
-	k8s.io/kube-aggregator v0.18.3
+	k8s.io/kube-aggregator v0.19.2
 	k8s.io/metrics v0.18.4
 )
 

pkg/client/client.go

@@ -49,7 +49,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog"
-	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"
 )
 
@@ -1184,8 +1184,8 @@ func (c *Client) CreateOrUpdateIngress(ing *v1betaextensions.Ingress) error {
 	return errors.Wrap(err, "updating Ingress object failed")
 }
 
-func (c *Client) CreateOrUpdateAPIService(apiService *apiregistrationv1beta1.APIService) error {
-	apsc := c.aggclient.ApiregistrationV1beta1().APIServices()
+func (c *Client) CreateOrUpdateAPIService(apiService *apiregistrationv1.APIService) error {
+	apsc := c.aggclient.ApiregistrationV1().APIServices()
 	oldAPIService, err := apsc.Get(context.TODO(), apiService.GetName(), metav1.GetOptions{})
 	if apierrors.IsNotFound(err) {
 		_, err = apsc.Create(context.TODO(), apiService, metav1.CreateOptions{})

pkg/manifests/manifests.go

@@ -43,7 +43,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/yaml"
-	apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
+	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 )
 
 const (
@@ -1770,7 +1770,7 @@ func (f *Factory) PrometheusAdapterSecret(tlsSecret *v1.Secret, apiAuthConfigmap
 	}, nil
 }
 
-func (f *Factory) PrometheusAdapterAPIService() (*apiregistrationv1beta1.APIService, error) {
+func (f *Factory) PrometheusAdapterAPIService() (*apiregistrationv1.APIService, error) {
 	return f.NewAPIService(MustAssetReader(PrometheusAdapterAPIService))
 }
 
@@ -2643,7 +2643,7 @@ func (f *Factory) NewIngress(manifest io.Reader) (*v1beta1.Ingress, error) {
 	return i, nil
 }
 
-func (f *Factory) NewAPIService(manifest io.Reader) (*apiregistrationv1beta1.APIService, error) {
+func (f *Factory) NewAPIService(manifest io.Reader) (*apiregistrationv1.APIService, error) {
 	return NewAPIService(manifest)
 }
 
@@ -3411,8 +3411,8 @@ func NewIngress(manifest io.Reader) (*v1beta1.Ingress, error) {
 	return &i, nil
 }
 
-func NewAPIService(manifest io.Reader) (*apiregistrationv1beta1.APIService, error) {
-	s := apiregistrationv1beta1.APIService{}
+func NewAPIService(manifest io.Reader) (*apiregistrationv1.APIService, error) {
+	s := apiregistrationv1.APIService{}
 	err := yaml.NewYAMLOrJSONDecoder(manifest, 100).Decode(&s)
 	if err != nil {
 		return nil, err