mirror of
https://github.com/rancher/types.git
synced 2025-09-17 15:29:10 +00:00
Generated changes
This commit is contained in:
committed by
Craig Jellick
parent
3cf03f3072
commit
cad3af8a71
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"github.com/rancher/norman/controller"
|
||||
"github.com/rancher/norman/objectclient"
|
||||
"github.com/rancher/norman/resource"
|
||||
"k8s.io/api/apps/v1beta2"
|
||||
v1 "k8s.io/api/apps/v1"
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
@@ -42,7 +42,7 @@ func init() {
|
||||
resource.Put(DaemonSetGroupVersionResource)
|
||||
}
|
||||
|
||||
func NewDaemonSet(namespace, name string, obj v1beta2.DaemonSet) *v1beta2.DaemonSet {
|
||||
func NewDaemonSet(namespace, name string, obj v1.DaemonSet) *v1.DaemonSet {
|
||||
obj.APIVersion, obj.Kind = DaemonSetGroupVersionKind.ToAPIVersionAndKind()
|
||||
obj.Name = name
|
||||
obj.Namespace = namespace
|
||||
@@ -52,16 +52,16 @@ func NewDaemonSet(namespace, name string, obj v1beta2.DaemonSet) *v1beta2.Daemon
|
||||
type DaemonSetList struct {
|
||||
metav1.TypeMeta `json:",inline"`
|
||||
metav1.ListMeta `json:"metadata,omitempty"`
|
||||
Items []v1beta2.DaemonSet `json:"items"`
|
||||
Items []v1.DaemonSet `json:"items"`
|
||||
}
|
||||
|
||||
type DaemonSetHandlerFunc func(key string, obj *v1beta2.DaemonSet) (runtime.Object, error)
|
||||
type DaemonSetHandlerFunc func(key string, obj *v1.DaemonSet) (runtime.Object, error)
|
||||
|
||||
type DaemonSetChangeHandlerFunc func(obj *v1beta2.DaemonSet) (runtime.Object, error)
|
||||
type DaemonSetChangeHandlerFunc func(obj *v1.DaemonSet) (runtime.Object, error)
|
||||
|
||||
type DaemonSetLister interface {
|
||||
List(namespace string, selector labels.Selector) (ret []*v1beta2.DaemonSet, err error)
|
||||
Get(namespace, name string) (*v1beta2.DaemonSet, error)
|
||||
List(namespace string, selector labels.Selector) (ret []*v1.DaemonSet, err error)
|
||||
Get(namespace, name string) (*v1.DaemonSet, error)
|
||||
}
|
||||
|
||||
type DaemonSetController interface {
|
||||
@@ -79,10 +79,10 @@ type DaemonSetController interface {
|
||||
|
||||
type DaemonSetInterface interface {
|
||||
ObjectClient() *objectclient.ObjectClient
|
||||
Create(*v1beta2.DaemonSet) (*v1beta2.DaemonSet, error)
|
||||
GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta2.DaemonSet, error)
|
||||
Get(name string, opts metav1.GetOptions) (*v1beta2.DaemonSet, error)
|
||||
Update(*v1beta2.DaemonSet) (*v1beta2.DaemonSet, error)
|
||||
Create(*v1.DaemonSet) (*v1.DaemonSet, error)
|
||||
GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1.DaemonSet, error)
|
||||
Get(name string, opts metav1.GetOptions) (*v1.DaemonSet, error)
|
||||
Update(*v1.DaemonSet) (*v1.DaemonSet, error)
|
||||
Delete(name string, options *metav1.DeleteOptions) error
|
||||
DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error
|
||||
List(opts metav1.ListOptions) (*DaemonSetList, error)
|
||||
@@ -103,14 +103,14 @@ type daemonSetLister struct {
|
||||
controller *daemonSetController
|
||||
}
|
||||
|
||||
func (l *daemonSetLister) List(namespace string, selector labels.Selector) (ret []*v1beta2.DaemonSet, err error) {
|
||||
func (l *daemonSetLister) List(namespace string, selector labels.Selector) (ret []*v1.DaemonSet, err error) {
|
||||
err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) {
|
||||
ret = append(ret, obj.(*v1beta2.DaemonSet))
|
||||
ret = append(ret, obj.(*v1.DaemonSet))
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
func (l *daemonSetLister) Get(namespace, name string) (*v1beta2.DaemonSet, error) {
|
||||
func (l *daemonSetLister) Get(namespace, name string) (*v1.DaemonSet, error) {
|
||||
var key string
|
||||
if namespace != "" {
|
||||
key = namespace + "/" + name
|
||||
@@ -127,7 +127,7 @@ func (l *daemonSetLister) Get(namespace, name string) (*v1beta2.DaemonSet, error
|
||||
Resource: "daemonSet",
|
||||
}, key)
|
||||
}
|
||||
return obj.(*v1beta2.DaemonSet), nil
|
||||
return obj.(*v1.DaemonSet), nil
|
||||
}
|
||||
|
||||
type daemonSetController struct {
|
||||
@@ -148,7 +148,7 @@ func (c *daemonSetController) AddHandler(ctx context.Context, name string, handl
|
||||
c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) {
|
||||
if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.DaemonSet); ok {
|
||||
} else if v, ok := obj.(*v1.DaemonSet); ok {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -162,7 +162,7 @@ func (c *daemonSetController) AddFeatureHandler(ctx context.Context, enabled fun
|
||||
return nil, nil
|
||||
} else if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.DaemonSet); ok {
|
||||
} else if v, ok := obj.(*v1.DaemonSet); ok {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -174,7 +174,7 @@ func (c *daemonSetController) AddClusterScopedHandler(ctx context.Context, name,
|
||||
c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) {
|
||||
if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.DaemonSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
} else if v, ok := obj.(*v1.DaemonSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -188,7 +188,7 @@ func (c *daemonSetController) AddClusterScopedFeatureHandler(ctx context.Context
|
||||
return nil, nil
|
||||
} else if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.DaemonSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
} else if v, ok := obj.(*v1.DaemonSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -200,7 +200,7 @@ type daemonSetFactory struct {
|
||||
}
|
||||
|
||||
func (c daemonSetFactory) Object() runtime.Object {
|
||||
return &v1beta2.DaemonSet{}
|
||||
return &v1.DaemonSet{}
|
||||
}
|
||||
|
||||
func (c daemonSetFactory) List() runtime.Object {
|
||||
@@ -240,24 +240,24 @@ func (s *daemonSetClient) ObjectClient() *objectclient.ObjectClient {
|
||||
return s.objectClient
|
||||
}
|
||||
|
||||
func (s *daemonSetClient) Create(o *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) {
|
||||
func (s *daemonSetClient) Create(o *v1.DaemonSet) (*v1.DaemonSet, error) {
|
||||
obj, err := s.objectClient.Create(o)
|
||||
return obj.(*v1beta2.DaemonSet), err
|
||||
return obj.(*v1.DaemonSet), err
|
||||
}
|
||||
|
||||
func (s *daemonSetClient) Get(name string, opts metav1.GetOptions) (*v1beta2.DaemonSet, error) {
|
||||
func (s *daemonSetClient) Get(name string, opts metav1.GetOptions) (*v1.DaemonSet, error) {
|
||||
obj, err := s.objectClient.Get(name, opts)
|
||||
return obj.(*v1beta2.DaemonSet), err
|
||||
return obj.(*v1.DaemonSet), err
|
||||
}
|
||||
|
||||
func (s *daemonSetClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta2.DaemonSet, error) {
|
||||
func (s *daemonSetClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1.DaemonSet, error) {
|
||||
obj, err := s.objectClient.GetNamespaced(namespace, name, opts)
|
||||
return obj.(*v1beta2.DaemonSet), err
|
||||
return obj.(*v1.DaemonSet), err
|
||||
}
|
||||
|
||||
func (s *daemonSetClient) Update(o *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) {
|
||||
func (s *daemonSetClient) Update(o *v1.DaemonSet) (*v1.DaemonSet, error) {
|
||||
obj, err := s.objectClient.Update(o.Name, o)
|
||||
return obj.(*v1beta2.DaemonSet), err
|
||||
return obj.(*v1.DaemonSet), err
|
||||
}
|
||||
|
||||
func (s *daemonSetClient) Delete(name string, options *metav1.DeleteOptions) error {
|
||||
@@ -278,9 +278,9 @@ func (s *daemonSetClient) Watch(opts metav1.ListOptions) (watch.Interface, error
|
||||
}
|
||||
|
||||
// Patch applies the patch and returns the patched deployment.
|
||||
func (s *daemonSetClient) Patch(o *v1beta2.DaemonSet, patchType types.PatchType, data []byte, subresources ...string) (*v1beta2.DaemonSet, error) {
|
||||
func (s *daemonSetClient) Patch(o *v1.DaemonSet, patchType types.PatchType, data []byte, subresources ...string) (*v1.DaemonSet, error) {
|
||||
obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...)
|
||||
return obj.(*v1beta2.DaemonSet), err
|
||||
return obj.(*v1.DaemonSet), err
|
||||
}
|
||||
|
||||
func (s *daemonSetClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error {
|
||||
@@ -323,20 +323,20 @@ func (s *daemonSetClient) AddClusterScopedFeatureLifecycle(ctx context.Context,
|
||||
s.Controller().AddClusterScopedFeatureHandler(ctx, enabled, name, clusterName, sync)
|
||||
}
|
||||
|
||||
type DaemonSetIndexer func(obj *v1beta2.DaemonSet) ([]string, error)
|
||||
type DaemonSetIndexer func(obj *v1.DaemonSet) ([]string, error)
|
||||
|
||||
type DaemonSetClientCache interface {
|
||||
Get(namespace, name string) (*v1beta2.DaemonSet, error)
|
||||
List(namespace string, selector labels.Selector) ([]*v1beta2.DaemonSet, error)
|
||||
Get(namespace, name string) (*v1.DaemonSet, error)
|
||||
List(namespace string, selector labels.Selector) ([]*v1.DaemonSet, error)
|
||||
|
||||
Index(name string, indexer DaemonSetIndexer)
|
||||
GetIndexed(name, key string) ([]*v1beta2.DaemonSet, error)
|
||||
GetIndexed(name, key string) ([]*v1.DaemonSet, error)
|
||||
}
|
||||
|
||||
type DaemonSetClient interface {
|
||||
Create(*v1beta2.DaemonSet) (*v1beta2.DaemonSet, error)
|
||||
Get(namespace, name string, opts metav1.GetOptions) (*v1beta2.DaemonSet, error)
|
||||
Update(*v1beta2.DaemonSet) (*v1beta2.DaemonSet, error)
|
||||
Create(*v1.DaemonSet) (*v1.DaemonSet, error)
|
||||
Get(namespace, name string, opts metav1.GetOptions) (*v1.DaemonSet, error)
|
||||
Update(*v1.DaemonSet) (*v1.DaemonSet, error)
|
||||
Delete(namespace, name string, options *metav1.DeleteOptions) error
|
||||
List(namespace string, opts metav1.ListOptions) (*DaemonSetList, error)
|
||||
Watch(opts metav1.ListOptions) (watch.Interface, error)
|
||||
@@ -378,15 +378,15 @@ func (n *daemonSetClient2) Enqueue(namespace, name string) {
|
||||
n.iface.Controller().Enqueue(namespace, name)
|
||||
}
|
||||
|
||||
func (n *daemonSetClient2) Create(obj *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) {
|
||||
func (n *daemonSetClient2) Create(obj *v1.DaemonSet) (*v1.DaemonSet, error) {
|
||||
return n.iface.Create(obj)
|
||||
}
|
||||
|
||||
func (n *daemonSetClient2) Get(namespace, name string, opts metav1.GetOptions) (*v1beta2.DaemonSet, error) {
|
||||
func (n *daemonSetClient2) Get(namespace, name string, opts metav1.GetOptions) (*v1.DaemonSet, error) {
|
||||
return n.iface.GetNamespaced(namespace, name, opts)
|
||||
}
|
||||
|
||||
func (n *daemonSetClient2) Update(obj *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) {
|
||||
func (n *daemonSetClient2) Update(obj *v1.DaemonSet) (*v1.DaemonSet, error) {
|
||||
return n.iface.Update(obj)
|
||||
}
|
||||
|
||||
@@ -402,11 +402,11 @@ func (n *daemonSetClient2) Watch(opts metav1.ListOptions) (watch.Interface, erro
|
||||
return n.iface.Watch(opts)
|
||||
}
|
||||
|
||||
func (n *daemonSetClientCache) Get(namespace, name string) (*v1beta2.DaemonSet, error) {
|
||||
func (n *daemonSetClientCache) Get(namespace, name string) (*v1.DaemonSet, error) {
|
||||
return n.client.controller.Lister().Get(namespace, name)
|
||||
}
|
||||
|
||||
func (n *daemonSetClientCache) List(namespace string, selector labels.Selector) ([]*v1beta2.DaemonSet, error) {
|
||||
func (n *daemonSetClientCache) List(namespace string, selector labels.Selector) ([]*v1.DaemonSet, error) {
|
||||
return n.client.controller.Lister().List(namespace, selector)
|
||||
}
|
||||
|
||||
@@ -435,7 +435,7 @@ func (n *daemonSetClient2) OnRemove(ctx context.Context, name string, sync Daemo
|
||||
func (n *daemonSetClientCache) Index(name string, indexer DaemonSetIndexer) {
|
||||
err := n.client.controller.Informer().GetIndexer().AddIndexers(map[string]cache.IndexFunc{
|
||||
name: func(obj interface{}) ([]string, error) {
|
||||
if v, ok := obj.(*v1beta2.DaemonSet); ok {
|
||||
if v, ok := obj.(*v1.DaemonSet); ok {
|
||||
return indexer(v)
|
||||
}
|
||||
return nil, nil
|
||||
@@ -447,14 +447,14 @@ func (n *daemonSetClientCache) Index(name string, indexer DaemonSetIndexer) {
|
||||
}
|
||||
}
|
||||
|
||||
func (n *daemonSetClientCache) GetIndexed(name, key string) ([]*v1beta2.DaemonSet, error) {
|
||||
var result []*v1beta2.DaemonSet
|
||||
func (n *daemonSetClientCache) GetIndexed(name, key string) ([]*v1.DaemonSet, error) {
|
||||
var result []*v1.DaemonSet
|
||||
objs, err := n.client.controller.Informer().GetIndexer().ByIndex(name, key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, obj := range objs {
|
||||
if v, ok := obj.(*v1beta2.DaemonSet); ok {
|
||||
if v, ok := obj.(*v1.DaemonSet); ok {
|
||||
result = append(result, v)
|
||||
}
|
||||
}
|
||||
@@ -478,7 +478,7 @@ func (n *daemonSetLifecycleDelegate) HasCreate() bool {
|
||||
return n.create != nil
|
||||
}
|
||||
|
||||
func (n *daemonSetLifecycleDelegate) Create(obj *v1beta2.DaemonSet) (runtime.Object, error) {
|
||||
func (n *daemonSetLifecycleDelegate) Create(obj *v1.DaemonSet) (runtime.Object, error) {
|
||||
if n.create == nil {
|
||||
return obj, nil
|
||||
}
|
||||
@@ -489,14 +489,14 @@ func (n *daemonSetLifecycleDelegate) HasFinalize() bool {
|
||||
return n.remove != nil
|
||||
}
|
||||
|
||||
func (n *daemonSetLifecycleDelegate) Remove(obj *v1beta2.DaemonSet) (runtime.Object, error) {
|
||||
func (n *daemonSetLifecycleDelegate) Remove(obj *v1.DaemonSet) (runtime.Object, error) {
|
||||
if n.remove == nil {
|
||||
return obj, nil
|
||||
}
|
||||
return n.remove(obj)
|
||||
}
|
||||
|
||||
func (n *daemonSetLifecycleDelegate) Updated(obj *v1beta2.DaemonSet) (runtime.Object, error) {
|
||||
func (n *daemonSetLifecycleDelegate) Updated(obj *v1.DaemonSet) (runtime.Object, error) {
|
||||
if n.update == nil {
|
||||
return obj, nil
|
||||
}
|
@@ -1,16 +1,16 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"github.com/rancher/norman/lifecycle"
|
||||
"github.com/rancher/norman/resource"
|
||||
"k8s.io/api/apps/v1beta2"
|
||||
v1 "k8s.io/api/apps/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
)
|
||||
|
||||
type DaemonSetLifecycle interface {
|
||||
Create(obj *v1beta2.DaemonSet) (runtime.Object, error)
|
||||
Remove(obj *v1beta2.DaemonSet) (runtime.Object, error)
|
||||
Updated(obj *v1beta2.DaemonSet) (runtime.Object, error)
|
||||
Create(obj *v1.DaemonSet) (runtime.Object, error)
|
||||
Remove(obj *v1.DaemonSet) (runtime.Object, error)
|
||||
Updated(obj *v1.DaemonSet) (runtime.Object, error)
|
||||
}
|
||||
|
||||
type daemonSetLifecycleAdapter struct {
|
||||
@@ -28,7 +28,7 @@ func (w *daemonSetLifecycleAdapter) HasFinalize() bool {
|
||||
}
|
||||
|
||||
func (w *daemonSetLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Create(obj.(*v1beta2.DaemonSet))
|
||||
o, err := w.lifecycle.Create(obj.(*v1.DaemonSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -36,7 +36,7 @@ func (w *daemonSetLifecycleAdapter) Create(obj runtime.Object) (runtime.Object,
|
||||
}
|
||||
|
||||
func (w *daemonSetLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Remove(obj.(*v1beta2.DaemonSet))
|
||||
o, err := w.lifecycle.Remove(obj.(*v1.DaemonSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -44,7 +44,7 @@ func (w *daemonSetLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object
|
||||
}
|
||||
|
||||
func (w *daemonSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Updated(obj.(*v1beta2.DaemonSet))
|
||||
o, err := w.lifecycle.Updated(obj.(*v1.DaemonSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -57,7 +57,7 @@ func NewDaemonSetLifecycleAdapter(name string, clusterScoped bool, client Daemon
|
||||
}
|
||||
adapter := &daemonSetLifecycleAdapter{lifecycle: l}
|
||||
syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient())
|
||||
return func(key string, obj *v1beta2.DaemonSet) (runtime.Object, error) {
|
||||
return func(key string, obj *v1.DaemonSet) (runtime.Object, error) {
|
||||
newObj, err := syncFn(key, obj)
|
||||
if o, ok := newObj.(runtime.Object); ok {
|
||||
return o, err
|
@@ -1,7 +1,7 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
appsv1beta2 "k8s.io/api/apps/v1beta2"
|
||||
appsv1 "k8s.io/api/apps/v1"
|
||||
runtime "k8s.io/apimachinery/pkg/runtime"
|
||||
)
|
||||
|
||||
@@ -12,7 +12,7 @@ func (in *DaemonSetList) DeepCopyInto(out *DaemonSetList) {
|
||||
out.ListMeta = in.ListMeta
|
||||
if in.Items != nil {
|
||||
in, out := &in.Items, &out.Items
|
||||
*out = make([]appsv1beta2.DaemonSet, len(*in))
|
||||
*out = make([]appsv1.DaemonSet, len(*in))
|
||||
for i := range *in {
|
||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||
}
|
||||
@@ -45,7 +45,7 @@ func (in *DeploymentList) DeepCopyInto(out *DeploymentList) {
|
||||
out.ListMeta = in.ListMeta
|
||||
if in.Items != nil {
|
||||
in, out := &in.Items, &out.Items
|
||||
*out = make([]appsv1beta2.Deployment, len(*in))
|
||||
*out = make([]appsv1.Deployment, len(*in))
|
||||
for i := range *in {
|
||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||
}
|
||||
@@ -78,7 +78,7 @@ func (in *ReplicaSetList) DeepCopyInto(out *ReplicaSetList) {
|
||||
out.ListMeta = in.ListMeta
|
||||
if in.Items != nil {
|
||||
in, out := &in.Items, &out.Items
|
||||
*out = make([]appsv1beta2.ReplicaSet, len(*in))
|
||||
*out = make([]appsv1.ReplicaSet, len(*in))
|
||||
for i := range *in {
|
||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||
}
|
||||
@@ -111,7 +111,7 @@ func (in *StatefulSetList) DeepCopyInto(out *StatefulSetList) {
|
||||
out.ListMeta = in.ListMeta
|
||||
if in.Items != nil {
|
||||
in, out := &in.Items, &out.Items
|
||||
*out = make([]appsv1beta2.StatefulSet, len(*in))
|
||||
*out = make([]appsv1.StatefulSet, len(*in))
|
||||
for i := range *in {
|
||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||
}
|
@@ -1,4 +1,4 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"github.com/rancher/norman/controller"
|
||||
"github.com/rancher/norman/objectclient"
|
||||
"github.com/rancher/norman/resource"
|
||||
"k8s.io/api/apps/v1beta2"
|
||||
v1 "k8s.io/api/apps/v1"
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
@@ -42,7 +42,7 @@ func init() {
|
||||
resource.Put(DeploymentGroupVersionResource)
|
||||
}
|
||||
|
||||
func NewDeployment(namespace, name string, obj v1beta2.Deployment) *v1beta2.Deployment {
|
||||
func NewDeployment(namespace, name string, obj v1.Deployment) *v1.Deployment {
|
||||
obj.APIVersion, obj.Kind = DeploymentGroupVersionKind.ToAPIVersionAndKind()
|
||||
obj.Name = name
|
||||
obj.Namespace = namespace
|
||||
@@ -52,16 +52,16 @@ func NewDeployment(namespace, name string, obj v1beta2.Deployment) *v1beta2.Depl
|
||||
type DeploymentList struct {
|
||||
metav1.TypeMeta `json:",inline"`
|
||||
metav1.ListMeta `json:"metadata,omitempty"`
|
||||
Items []v1beta2.Deployment `json:"items"`
|
||||
Items []v1.Deployment `json:"items"`
|
||||
}
|
||||
|
||||
type DeploymentHandlerFunc func(key string, obj *v1beta2.Deployment) (runtime.Object, error)
|
||||
type DeploymentHandlerFunc func(key string, obj *v1.Deployment) (runtime.Object, error)
|
||||
|
||||
type DeploymentChangeHandlerFunc func(obj *v1beta2.Deployment) (runtime.Object, error)
|
||||
type DeploymentChangeHandlerFunc func(obj *v1.Deployment) (runtime.Object, error)
|
||||
|
||||
type DeploymentLister interface {
|
||||
List(namespace string, selector labels.Selector) (ret []*v1beta2.Deployment, err error)
|
||||
Get(namespace, name string) (*v1beta2.Deployment, error)
|
||||
List(namespace string, selector labels.Selector) (ret []*v1.Deployment, err error)
|
||||
Get(namespace, name string) (*v1.Deployment, error)
|
||||
}
|
||||
|
||||
type DeploymentController interface {
|
||||
@@ -79,10 +79,10 @@ type DeploymentController interface {
|
||||
|
||||
type DeploymentInterface interface {
|
||||
ObjectClient() *objectclient.ObjectClient
|
||||
Create(*v1beta2.Deployment) (*v1beta2.Deployment, error)
|
||||
GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta2.Deployment, error)
|
||||
Get(name string, opts metav1.GetOptions) (*v1beta2.Deployment, error)
|
||||
Update(*v1beta2.Deployment) (*v1beta2.Deployment, error)
|
||||
Create(*v1.Deployment) (*v1.Deployment, error)
|
||||
GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1.Deployment, error)
|
||||
Get(name string, opts metav1.GetOptions) (*v1.Deployment, error)
|
||||
Update(*v1.Deployment) (*v1.Deployment, error)
|
||||
Delete(name string, options *metav1.DeleteOptions) error
|
||||
DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error
|
||||
List(opts metav1.ListOptions) (*DeploymentList, error)
|
||||
@@ -103,14 +103,14 @@ type deploymentLister struct {
|
||||
controller *deploymentController
|
||||
}
|
||||
|
||||
func (l *deploymentLister) List(namespace string, selector labels.Selector) (ret []*v1beta2.Deployment, err error) {
|
||||
func (l *deploymentLister) List(namespace string, selector labels.Selector) (ret []*v1.Deployment, err error) {
|
||||
err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) {
|
||||
ret = append(ret, obj.(*v1beta2.Deployment))
|
||||
ret = append(ret, obj.(*v1.Deployment))
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
func (l *deploymentLister) Get(namespace, name string) (*v1beta2.Deployment, error) {
|
||||
func (l *deploymentLister) Get(namespace, name string) (*v1.Deployment, error) {
|
||||
var key string
|
||||
if namespace != "" {
|
||||
key = namespace + "/" + name
|
||||
@@ -127,7 +127,7 @@ func (l *deploymentLister) Get(namespace, name string) (*v1beta2.Deployment, err
|
||||
Resource: "deployment",
|
||||
}, key)
|
||||
}
|
||||
return obj.(*v1beta2.Deployment), nil
|
||||
return obj.(*v1.Deployment), nil
|
||||
}
|
||||
|
||||
type deploymentController struct {
|
||||
@@ -148,7 +148,7 @@ func (c *deploymentController) AddHandler(ctx context.Context, name string, hand
|
||||
c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) {
|
||||
if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.Deployment); ok {
|
||||
} else if v, ok := obj.(*v1.Deployment); ok {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -162,7 +162,7 @@ func (c *deploymentController) AddFeatureHandler(ctx context.Context, enabled fu
|
||||
return nil, nil
|
||||
} else if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.Deployment); ok {
|
||||
} else if v, ok := obj.(*v1.Deployment); ok {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -174,7 +174,7 @@ func (c *deploymentController) AddClusterScopedHandler(ctx context.Context, name
|
||||
c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) {
|
||||
if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.Deployment); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
} else if v, ok := obj.(*v1.Deployment); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -188,7 +188,7 @@ func (c *deploymentController) AddClusterScopedFeatureHandler(ctx context.Contex
|
||||
return nil, nil
|
||||
} else if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.Deployment); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
} else if v, ok := obj.(*v1.Deployment); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -200,7 +200,7 @@ type deploymentFactory struct {
|
||||
}
|
||||
|
||||
func (c deploymentFactory) Object() runtime.Object {
|
||||
return &v1beta2.Deployment{}
|
||||
return &v1.Deployment{}
|
||||
}
|
||||
|
||||
func (c deploymentFactory) List() runtime.Object {
|
||||
@@ -240,24 +240,24 @@ func (s *deploymentClient) ObjectClient() *objectclient.ObjectClient {
|
||||
return s.objectClient
|
||||
}
|
||||
|
||||
func (s *deploymentClient) Create(o *v1beta2.Deployment) (*v1beta2.Deployment, error) {
|
||||
func (s *deploymentClient) Create(o *v1.Deployment) (*v1.Deployment, error) {
|
||||
obj, err := s.objectClient.Create(o)
|
||||
return obj.(*v1beta2.Deployment), err
|
||||
return obj.(*v1.Deployment), err
|
||||
}
|
||||
|
||||
func (s *deploymentClient) Get(name string, opts metav1.GetOptions) (*v1beta2.Deployment, error) {
|
||||
func (s *deploymentClient) Get(name string, opts metav1.GetOptions) (*v1.Deployment, error) {
|
||||
obj, err := s.objectClient.Get(name, opts)
|
||||
return obj.(*v1beta2.Deployment), err
|
||||
return obj.(*v1.Deployment), err
|
||||
}
|
||||
|
||||
func (s *deploymentClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta2.Deployment, error) {
|
||||
func (s *deploymentClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1.Deployment, error) {
|
||||
obj, err := s.objectClient.GetNamespaced(namespace, name, opts)
|
||||
return obj.(*v1beta2.Deployment), err
|
||||
return obj.(*v1.Deployment), err
|
||||
}
|
||||
|
||||
func (s *deploymentClient) Update(o *v1beta2.Deployment) (*v1beta2.Deployment, error) {
|
||||
func (s *deploymentClient) Update(o *v1.Deployment) (*v1.Deployment, error) {
|
||||
obj, err := s.objectClient.Update(o.Name, o)
|
||||
return obj.(*v1beta2.Deployment), err
|
||||
return obj.(*v1.Deployment), err
|
||||
}
|
||||
|
||||
func (s *deploymentClient) Delete(name string, options *metav1.DeleteOptions) error {
|
||||
@@ -278,9 +278,9 @@ func (s *deploymentClient) Watch(opts metav1.ListOptions) (watch.Interface, erro
|
||||
}
|
||||
|
||||
// Patch applies the patch and returns the patched deployment.
|
||||
func (s *deploymentClient) Patch(o *v1beta2.Deployment, patchType types.PatchType, data []byte, subresources ...string) (*v1beta2.Deployment, error) {
|
||||
func (s *deploymentClient) Patch(o *v1.Deployment, patchType types.PatchType, data []byte, subresources ...string) (*v1.Deployment, error) {
|
||||
obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...)
|
||||
return obj.(*v1beta2.Deployment), err
|
||||
return obj.(*v1.Deployment), err
|
||||
}
|
||||
|
||||
func (s *deploymentClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error {
|
||||
@@ -323,20 +323,20 @@ func (s *deploymentClient) AddClusterScopedFeatureLifecycle(ctx context.Context,
|
||||
s.Controller().AddClusterScopedFeatureHandler(ctx, enabled, name, clusterName, sync)
|
||||
}
|
||||
|
||||
type DeploymentIndexer func(obj *v1beta2.Deployment) ([]string, error)
|
||||
type DeploymentIndexer func(obj *v1.Deployment) ([]string, error)
|
||||
|
||||
type DeploymentClientCache interface {
|
||||
Get(namespace, name string) (*v1beta2.Deployment, error)
|
||||
List(namespace string, selector labels.Selector) ([]*v1beta2.Deployment, error)
|
||||
Get(namespace, name string) (*v1.Deployment, error)
|
||||
List(namespace string, selector labels.Selector) ([]*v1.Deployment, error)
|
||||
|
||||
Index(name string, indexer DeploymentIndexer)
|
||||
GetIndexed(name, key string) ([]*v1beta2.Deployment, error)
|
||||
GetIndexed(name, key string) ([]*v1.Deployment, error)
|
||||
}
|
||||
|
||||
type DeploymentClient interface {
|
||||
Create(*v1beta2.Deployment) (*v1beta2.Deployment, error)
|
||||
Get(namespace, name string, opts metav1.GetOptions) (*v1beta2.Deployment, error)
|
||||
Update(*v1beta2.Deployment) (*v1beta2.Deployment, error)
|
||||
Create(*v1.Deployment) (*v1.Deployment, error)
|
||||
Get(namespace, name string, opts metav1.GetOptions) (*v1.Deployment, error)
|
||||
Update(*v1.Deployment) (*v1.Deployment, error)
|
||||
Delete(namespace, name string, options *metav1.DeleteOptions) error
|
||||
List(namespace string, opts metav1.ListOptions) (*DeploymentList, error)
|
||||
Watch(opts metav1.ListOptions) (watch.Interface, error)
|
||||
@@ -378,15 +378,15 @@ func (n *deploymentClient2) Enqueue(namespace, name string) {
|
||||
n.iface.Controller().Enqueue(namespace, name)
|
||||
}
|
||||
|
||||
func (n *deploymentClient2) Create(obj *v1beta2.Deployment) (*v1beta2.Deployment, error) {
|
||||
func (n *deploymentClient2) Create(obj *v1.Deployment) (*v1.Deployment, error) {
|
||||
return n.iface.Create(obj)
|
||||
}
|
||||
|
||||
func (n *deploymentClient2) Get(namespace, name string, opts metav1.GetOptions) (*v1beta2.Deployment, error) {
|
||||
func (n *deploymentClient2) Get(namespace, name string, opts metav1.GetOptions) (*v1.Deployment, error) {
|
||||
return n.iface.GetNamespaced(namespace, name, opts)
|
||||
}
|
||||
|
||||
func (n *deploymentClient2) Update(obj *v1beta2.Deployment) (*v1beta2.Deployment, error) {
|
||||
func (n *deploymentClient2) Update(obj *v1.Deployment) (*v1.Deployment, error) {
|
||||
return n.iface.Update(obj)
|
||||
}
|
||||
|
||||
@@ -402,11 +402,11 @@ func (n *deploymentClient2) Watch(opts metav1.ListOptions) (watch.Interface, err
|
||||
return n.iface.Watch(opts)
|
||||
}
|
||||
|
||||
func (n *deploymentClientCache) Get(namespace, name string) (*v1beta2.Deployment, error) {
|
||||
func (n *deploymentClientCache) Get(namespace, name string) (*v1.Deployment, error) {
|
||||
return n.client.controller.Lister().Get(namespace, name)
|
||||
}
|
||||
|
||||
func (n *deploymentClientCache) List(namespace string, selector labels.Selector) ([]*v1beta2.Deployment, error) {
|
||||
func (n *deploymentClientCache) List(namespace string, selector labels.Selector) ([]*v1.Deployment, error) {
|
||||
return n.client.controller.Lister().List(namespace, selector)
|
||||
}
|
||||
|
||||
@@ -435,7 +435,7 @@ func (n *deploymentClient2) OnRemove(ctx context.Context, name string, sync Depl
|
||||
func (n *deploymentClientCache) Index(name string, indexer DeploymentIndexer) {
|
||||
err := n.client.controller.Informer().GetIndexer().AddIndexers(map[string]cache.IndexFunc{
|
||||
name: func(obj interface{}) ([]string, error) {
|
||||
if v, ok := obj.(*v1beta2.Deployment); ok {
|
||||
if v, ok := obj.(*v1.Deployment); ok {
|
||||
return indexer(v)
|
||||
}
|
||||
return nil, nil
|
||||
@@ -447,14 +447,14 @@ func (n *deploymentClientCache) Index(name string, indexer DeploymentIndexer) {
|
||||
}
|
||||
}
|
||||
|
||||
func (n *deploymentClientCache) GetIndexed(name, key string) ([]*v1beta2.Deployment, error) {
|
||||
var result []*v1beta2.Deployment
|
||||
func (n *deploymentClientCache) GetIndexed(name, key string) ([]*v1.Deployment, error) {
|
||||
var result []*v1.Deployment
|
||||
objs, err := n.client.controller.Informer().GetIndexer().ByIndex(name, key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, obj := range objs {
|
||||
if v, ok := obj.(*v1beta2.Deployment); ok {
|
||||
if v, ok := obj.(*v1.Deployment); ok {
|
||||
result = append(result, v)
|
||||
}
|
||||
}
|
||||
@@ -478,7 +478,7 @@ func (n *deploymentLifecycleDelegate) HasCreate() bool {
|
||||
return n.create != nil
|
||||
}
|
||||
|
||||
func (n *deploymentLifecycleDelegate) Create(obj *v1beta2.Deployment) (runtime.Object, error) {
|
||||
func (n *deploymentLifecycleDelegate) Create(obj *v1.Deployment) (runtime.Object, error) {
|
||||
if n.create == nil {
|
||||
return obj, nil
|
||||
}
|
||||
@@ -489,14 +489,14 @@ func (n *deploymentLifecycleDelegate) HasFinalize() bool {
|
||||
return n.remove != nil
|
||||
}
|
||||
|
||||
func (n *deploymentLifecycleDelegate) Remove(obj *v1beta2.Deployment) (runtime.Object, error) {
|
||||
func (n *deploymentLifecycleDelegate) Remove(obj *v1.Deployment) (runtime.Object, error) {
|
||||
if n.remove == nil {
|
||||
return obj, nil
|
||||
}
|
||||
return n.remove(obj)
|
||||
}
|
||||
|
||||
func (n *deploymentLifecycleDelegate) Updated(obj *v1beta2.Deployment) (runtime.Object, error) {
|
||||
func (n *deploymentLifecycleDelegate) Updated(obj *v1.Deployment) (runtime.Object, error) {
|
||||
if n.update == nil {
|
||||
return obj, nil
|
||||
}
|
@@ -1,16 +1,16 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"github.com/rancher/norman/lifecycle"
|
||||
"github.com/rancher/norman/resource"
|
||||
"k8s.io/api/apps/v1beta2"
|
||||
v1 "k8s.io/api/apps/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
)
|
||||
|
||||
type DeploymentLifecycle interface {
|
||||
Create(obj *v1beta2.Deployment) (runtime.Object, error)
|
||||
Remove(obj *v1beta2.Deployment) (runtime.Object, error)
|
||||
Updated(obj *v1beta2.Deployment) (runtime.Object, error)
|
||||
Create(obj *v1.Deployment) (runtime.Object, error)
|
||||
Remove(obj *v1.Deployment) (runtime.Object, error)
|
||||
Updated(obj *v1.Deployment) (runtime.Object, error)
|
||||
}
|
||||
|
||||
type deploymentLifecycleAdapter struct {
|
||||
@@ -28,7 +28,7 @@ func (w *deploymentLifecycleAdapter) HasFinalize() bool {
|
||||
}
|
||||
|
||||
func (w *deploymentLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Create(obj.(*v1beta2.Deployment))
|
||||
o, err := w.lifecycle.Create(obj.(*v1.Deployment))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -36,7 +36,7 @@ func (w *deploymentLifecycleAdapter) Create(obj runtime.Object) (runtime.Object,
|
||||
}
|
||||
|
||||
func (w *deploymentLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Remove(obj.(*v1beta2.Deployment))
|
||||
o, err := w.lifecycle.Remove(obj.(*v1.Deployment))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -44,7 +44,7 @@ func (w *deploymentLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Objec
|
||||
}
|
||||
|
||||
func (w *deploymentLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Updated(obj.(*v1beta2.Deployment))
|
||||
o, err := w.lifecycle.Updated(obj.(*v1.Deployment))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -57,7 +57,7 @@ func NewDeploymentLifecycleAdapter(name string, clusterScoped bool, client Deplo
|
||||
}
|
||||
adapter := &deploymentLifecycleAdapter{lifecycle: l}
|
||||
syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient())
|
||||
return func(key string, obj *v1beta2.Deployment) (runtime.Object, error) {
|
||||
return func(key string, obj *v1.Deployment) (runtime.Object, error) {
|
||||
newObj, err := syncFn(key, obj)
|
||||
if o, ok := newObj.(runtime.Object); ok {
|
||||
return o, err
|
@@ -1,4 +1,4 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"context"
|
@@ -1,4 +1,4 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"github.com/rancher/norman/controller"
|
||||
"github.com/rancher/norman/objectclient"
|
||||
"github.com/rancher/norman/resource"
|
||||
"k8s.io/api/apps/v1beta2"
|
||||
v1 "k8s.io/api/apps/v1"
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
@@ -42,7 +42,7 @@ func init() {
|
||||
resource.Put(ReplicaSetGroupVersionResource)
|
||||
}
|
||||
|
||||
func NewReplicaSet(namespace, name string, obj v1beta2.ReplicaSet) *v1beta2.ReplicaSet {
|
||||
func NewReplicaSet(namespace, name string, obj v1.ReplicaSet) *v1.ReplicaSet {
|
||||
obj.APIVersion, obj.Kind = ReplicaSetGroupVersionKind.ToAPIVersionAndKind()
|
||||
obj.Name = name
|
||||
obj.Namespace = namespace
|
||||
@@ -52,16 +52,16 @@ func NewReplicaSet(namespace, name string, obj v1beta2.ReplicaSet) *v1beta2.Repl
|
||||
type ReplicaSetList struct {
|
||||
metav1.TypeMeta `json:",inline"`
|
||||
metav1.ListMeta `json:"metadata,omitempty"`
|
||||
Items []v1beta2.ReplicaSet `json:"items"`
|
||||
Items []v1.ReplicaSet `json:"items"`
|
||||
}
|
||||
|
||||
type ReplicaSetHandlerFunc func(key string, obj *v1beta2.ReplicaSet) (runtime.Object, error)
|
||||
type ReplicaSetHandlerFunc func(key string, obj *v1.ReplicaSet) (runtime.Object, error)
|
||||
|
||||
type ReplicaSetChangeHandlerFunc func(obj *v1beta2.ReplicaSet) (runtime.Object, error)
|
||||
type ReplicaSetChangeHandlerFunc func(obj *v1.ReplicaSet) (runtime.Object, error)
|
||||
|
||||
type ReplicaSetLister interface {
|
||||
List(namespace string, selector labels.Selector) (ret []*v1beta2.ReplicaSet, err error)
|
||||
Get(namespace, name string) (*v1beta2.ReplicaSet, error)
|
||||
List(namespace string, selector labels.Selector) (ret []*v1.ReplicaSet, err error)
|
||||
Get(namespace, name string) (*v1.ReplicaSet, error)
|
||||
}
|
||||
|
||||
type ReplicaSetController interface {
|
||||
@@ -79,10 +79,10 @@ type ReplicaSetController interface {
|
||||
|
||||
type ReplicaSetInterface interface {
|
||||
ObjectClient() *objectclient.ObjectClient
|
||||
Create(*v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error)
|
||||
GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta2.ReplicaSet, error)
|
||||
Get(name string, opts metav1.GetOptions) (*v1beta2.ReplicaSet, error)
|
||||
Update(*v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error)
|
||||
Create(*v1.ReplicaSet) (*v1.ReplicaSet, error)
|
||||
GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1.ReplicaSet, error)
|
||||
Get(name string, opts metav1.GetOptions) (*v1.ReplicaSet, error)
|
||||
Update(*v1.ReplicaSet) (*v1.ReplicaSet, error)
|
||||
Delete(name string, options *metav1.DeleteOptions) error
|
||||
DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error
|
||||
List(opts metav1.ListOptions) (*ReplicaSetList, error)
|
||||
@@ -103,14 +103,14 @@ type replicaSetLister struct {
|
||||
controller *replicaSetController
|
||||
}
|
||||
|
||||
func (l *replicaSetLister) List(namespace string, selector labels.Selector) (ret []*v1beta2.ReplicaSet, err error) {
|
||||
func (l *replicaSetLister) List(namespace string, selector labels.Selector) (ret []*v1.ReplicaSet, err error) {
|
||||
err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) {
|
||||
ret = append(ret, obj.(*v1beta2.ReplicaSet))
|
||||
ret = append(ret, obj.(*v1.ReplicaSet))
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
func (l *replicaSetLister) Get(namespace, name string) (*v1beta2.ReplicaSet, error) {
|
||||
func (l *replicaSetLister) Get(namespace, name string) (*v1.ReplicaSet, error) {
|
||||
var key string
|
||||
if namespace != "" {
|
||||
key = namespace + "/" + name
|
||||
@@ -127,7 +127,7 @@ func (l *replicaSetLister) Get(namespace, name string) (*v1beta2.ReplicaSet, err
|
||||
Resource: "replicaSet",
|
||||
}, key)
|
||||
}
|
||||
return obj.(*v1beta2.ReplicaSet), nil
|
||||
return obj.(*v1.ReplicaSet), nil
|
||||
}
|
||||
|
||||
type replicaSetController struct {
|
||||
@@ -148,7 +148,7 @@ func (c *replicaSetController) AddHandler(ctx context.Context, name string, hand
|
||||
c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) {
|
||||
if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.ReplicaSet); ok {
|
||||
} else if v, ok := obj.(*v1.ReplicaSet); ok {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -162,7 +162,7 @@ func (c *replicaSetController) AddFeatureHandler(ctx context.Context, enabled fu
|
||||
return nil, nil
|
||||
} else if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.ReplicaSet); ok {
|
||||
} else if v, ok := obj.(*v1.ReplicaSet); ok {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -174,7 +174,7 @@ func (c *replicaSetController) AddClusterScopedHandler(ctx context.Context, name
|
||||
c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) {
|
||||
if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.ReplicaSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
} else if v, ok := obj.(*v1.ReplicaSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -188,7 +188,7 @@ func (c *replicaSetController) AddClusterScopedFeatureHandler(ctx context.Contex
|
||||
return nil, nil
|
||||
} else if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.ReplicaSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
} else if v, ok := obj.(*v1.ReplicaSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -200,7 +200,7 @@ type replicaSetFactory struct {
|
||||
}
|
||||
|
||||
func (c replicaSetFactory) Object() runtime.Object {
|
||||
return &v1beta2.ReplicaSet{}
|
||||
return &v1.ReplicaSet{}
|
||||
}
|
||||
|
||||
func (c replicaSetFactory) List() runtime.Object {
|
||||
@@ -240,24 +240,24 @@ func (s *replicaSetClient) ObjectClient() *objectclient.ObjectClient {
|
||||
return s.objectClient
|
||||
}
|
||||
|
||||
func (s *replicaSetClient) Create(o *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) {
|
||||
func (s *replicaSetClient) Create(o *v1.ReplicaSet) (*v1.ReplicaSet, error) {
|
||||
obj, err := s.objectClient.Create(o)
|
||||
return obj.(*v1beta2.ReplicaSet), err
|
||||
return obj.(*v1.ReplicaSet), err
|
||||
}
|
||||
|
||||
func (s *replicaSetClient) Get(name string, opts metav1.GetOptions) (*v1beta2.ReplicaSet, error) {
|
||||
func (s *replicaSetClient) Get(name string, opts metav1.GetOptions) (*v1.ReplicaSet, error) {
|
||||
obj, err := s.objectClient.Get(name, opts)
|
||||
return obj.(*v1beta2.ReplicaSet), err
|
||||
return obj.(*v1.ReplicaSet), err
|
||||
}
|
||||
|
||||
func (s *replicaSetClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta2.ReplicaSet, error) {
|
||||
func (s *replicaSetClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1.ReplicaSet, error) {
|
||||
obj, err := s.objectClient.GetNamespaced(namespace, name, opts)
|
||||
return obj.(*v1beta2.ReplicaSet), err
|
||||
return obj.(*v1.ReplicaSet), err
|
||||
}
|
||||
|
||||
func (s *replicaSetClient) Update(o *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) {
|
||||
func (s *replicaSetClient) Update(o *v1.ReplicaSet) (*v1.ReplicaSet, error) {
|
||||
obj, err := s.objectClient.Update(o.Name, o)
|
||||
return obj.(*v1beta2.ReplicaSet), err
|
||||
return obj.(*v1.ReplicaSet), err
|
||||
}
|
||||
|
||||
func (s *replicaSetClient) Delete(name string, options *metav1.DeleteOptions) error {
|
||||
@@ -278,9 +278,9 @@ func (s *replicaSetClient) Watch(opts metav1.ListOptions) (watch.Interface, erro
|
||||
}
|
||||
|
||||
// Patch applies the patch and returns the patched deployment.
|
||||
func (s *replicaSetClient) Patch(o *v1beta2.ReplicaSet, patchType types.PatchType, data []byte, subresources ...string) (*v1beta2.ReplicaSet, error) {
|
||||
func (s *replicaSetClient) Patch(o *v1.ReplicaSet, patchType types.PatchType, data []byte, subresources ...string) (*v1.ReplicaSet, error) {
|
||||
obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...)
|
||||
return obj.(*v1beta2.ReplicaSet), err
|
||||
return obj.(*v1.ReplicaSet), err
|
||||
}
|
||||
|
||||
func (s *replicaSetClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error {
|
||||
@@ -323,20 +323,20 @@ func (s *replicaSetClient) AddClusterScopedFeatureLifecycle(ctx context.Context,
|
||||
s.Controller().AddClusterScopedFeatureHandler(ctx, enabled, name, clusterName, sync)
|
||||
}
|
||||
|
||||
type ReplicaSetIndexer func(obj *v1beta2.ReplicaSet) ([]string, error)
|
||||
type ReplicaSetIndexer func(obj *v1.ReplicaSet) ([]string, error)
|
||||
|
||||
type ReplicaSetClientCache interface {
|
||||
Get(namespace, name string) (*v1beta2.ReplicaSet, error)
|
||||
List(namespace string, selector labels.Selector) ([]*v1beta2.ReplicaSet, error)
|
||||
Get(namespace, name string) (*v1.ReplicaSet, error)
|
||||
List(namespace string, selector labels.Selector) ([]*v1.ReplicaSet, error)
|
||||
|
||||
Index(name string, indexer ReplicaSetIndexer)
|
||||
GetIndexed(name, key string) ([]*v1beta2.ReplicaSet, error)
|
||||
GetIndexed(name, key string) ([]*v1.ReplicaSet, error)
|
||||
}
|
||||
|
||||
type ReplicaSetClient interface {
|
||||
Create(*v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error)
|
||||
Get(namespace, name string, opts metav1.GetOptions) (*v1beta2.ReplicaSet, error)
|
||||
Update(*v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error)
|
||||
Create(*v1.ReplicaSet) (*v1.ReplicaSet, error)
|
||||
Get(namespace, name string, opts metav1.GetOptions) (*v1.ReplicaSet, error)
|
||||
Update(*v1.ReplicaSet) (*v1.ReplicaSet, error)
|
||||
Delete(namespace, name string, options *metav1.DeleteOptions) error
|
||||
List(namespace string, opts metav1.ListOptions) (*ReplicaSetList, error)
|
||||
Watch(opts metav1.ListOptions) (watch.Interface, error)
|
||||
@@ -378,15 +378,15 @@ func (n *replicaSetClient2) Enqueue(namespace, name string) {
|
||||
n.iface.Controller().Enqueue(namespace, name)
|
||||
}
|
||||
|
||||
func (n *replicaSetClient2) Create(obj *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) {
|
||||
func (n *replicaSetClient2) Create(obj *v1.ReplicaSet) (*v1.ReplicaSet, error) {
|
||||
return n.iface.Create(obj)
|
||||
}
|
||||
|
||||
func (n *replicaSetClient2) Get(namespace, name string, opts metav1.GetOptions) (*v1beta2.ReplicaSet, error) {
|
||||
func (n *replicaSetClient2) Get(namespace, name string, opts metav1.GetOptions) (*v1.ReplicaSet, error) {
|
||||
return n.iface.GetNamespaced(namespace, name, opts)
|
||||
}
|
||||
|
||||
func (n *replicaSetClient2) Update(obj *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) {
|
||||
func (n *replicaSetClient2) Update(obj *v1.ReplicaSet) (*v1.ReplicaSet, error) {
|
||||
return n.iface.Update(obj)
|
||||
}
|
||||
|
||||
@@ -402,11 +402,11 @@ func (n *replicaSetClient2) Watch(opts metav1.ListOptions) (watch.Interface, err
|
||||
return n.iface.Watch(opts)
|
||||
}
|
||||
|
||||
func (n *replicaSetClientCache) Get(namespace, name string) (*v1beta2.ReplicaSet, error) {
|
||||
func (n *replicaSetClientCache) Get(namespace, name string) (*v1.ReplicaSet, error) {
|
||||
return n.client.controller.Lister().Get(namespace, name)
|
||||
}
|
||||
|
||||
func (n *replicaSetClientCache) List(namespace string, selector labels.Selector) ([]*v1beta2.ReplicaSet, error) {
|
||||
func (n *replicaSetClientCache) List(namespace string, selector labels.Selector) ([]*v1.ReplicaSet, error) {
|
||||
return n.client.controller.Lister().List(namespace, selector)
|
||||
}
|
||||
|
||||
@@ -435,7 +435,7 @@ func (n *replicaSetClient2) OnRemove(ctx context.Context, name string, sync Repl
|
||||
func (n *replicaSetClientCache) Index(name string, indexer ReplicaSetIndexer) {
|
||||
err := n.client.controller.Informer().GetIndexer().AddIndexers(map[string]cache.IndexFunc{
|
||||
name: func(obj interface{}) ([]string, error) {
|
||||
if v, ok := obj.(*v1beta2.ReplicaSet); ok {
|
||||
if v, ok := obj.(*v1.ReplicaSet); ok {
|
||||
return indexer(v)
|
||||
}
|
||||
return nil, nil
|
||||
@@ -447,14 +447,14 @@ func (n *replicaSetClientCache) Index(name string, indexer ReplicaSetIndexer) {
|
||||
}
|
||||
}
|
||||
|
||||
func (n *replicaSetClientCache) GetIndexed(name, key string) ([]*v1beta2.ReplicaSet, error) {
|
||||
var result []*v1beta2.ReplicaSet
|
||||
func (n *replicaSetClientCache) GetIndexed(name, key string) ([]*v1.ReplicaSet, error) {
|
||||
var result []*v1.ReplicaSet
|
||||
objs, err := n.client.controller.Informer().GetIndexer().ByIndex(name, key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, obj := range objs {
|
||||
if v, ok := obj.(*v1beta2.ReplicaSet); ok {
|
||||
if v, ok := obj.(*v1.ReplicaSet); ok {
|
||||
result = append(result, v)
|
||||
}
|
||||
}
|
||||
@@ -478,7 +478,7 @@ func (n *replicaSetLifecycleDelegate) HasCreate() bool {
|
||||
return n.create != nil
|
||||
}
|
||||
|
||||
func (n *replicaSetLifecycleDelegate) Create(obj *v1beta2.ReplicaSet) (runtime.Object, error) {
|
||||
func (n *replicaSetLifecycleDelegate) Create(obj *v1.ReplicaSet) (runtime.Object, error) {
|
||||
if n.create == nil {
|
||||
return obj, nil
|
||||
}
|
||||
@@ -489,14 +489,14 @@ func (n *replicaSetLifecycleDelegate) HasFinalize() bool {
|
||||
return n.remove != nil
|
||||
}
|
||||
|
||||
func (n *replicaSetLifecycleDelegate) Remove(obj *v1beta2.ReplicaSet) (runtime.Object, error) {
|
||||
func (n *replicaSetLifecycleDelegate) Remove(obj *v1.ReplicaSet) (runtime.Object, error) {
|
||||
if n.remove == nil {
|
||||
return obj, nil
|
||||
}
|
||||
return n.remove(obj)
|
||||
}
|
||||
|
||||
func (n *replicaSetLifecycleDelegate) Updated(obj *v1beta2.ReplicaSet) (runtime.Object, error) {
|
||||
func (n *replicaSetLifecycleDelegate) Updated(obj *v1.ReplicaSet) (runtime.Object, error) {
|
||||
if n.update == nil {
|
||||
return obj, nil
|
||||
}
|
@@ -1,16 +1,16 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"github.com/rancher/norman/lifecycle"
|
||||
"github.com/rancher/norman/resource"
|
||||
"k8s.io/api/apps/v1beta2"
|
||||
v1 "k8s.io/api/apps/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
)
|
||||
|
||||
type ReplicaSetLifecycle interface {
|
||||
Create(obj *v1beta2.ReplicaSet) (runtime.Object, error)
|
||||
Remove(obj *v1beta2.ReplicaSet) (runtime.Object, error)
|
||||
Updated(obj *v1beta2.ReplicaSet) (runtime.Object, error)
|
||||
Create(obj *v1.ReplicaSet) (runtime.Object, error)
|
||||
Remove(obj *v1.ReplicaSet) (runtime.Object, error)
|
||||
Updated(obj *v1.ReplicaSet) (runtime.Object, error)
|
||||
}
|
||||
|
||||
type replicaSetLifecycleAdapter struct {
|
||||
@@ -28,7 +28,7 @@ func (w *replicaSetLifecycleAdapter) HasFinalize() bool {
|
||||
}
|
||||
|
||||
func (w *replicaSetLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Create(obj.(*v1beta2.ReplicaSet))
|
||||
o, err := w.lifecycle.Create(obj.(*v1.ReplicaSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -36,7 +36,7 @@ func (w *replicaSetLifecycleAdapter) Create(obj runtime.Object) (runtime.Object,
|
||||
}
|
||||
|
||||
func (w *replicaSetLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Remove(obj.(*v1beta2.ReplicaSet))
|
||||
o, err := w.lifecycle.Remove(obj.(*v1.ReplicaSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -44,7 +44,7 @@ func (w *replicaSetLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Objec
|
||||
}
|
||||
|
||||
func (w *replicaSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Updated(obj.(*v1beta2.ReplicaSet))
|
||||
o, err := w.lifecycle.Updated(obj.(*v1.ReplicaSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -57,7 +57,7 @@ func NewReplicaSetLifecycleAdapter(name string, clusterScoped bool, client Repli
|
||||
}
|
||||
adapter := &replicaSetLifecycleAdapter{lifecycle: l}
|
||||
syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient())
|
||||
return func(key string, obj *v1beta2.ReplicaSet) (runtime.Object, error) {
|
||||
return func(key string, obj *v1.ReplicaSet) (runtime.Object, error) {
|
||||
newObj, err := syncFn(key, obj)
|
||||
if o, ok := newObj.(runtime.Object); ok {
|
||||
return o, err
|
@@ -1,4 +1,4 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
|
||||
const (
|
||||
GroupName = "apps"
|
||||
Version = "v1beta2"
|
||||
Version = "v1"
|
||||
)
|
||||
|
||||
// SchemeGroupVersion is group version used to register these objects
|
@@ -1,4 +1,4 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"github.com/rancher/norman/controller"
|
||||
"github.com/rancher/norman/objectclient"
|
||||
"github.com/rancher/norman/resource"
|
||||
"k8s.io/api/apps/v1beta2"
|
||||
v1 "k8s.io/api/apps/v1"
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
@@ -42,7 +42,7 @@ func init() {
|
||||
resource.Put(StatefulSetGroupVersionResource)
|
||||
}
|
||||
|
||||
func NewStatefulSet(namespace, name string, obj v1beta2.StatefulSet) *v1beta2.StatefulSet {
|
||||
func NewStatefulSet(namespace, name string, obj v1.StatefulSet) *v1.StatefulSet {
|
||||
obj.APIVersion, obj.Kind = StatefulSetGroupVersionKind.ToAPIVersionAndKind()
|
||||
obj.Name = name
|
||||
obj.Namespace = namespace
|
||||
@@ -52,16 +52,16 @@ func NewStatefulSet(namespace, name string, obj v1beta2.StatefulSet) *v1beta2.St
|
||||
type StatefulSetList struct {
|
||||
metav1.TypeMeta `json:",inline"`
|
||||
metav1.ListMeta `json:"metadata,omitempty"`
|
||||
Items []v1beta2.StatefulSet `json:"items"`
|
||||
Items []v1.StatefulSet `json:"items"`
|
||||
}
|
||||
|
||||
type StatefulSetHandlerFunc func(key string, obj *v1beta2.StatefulSet) (runtime.Object, error)
|
||||
type StatefulSetHandlerFunc func(key string, obj *v1.StatefulSet) (runtime.Object, error)
|
||||
|
||||
type StatefulSetChangeHandlerFunc func(obj *v1beta2.StatefulSet) (runtime.Object, error)
|
||||
type StatefulSetChangeHandlerFunc func(obj *v1.StatefulSet) (runtime.Object, error)
|
||||
|
||||
type StatefulSetLister interface {
|
||||
List(namespace string, selector labels.Selector) (ret []*v1beta2.StatefulSet, err error)
|
||||
Get(namespace, name string) (*v1beta2.StatefulSet, error)
|
||||
List(namespace string, selector labels.Selector) (ret []*v1.StatefulSet, err error)
|
||||
Get(namespace, name string) (*v1.StatefulSet, error)
|
||||
}
|
||||
|
||||
type StatefulSetController interface {
|
||||
@@ -79,10 +79,10 @@ type StatefulSetController interface {
|
||||
|
||||
type StatefulSetInterface interface {
|
||||
ObjectClient() *objectclient.ObjectClient
|
||||
Create(*v1beta2.StatefulSet) (*v1beta2.StatefulSet, error)
|
||||
GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta2.StatefulSet, error)
|
||||
Get(name string, opts metav1.GetOptions) (*v1beta2.StatefulSet, error)
|
||||
Update(*v1beta2.StatefulSet) (*v1beta2.StatefulSet, error)
|
||||
Create(*v1.StatefulSet) (*v1.StatefulSet, error)
|
||||
GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1.StatefulSet, error)
|
||||
Get(name string, opts metav1.GetOptions) (*v1.StatefulSet, error)
|
||||
Update(*v1.StatefulSet) (*v1.StatefulSet, error)
|
||||
Delete(name string, options *metav1.DeleteOptions) error
|
||||
DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error
|
||||
List(opts metav1.ListOptions) (*StatefulSetList, error)
|
||||
@@ -103,14 +103,14 @@ type statefulSetLister struct {
|
||||
controller *statefulSetController
|
||||
}
|
||||
|
||||
func (l *statefulSetLister) List(namespace string, selector labels.Selector) (ret []*v1beta2.StatefulSet, err error) {
|
||||
func (l *statefulSetLister) List(namespace string, selector labels.Selector) (ret []*v1.StatefulSet, err error) {
|
||||
err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) {
|
||||
ret = append(ret, obj.(*v1beta2.StatefulSet))
|
||||
ret = append(ret, obj.(*v1.StatefulSet))
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
func (l *statefulSetLister) Get(namespace, name string) (*v1beta2.StatefulSet, error) {
|
||||
func (l *statefulSetLister) Get(namespace, name string) (*v1.StatefulSet, error) {
|
||||
var key string
|
||||
if namespace != "" {
|
||||
key = namespace + "/" + name
|
||||
@@ -127,7 +127,7 @@ func (l *statefulSetLister) Get(namespace, name string) (*v1beta2.StatefulSet, e
|
||||
Resource: "statefulSet",
|
||||
}, key)
|
||||
}
|
||||
return obj.(*v1beta2.StatefulSet), nil
|
||||
return obj.(*v1.StatefulSet), nil
|
||||
}
|
||||
|
||||
type statefulSetController struct {
|
||||
@@ -148,7 +148,7 @@ func (c *statefulSetController) AddHandler(ctx context.Context, name string, han
|
||||
c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) {
|
||||
if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.StatefulSet); ok {
|
||||
} else if v, ok := obj.(*v1.StatefulSet); ok {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -162,7 +162,7 @@ func (c *statefulSetController) AddFeatureHandler(ctx context.Context, enabled f
|
||||
return nil, nil
|
||||
} else if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.StatefulSet); ok {
|
||||
} else if v, ok := obj.(*v1.StatefulSet); ok {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -174,7 +174,7 @@ func (c *statefulSetController) AddClusterScopedHandler(ctx context.Context, nam
|
||||
c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) {
|
||||
if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.StatefulSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
} else if v, ok := obj.(*v1.StatefulSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -188,7 +188,7 @@ func (c *statefulSetController) AddClusterScopedFeatureHandler(ctx context.Conte
|
||||
return nil, nil
|
||||
} else if obj == nil {
|
||||
return handler(key, nil)
|
||||
} else if v, ok := obj.(*v1beta2.StatefulSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
} else if v, ok := obj.(*v1.StatefulSet); ok && controller.ObjectInCluster(cluster, obj) {
|
||||
return handler(key, v)
|
||||
} else {
|
||||
return nil, nil
|
||||
@@ -200,7 +200,7 @@ type statefulSetFactory struct {
|
||||
}
|
||||
|
||||
func (c statefulSetFactory) Object() runtime.Object {
|
||||
return &v1beta2.StatefulSet{}
|
||||
return &v1.StatefulSet{}
|
||||
}
|
||||
|
||||
func (c statefulSetFactory) List() runtime.Object {
|
||||
@@ -240,24 +240,24 @@ func (s *statefulSetClient) ObjectClient() *objectclient.ObjectClient {
|
||||
return s.objectClient
|
||||
}
|
||||
|
||||
func (s *statefulSetClient) Create(o *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) {
|
||||
func (s *statefulSetClient) Create(o *v1.StatefulSet) (*v1.StatefulSet, error) {
|
||||
obj, err := s.objectClient.Create(o)
|
||||
return obj.(*v1beta2.StatefulSet), err
|
||||
return obj.(*v1.StatefulSet), err
|
||||
}
|
||||
|
||||
func (s *statefulSetClient) Get(name string, opts metav1.GetOptions) (*v1beta2.StatefulSet, error) {
|
||||
func (s *statefulSetClient) Get(name string, opts metav1.GetOptions) (*v1.StatefulSet, error) {
|
||||
obj, err := s.objectClient.Get(name, opts)
|
||||
return obj.(*v1beta2.StatefulSet), err
|
||||
return obj.(*v1.StatefulSet), err
|
||||
}
|
||||
|
||||
func (s *statefulSetClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta2.StatefulSet, error) {
|
||||
func (s *statefulSetClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1.StatefulSet, error) {
|
||||
obj, err := s.objectClient.GetNamespaced(namespace, name, opts)
|
||||
return obj.(*v1beta2.StatefulSet), err
|
||||
return obj.(*v1.StatefulSet), err
|
||||
}
|
||||
|
||||
func (s *statefulSetClient) Update(o *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) {
|
||||
func (s *statefulSetClient) Update(o *v1.StatefulSet) (*v1.StatefulSet, error) {
|
||||
obj, err := s.objectClient.Update(o.Name, o)
|
||||
return obj.(*v1beta2.StatefulSet), err
|
||||
return obj.(*v1.StatefulSet), err
|
||||
}
|
||||
|
||||
func (s *statefulSetClient) Delete(name string, options *metav1.DeleteOptions) error {
|
||||
@@ -278,9 +278,9 @@ func (s *statefulSetClient) Watch(opts metav1.ListOptions) (watch.Interface, err
|
||||
}
|
||||
|
||||
// Patch applies the patch and returns the patched deployment.
|
||||
func (s *statefulSetClient) Patch(o *v1beta2.StatefulSet, patchType types.PatchType, data []byte, subresources ...string) (*v1beta2.StatefulSet, error) {
|
||||
func (s *statefulSetClient) Patch(o *v1.StatefulSet, patchType types.PatchType, data []byte, subresources ...string) (*v1.StatefulSet, error) {
|
||||
obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...)
|
||||
return obj.(*v1beta2.StatefulSet), err
|
||||
return obj.(*v1.StatefulSet), err
|
||||
}
|
||||
|
||||
func (s *statefulSetClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error {
|
||||
@@ -323,20 +323,20 @@ func (s *statefulSetClient) AddClusterScopedFeatureLifecycle(ctx context.Context
|
||||
s.Controller().AddClusterScopedFeatureHandler(ctx, enabled, name, clusterName, sync)
|
||||
}
|
||||
|
||||
type StatefulSetIndexer func(obj *v1beta2.StatefulSet) ([]string, error)
|
||||
type StatefulSetIndexer func(obj *v1.StatefulSet) ([]string, error)
|
||||
|
||||
type StatefulSetClientCache interface {
|
||||
Get(namespace, name string) (*v1beta2.StatefulSet, error)
|
||||
List(namespace string, selector labels.Selector) ([]*v1beta2.StatefulSet, error)
|
||||
Get(namespace, name string) (*v1.StatefulSet, error)
|
||||
List(namespace string, selector labels.Selector) ([]*v1.StatefulSet, error)
|
||||
|
||||
Index(name string, indexer StatefulSetIndexer)
|
||||
GetIndexed(name, key string) ([]*v1beta2.StatefulSet, error)
|
||||
GetIndexed(name, key string) ([]*v1.StatefulSet, error)
|
||||
}
|
||||
|
||||
type StatefulSetClient interface {
|
||||
Create(*v1beta2.StatefulSet) (*v1beta2.StatefulSet, error)
|
||||
Get(namespace, name string, opts metav1.GetOptions) (*v1beta2.StatefulSet, error)
|
||||
Update(*v1beta2.StatefulSet) (*v1beta2.StatefulSet, error)
|
||||
Create(*v1.StatefulSet) (*v1.StatefulSet, error)
|
||||
Get(namespace, name string, opts metav1.GetOptions) (*v1.StatefulSet, error)
|
||||
Update(*v1.StatefulSet) (*v1.StatefulSet, error)
|
||||
Delete(namespace, name string, options *metav1.DeleteOptions) error
|
||||
List(namespace string, opts metav1.ListOptions) (*StatefulSetList, error)
|
||||
Watch(opts metav1.ListOptions) (watch.Interface, error)
|
||||
@@ -378,15 +378,15 @@ func (n *statefulSetClient2) Enqueue(namespace, name string) {
|
||||
n.iface.Controller().Enqueue(namespace, name)
|
||||
}
|
||||
|
||||
func (n *statefulSetClient2) Create(obj *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) {
|
||||
func (n *statefulSetClient2) Create(obj *v1.StatefulSet) (*v1.StatefulSet, error) {
|
||||
return n.iface.Create(obj)
|
||||
}
|
||||
|
||||
func (n *statefulSetClient2) Get(namespace, name string, opts metav1.GetOptions) (*v1beta2.StatefulSet, error) {
|
||||
func (n *statefulSetClient2) Get(namespace, name string, opts metav1.GetOptions) (*v1.StatefulSet, error) {
|
||||
return n.iface.GetNamespaced(namespace, name, opts)
|
||||
}
|
||||
|
||||
func (n *statefulSetClient2) Update(obj *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) {
|
||||
func (n *statefulSetClient2) Update(obj *v1.StatefulSet) (*v1.StatefulSet, error) {
|
||||
return n.iface.Update(obj)
|
||||
}
|
||||
|
||||
@@ -402,11 +402,11 @@ func (n *statefulSetClient2) Watch(opts metav1.ListOptions) (watch.Interface, er
|
||||
return n.iface.Watch(opts)
|
||||
}
|
||||
|
||||
func (n *statefulSetClientCache) Get(namespace, name string) (*v1beta2.StatefulSet, error) {
|
||||
func (n *statefulSetClientCache) Get(namespace, name string) (*v1.StatefulSet, error) {
|
||||
return n.client.controller.Lister().Get(namespace, name)
|
||||
}
|
||||
|
||||
func (n *statefulSetClientCache) List(namespace string, selector labels.Selector) ([]*v1beta2.StatefulSet, error) {
|
||||
func (n *statefulSetClientCache) List(namespace string, selector labels.Selector) ([]*v1.StatefulSet, error) {
|
||||
return n.client.controller.Lister().List(namespace, selector)
|
||||
}
|
||||
|
||||
@@ -435,7 +435,7 @@ func (n *statefulSetClient2) OnRemove(ctx context.Context, name string, sync Sta
|
||||
func (n *statefulSetClientCache) Index(name string, indexer StatefulSetIndexer) {
|
||||
err := n.client.controller.Informer().GetIndexer().AddIndexers(map[string]cache.IndexFunc{
|
||||
name: func(obj interface{}) ([]string, error) {
|
||||
if v, ok := obj.(*v1beta2.StatefulSet); ok {
|
||||
if v, ok := obj.(*v1.StatefulSet); ok {
|
||||
return indexer(v)
|
||||
}
|
||||
return nil, nil
|
||||
@@ -447,14 +447,14 @@ func (n *statefulSetClientCache) Index(name string, indexer StatefulSetIndexer)
|
||||
}
|
||||
}
|
||||
|
||||
func (n *statefulSetClientCache) GetIndexed(name, key string) ([]*v1beta2.StatefulSet, error) {
|
||||
var result []*v1beta2.StatefulSet
|
||||
func (n *statefulSetClientCache) GetIndexed(name, key string) ([]*v1.StatefulSet, error) {
|
||||
var result []*v1.StatefulSet
|
||||
objs, err := n.client.controller.Informer().GetIndexer().ByIndex(name, key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, obj := range objs {
|
||||
if v, ok := obj.(*v1beta2.StatefulSet); ok {
|
||||
if v, ok := obj.(*v1.StatefulSet); ok {
|
||||
result = append(result, v)
|
||||
}
|
||||
}
|
||||
@@ -478,7 +478,7 @@ func (n *statefulSetLifecycleDelegate) HasCreate() bool {
|
||||
return n.create != nil
|
||||
}
|
||||
|
||||
func (n *statefulSetLifecycleDelegate) Create(obj *v1beta2.StatefulSet) (runtime.Object, error) {
|
||||
func (n *statefulSetLifecycleDelegate) Create(obj *v1.StatefulSet) (runtime.Object, error) {
|
||||
if n.create == nil {
|
||||
return obj, nil
|
||||
}
|
||||
@@ -489,14 +489,14 @@ func (n *statefulSetLifecycleDelegate) HasFinalize() bool {
|
||||
return n.remove != nil
|
||||
}
|
||||
|
||||
func (n *statefulSetLifecycleDelegate) Remove(obj *v1beta2.StatefulSet) (runtime.Object, error) {
|
||||
func (n *statefulSetLifecycleDelegate) Remove(obj *v1.StatefulSet) (runtime.Object, error) {
|
||||
if n.remove == nil {
|
||||
return obj, nil
|
||||
}
|
||||
return n.remove(obj)
|
||||
}
|
||||
|
||||
func (n *statefulSetLifecycleDelegate) Updated(obj *v1beta2.StatefulSet) (runtime.Object, error) {
|
||||
func (n *statefulSetLifecycleDelegate) Updated(obj *v1.StatefulSet) (runtime.Object, error) {
|
||||
if n.update == nil {
|
||||
return obj, nil
|
||||
}
|
@@ -1,16 +1,16 @@
|
||||
package v1beta2
|
||||
package v1
|
||||
|
||||
import (
|
||||
"github.com/rancher/norman/lifecycle"
|
||||
"github.com/rancher/norman/resource"
|
||||
"k8s.io/api/apps/v1beta2"
|
||||
v1 "k8s.io/api/apps/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
)
|
||||
|
||||
type StatefulSetLifecycle interface {
|
||||
Create(obj *v1beta2.StatefulSet) (runtime.Object, error)
|
||||
Remove(obj *v1beta2.StatefulSet) (runtime.Object, error)
|
||||
Updated(obj *v1beta2.StatefulSet) (runtime.Object, error)
|
||||
Create(obj *v1.StatefulSet) (runtime.Object, error)
|
||||
Remove(obj *v1.StatefulSet) (runtime.Object, error)
|
||||
Updated(obj *v1.StatefulSet) (runtime.Object, error)
|
||||
}
|
||||
|
||||
type statefulSetLifecycleAdapter struct {
|
||||
@@ -28,7 +28,7 @@ func (w *statefulSetLifecycleAdapter) HasFinalize() bool {
|
||||
}
|
||||
|
||||
func (w *statefulSetLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Create(obj.(*v1beta2.StatefulSet))
|
||||
o, err := w.lifecycle.Create(obj.(*v1.StatefulSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -36,7 +36,7 @@ func (w *statefulSetLifecycleAdapter) Create(obj runtime.Object) (runtime.Object
|
||||
}
|
||||
|
||||
func (w *statefulSetLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Remove(obj.(*v1beta2.StatefulSet))
|
||||
o, err := w.lifecycle.Remove(obj.(*v1.StatefulSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -44,7 +44,7 @@ func (w *statefulSetLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Obje
|
||||
}
|
||||
|
||||
func (w *statefulSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) {
|
||||
o, err := w.lifecycle.Updated(obj.(*v1beta2.StatefulSet))
|
||||
o, err := w.lifecycle.Updated(obj.(*v1.StatefulSet))
|
||||
if o == nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -57,7 +57,7 @@ func NewStatefulSetLifecycleAdapter(name string, clusterScoped bool, client Stat
|
||||
}
|
||||
adapter := &statefulSetLifecycleAdapter{lifecycle: l}
|
||||
syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient())
|
||||
return func(key string, obj *v1beta2.StatefulSet) (runtime.Object, error) {
|
||||
return func(key string, obj *v1.StatefulSet) (runtime.Object, error) {
|
||||
newObj, err := syncFn(key, obj)
|
||||
if o, ok := newObj.(runtime.Object); ok {
|
||||
return o, err
|
Reference in New Issue
Block a user