diff --git a/pkg/controller/replication/conversion.go b/pkg/controller/replication/conversion.go index 044c1b24081..ff7f4b6f7a3 100644 --- a/pkg/controller/replication/conversion.go +++ b/pkg/controller/replication/conversion.go @@ -26,8 +26,8 @@ import ( "fmt" "time" + apps "k8s.io/api/apps/v1" "k8s.io/api/core/v1" - extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -36,16 +36,14 @@ import ( "k8s.io/apimachinery/pkg/watch" coreinformers "k8s.io/client-go/informers/core/v1" clientset "k8s.io/client-go/kubernetes" - appsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" - appsv1beta2 "k8s.io/client-go/kubernetes/typed/apps/v1beta2" + appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1" v1client "k8s.io/client-go/kubernetes/typed/core/v1" - extensionsv1beta1client "k8s.io/client-go/kubernetes/typed/extensions/v1beta1" + appslisters "k8s.io/client-go/listers/apps/v1" v1listers "k8s.io/client-go/listers/core/v1" - extensionslisters "k8s.io/client-go/listers/extensions/v1beta1" "k8s.io/client-go/tools/cache" + appsconversion "k8s.io/kubernetes/pkg/apis/apps/v1" apiv1 "k8s.io/kubernetes/pkg/apis/core/v1" "k8s.io/kubernetes/pkg/apis/extensions" - extensionsinternalv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" ) @@ -59,7 +57,7 @@ func (i informerAdapter) Informer() cache.SharedIndexInformer { return conversionInformer{i.rcInformer.Informer()} } -func (i informerAdapter) Lister() extensionslisters.ReplicaSetLister { +func (i informerAdapter) Lister() appslisters.ReplicaSetLister { return conversionLister{i.rcInformer.Lister()} } @@ -79,7 +77,7 @@ type conversionLister struct { rcLister v1listers.ReplicationControllerLister } -func (l conversionLister) List(selector labels.Selector) ([]*extensionsv1beta1.ReplicaSet, error) { +func (l conversionLister) List(selector labels.Selector) ([]*apps.ReplicaSet, error) { rcList, err := l.rcLister.List(selector) if err != nil { return nil, err @@ -87,11 +85,11 @@ func (l conversionLister) List(selector labels.Selector) ([]*extensionsv1beta1.R return convertSlice(rcList) } -func (l conversionLister) ReplicaSets(namespace string) extensionslisters.ReplicaSetNamespaceLister { +func (l conversionLister) ReplicaSets(namespace string) appslisters.ReplicaSetNamespaceLister { return conversionNamespaceLister{l.rcLister.ReplicationControllers(namespace)} } -func (l conversionLister) GetPodReplicaSets(pod *v1.Pod) ([]*extensionsv1beta1.ReplicaSet, error) { +func (l conversionLister) GetPodReplicaSets(pod *v1.Pod) ([]*apps.ReplicaSet, error) { rcList, err := l.rcLister.GetPodControllers(pod) if err != nil { return nil, err @@ -103,7 +101,7 @@ type conversionNamespaceLister struct { rcLister v1listers.ReplicationControllerNamespaceLister } -func (l conversionNamespaceLister) List(selector labels.Selector) ([]*extensionsv1beta1.ReplicaSet, error) { +func (l conversionNamespaceLister) List(selector labels.Selector) ([]*apps.ReplicaSet, error) { rcList, err := l.rcLister.List(selector) if err != nil { return nil, err @@ -111,7 +109,7 @@ func (l conversionNamespaceLister) List(selector labels.Selector) ([]*extensions return convertSlice(rcList) } -func (l conversionNamespaceLister) Get(name string) (*extensionsv1beta1.ReplicaSet, error) { +func (l conversionNamespaceLister) Get(name string) (*apps.ReplicaSet, error) { rc, err := l.rcLister.Get(name) if err != nil { return nil, err @@ -182,58 +180,20 @@ type clientsetAdapter struct { clientset.Interface } -func (c clientsetAdapter) ExtensionsV1beta1() extensionsv1beta1client.ExtensionsV1beta1Interface { - return conversionExtensionsClient{c.Interface, c.Interface.ExtensionsV1beta1()} -} - -func (c clientsetAdapter) Extensions() extensionsv1beta1client.ExtensionsV1beta1Interface { - return conversionExtensionsClient{c.Interface, c.Interface.ExtensionsV1beta1()} -} - -func (c clientsetAdapter) AppsV1beta2() appsv1beta2.AppsV1beta2Interface { - return conversionAppsV1beta2Client{c.Interface, c.Interface.AppsV1beta2()} -} - -func (c clientsetAdapter) AppsV1() appsv1.AppsV1Interface { +func (c clientsetAdapter) AppsV1() appsv1client.AppsV1Interface { return conversionAppsV1Client{c.Interface, c.Interface.AppsV1()} } -func (c clientsetAdapter) Apps() appsv1.AppsV1Interface { +func (c clientsetAdapter) Apps() appsv1client.AppsV1Interface { return conversionAppsV1Client{c.Interface, c.Interface.AppsV1()} } -type conversionAppsV1beta2Client struct { - clientset clientset.Interface - appsv1beta2.AppsV1beta2Interface -} - -func (c conversionAppsV1beta2Client) ReplicaSets(namespace string) appsv1beta2.ReplicaSetInterface { - // TODO(enisoc): This will force RC integration tests to fail if anyone tries to update - // ReplicaSetController to use apps/v1beta2 without updating this conversion adapter. - // Please change conversionClient to use the new RS version instead of extensions/v1beta1, - // and then return a conversionClient here. - panic("need to update RC/RS conversionClient for apps/v1beta2") -} - type conversionAppsV1Client struct { clientset clientset.Interface - appsv1.AppsV1Interface + appsv1client.AppsV1Interface } -func (c conversionAppsV1Client) ReplicaSets(namespace string) appsv1.ReplicaSetInterface { - // TODO(enisoc): This will force RC integration tests to fail if anyone tries to update - // ReplicaSetController to use apps/v1 without updating this conversion adapter. - // Please change conversionClient to use the new RS version instead of extensions/v1beta1, - // and then return a conversionClient here. - panic("need to update RC/RS conversionClient for apps/v1") -} - -type conversionExtensionsClient struct { - clientset clientset.Interface - extensionsv1beta1client.ExtensionsV1beta1Interface -} - -func (c conversionExtensionsClient) ReplicaSets(namespace string) extensionsv1beta1client.ReplicaSetInterface { +func (c conversionAppsV1Client) ReplicaSets(namespace string) appsv1client.ReplicaSetInterface { return conversionClient{c.clientset.CoreV1().ReplicationControllers(namespace)} } @@ -241,19 +201,19 @@ type conversionClient struct { v1client.ReplicationControllerInterface } -func (c conversionClient) Create(rs *extensionsv1beta1.ReplicaSet) (*extensionsv1beta1.ReplicaSet, error) { +func (c conversionClient) Create(rs *apps.ReplicaSet) (*apps.ReplicaSet, error) { return convertCall(c.ReplicationControllerInterface.Create, rs) } -func (c conversionClient) Update(rs *extensionsv1beta1.ReplicaSet) (*extensionsv1beta1.ReplicaSet, error) { +func (c conversionClient) Update(rs *apps.ReplicaSet) (*apps.ReplicaSet, error) { return convertCall(c.ReplicationControllerInterface.Update, rs) } -func (c conversionClient) UpdateStatus(rs *extensionsv1beta1.ReplicaSet) (*extensionsv1beta1.ReplicaSet, error) { +func (c conversionClient) UpdateStatus(rs *apps.ReplicaSet) (*apps.ReplicaSet, error) { return convertCall(c.ReplicationControllerInterface.UpdateStatus, rs) } -func (c conversionClient) Get(name string, options metav1.GetOptions) (*extensionsv1beta1.ReplicaSet, error) { +func (c conversionClient) Get(name string, options metav1.GetOptions) (*apps.ReplicaSet, error) { rc, err := c.ReplicationControllerInterface.Get(name, options) if err != nil { return nil, err @@ -261,7 +221,7 @@ func (c conversionClient) Get(name string, options metav1.GetOptions) (*extensio return convertRCtoRS(rc, nil) } -func (c conversionClient) List(opts metav1.ListOptions) (*extensionsv1beta1.ReplicaSetList, error) { +func (c conversionClient) List(opts metav1.ListOptions) (*apps.ReplicaSetList, error) { rcList, err := c.ReplicationControllerInterface.List(opts) if err != nil { return nil, err @@ -274,13 +234,13 @@ func (c conversionClient) Watch(opts metav1.ListOptions) (watch.Interface, error return nil, errors.New("Watch() is not implemented for conversionClient") } -func (c conversionClient) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensionsv1beta1.ReplicaSet, err error) { +func (c conversionClient) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *apps.ReplicaSet, err error) { // This is not used by RSC. return nil, errors.New("Patch() is not implemented for conversionClient") } -func convertSlice(rcList []*v1.ReplicationController) ([]*extensionsv1beta1.ReplicaSet, error) { - rsList := make([]*extensionsv1beta1.ReplicaSet, 0, len(rcList)) +func convertSlice(rcList []*v1.ReplicationController) ([]*apps.ReplicaSet, error) { + rsList := make([]*apps.ReplicaSet, 0, len(rcList)) for _, rc := range rcList { rs, err := convertRCtoRS(rc, nil) if err != nil { @@ -291,8 +251,8 @@ func convertSlice(rcList []*v1.ReplicationController) ([]*extensionsv1beta1.Repl return rsList, nil } -func convertList(rcList *v1.ReplicationControllerList) (*extensionsv1beta1.ReplicaSetList, error) { - rsList := &extensionsv1beta1.ReplicaSetList{Items: make([]extensionsv1beta1.ReplicaSet, len(rcList.Items))} +func convertList(rcList *v1.ReplicationControllerList) (*apps.ReplicaSetList, error) { + rsList := &apps.ReplicaSetList{Items: make([]apps.ReplicaSet, len(rcList.Items))} for i := range rcList.Items { rc := &rcList.Items[i] _, err := convertRCtoRS(rc, &rsList.Items[i]) @@ -303,7 +263,7 @@ func convertList(rcList *v1.ReplicationControllerList) (*extensionsv1beta1.Repli return rsList, nil } -func convertCall(fn func(*v1.ReplicationController) (*v1.ReplicationController, error), rs *extensionsv1beta1.ReplicaSet) (*extensionsv1beta1.ReplicaSet, error) { +func convertCall(fn func(*v1.ReplicationController) (*v1.ReplicationController, error), rs *apps.ReplicaSet) (*apps.ReplicaSet, error) { rc, err := convertRStoRC(rs) if err != nil { return nil, err @@ -315,23 +275,23 @@ func convertCall(fn func(*v1.ReplicationController) (*v1.ReplicationController, return convertRCtoRS(result, nil) } -func convertRCtoRS(rc *v1.ReplicationController, out *extensionsv1beta1.ReplicaSet) (*extensionsv1beta1.ReplicaSet, error) { +func convertRCtoRS(rc *v1.ReplicationController, out *apps.ReplicaSet) (*apps.ReplicaSet, error) { var rsInternal extensions.ReplicaSet if err := apiv1.Convert_v1_ReplicationController_to_extensions_ReplicaSet(rc, &rsInternal, nil); err != nil { return nil, fmt.Errorf("can't convert ReplicationController %v/%v to ReplicaSet: %v", rc.Namespace, rc.Name, err) } if out == nil { - out = new(extensionsv1beta1.ReplicaSet) + out = new(apps.ReplicaSet) } - if err := extensionsinternalv1beta1.Convert_extensions_ReplicaSet_To_v1beta1_ReplicaSet(&rsInternal, out, nil); err != nil { + if err := appsconversion.Convert_extensions_ReplicaSet_To_v1_ReplicaSet(&rsInternal, out, nil); err != nil { return nil, fmt.Errorf("can't convert ReplicaSet (converted from ReplicationController %v/%v) from internal to extensions/v1beta1: %v", rc.Namespace, rc.Name, err) } return out, nil } -func convertRStoRC(rs *extensionsv1beta1.ReplicaSet) (*v1.ReplicationController, error) { +func convertRStoRC(rs *apps.ReplicaSet) (*v1.ReplicationController, error) { var rsInternal extensions.ReplicaSet - if err := extensionsinternalv1beta1.Convert_v1beta1_ReplicaSet_To_extensions_ReplicaSet(rs, &rsInternal, nil); err != nil { + if err := appsconversion.Convert_v1_ReplicaSet_To_extensions_ReplicaSet(rs, &rsInternal, nil); err != nil { return nil, fmt.Errorf("can't convert ReplicaSet (converting to ReplicationController %v/%v) from extensions/v1beta1 to internal: %v", rs.Namespace, rs.Name, err) } var rc v1.ReplicationController @@ -356,7 +316,7 @@ func (pc podControlAdapter) CreatePodsOnNode(nodeName, namespace string, templat } func (pc podControlAdapter) CreatePodsWithControllerRef(namespace string, template *v1.PodTemplateSpec, object runtime.Object, controllerRef *metav1.OwnerReference) error { - rc, err := convertRStoRC(object.(*extensionsv1beta1.ReplicaSet)) + rc, err := convertRStoRC(object.(*apps.ReplicaSet)) if err != nil { return err } @@ -364,7 +324,7 @@ func (pc podControlAdapter) CreatePodsWithControllerRef(namespace string, templa } func (pc podControlAdapter) DeletePod(namespace string, podID string, object runtime.Object) error { - rc, err := convertRStoRC(object.(*extensionsv1beta1.ReplicaSet)) + rc, err := convertRStoRC(object.(*apps.ReplicaSet)) if err != nil { return err }