diff --git a/apis/extensions/v1beta1/zz_generated_deepcopy.go b/apis/extensions/v1beta1/zz_generated_deepcopy.go index a18fa100..c3ad8740 100644 --- a/apis/extensions/v1beta1/zz_generated_deepcopy.go +++ b/apis/extensions/v1beta1/zz_generated_deepcopy.go @@ -18,6 +18,10 @@ func init() { // Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. func RegisterDeepCopies(scheme *runtime.Scheme) error { return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*IngressList).DeepCopyInto(out.(*IngressList)) + return nil + }, InType: reflect.TypeOf(&IngressList{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*PodSecurityPolicyList).DeepCopyInto(out.(*PodSecurityPolicyList)) return nil @@ -25,6 +29,40 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { ) } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IngressList) DeepCopyInto(out *IngressList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]extensions_v1beta1.Ingress, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressList. +func (in *IngressList) DeepCopy() *IngressList { + if in == nil { + return nil + } + out := new(IngressList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *IngressList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PodSecurityPolicyList) DeepCopyInto(out *PodSecurityPolicyList) { *out = *in diff --git a/apis/extensions/v1beta1/zz_generated_ingress_controller.go b/apis/extensions/v1beta1/zz_generated_ingress_controller.go new file mode 100644 index 00000000..9811f015 --- /dev/null +++ b/apis/extensions/v1beta1/zz_generated_ingress_controller.go @@ -0,0 +1,252 @@ +package v1beta1 + +import ( + "context" + + "github.com/rancher/norman/clientbase" + "github.com/rancher/norman/controller" + "k8s.io/api/extensions/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/tools/cache" +) + +var ( + IngressGroupVersionKind = schema.GroupVersionKind{ + Version: Version, + Group: GroupName, + Kind: "Ingress", + } + IngressResource = metav1.APIResource{ + Name: "ingresses", + SingularName: "ingress", + Namespaced: false, + Kind: IngressGroupVersionKind.Kind, + } +) + +type IngressList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []v1beta1.Ingress +} + +type IngressHandlerFunc func(key string, obj *v1beta1.Ingress) error + +type IngressLister interface { + List(namespace string, selector labels.Selector) (ret []*v1beta1.Ingress, err error) + Get(namespace, name string) (*v1beta1.Ingress, error) +} + +type IngressController interface { + Informer() cache.SharedIndexInformer + Lister() IngressLister + AddHandler(name string, handler IngressHandlerFunc) + AddClusterScopedHandler(name, clusterName string, handler IngressHandlerFunc) + Enqueue(namespace, name string) + Sync(ctx context.Context) error + Start(ctx context.Context, threadiness int) error +} + +type IngressInterface interface { + ObjectClient() *clientbase.ObjectClient + Create(*v1beta1.Ingress) (*v1beta1.Ingress, error) + GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta1.Ingress, error) + Get(name string, opts metav1.GetOptions) (*v1beta1.Ingress, error) + Update(*v1beta1.Ingress) (*v1beta1.Ingress, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*IngressList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) + DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error + Controller() IngressController + AddHandler(name string, sync IngressHandlerFunc) + AddLifecycle(name string, lifecycle IngressLifecycle) + AddClusterScopedHandler(name, clusterName string, sync IngressHandlerFunc) + AddClusterScopedLifecycle(name, clusterName string, lifecycle IngressLifecycle) +} + +type ingressLister struct { + controller *ingressController +} + +func (l *ingressLister) List(namespace string, selector labels.Selector) (ret []*v1beta1.Ingress, err error) { + err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) { + ret = append(ret, obj.(*v1beta1.Ingress)) + }) + return +} + +func (l *ingressLister) Get(namespace, name string) (*v1beta1.Ingress, error) { + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(schema.GroupResource{ + Group: IngressGroupVersionKind.Group, + Resource: "ingress", + }, name) + } + return obj.(*v1beta1.Ingress), nil +} + +type ingressController struct { + controller.GenericController +} + +func (c *ingressController) Lister() IngressLister { + return &ingressLister{ + controller: c, + } +} + +func (c *ingressController) AddHandler(name string, handler IngressHandlerFunc) { + c.GenericController.AddHandler(name, func(key string) error { + obj, exists, err := c.Informer().GetStore().GetByKey(key) + if err != nil { + return err + } + if !exists { + return handler(key, nil) + } + return handler(key, obj.(*v1beta1.Ingress)) + }) +} + +func (c *ingressController) AddClusterScopedHandler(name, cluster string, handler IngressHandlerFunc) { + c.GenericController.AddHandler(name, func(key string) error { + obj, exists, err := c.Informer().GetStore().GetByKey(key) + if err != nil { + return err + } + if !exists { + return handler(key, nil) + } + + if !controller.ObjectInCluster(cluster, obj) { + return nil + } + + return handler(key, obj.(*v1beta1.Ingress)) + }) +} + +type ingressFactory struct { +} + +func (c ingressFactory) Object() runtime.Object { + return &v1beta1.Ingress{} +} + +func (c ingressFactory) List() runtime.Object { + return &IngressList{} +} + +func (s *ingressClient) Controller() IngressController { + s.client.Lock() + defer s.client.Unlock() + + c, ok := s.client.ingressControllers[s.ns] + if ok { + return c + } + + genericController := controller.NewGenericController(IngressGroupVersionKind.Kind+"Controller", + s.objectClient) + + c = &ingressController{ + GenericController: genericController, + } + + s.client.ingressControllers[s.ns] = c + s.client.starters = append(s.client.starters, c) + + return c +} + +type ingressClient struct { + client *Client + ns string + objectClient *clientbase.ObjectClient + controller IngressController +} + +func (s *ingressClient) ObjectClient() *clientbase.ObjectClient { + return s.objectClient +} + +func (s *ingressClient) Create(o *v1beta1.Ingress) (*v1beta1.Ingress, error) { + obj, err := s.objectClient.Create(o) + return obj.(*v1beta1.Ingress), err +} + +func (s *ingressClient) Get(name string, opts metav1.GetOptions) (*v1beta1.Ingress, error) { + obj, err := s.objectClient.Get(name, opts) + return obj.(*v1beta1.Ingress), err +} + +func (s *ingressClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*v1beta1.Ingress, error) { + obj, err := s.objectClient.GetNamespaced(namespace, name, opts) + return obj.(*v1beta1.Ingress), err +} + +func (s *ingressClient) Update(o *v1beta1.Ingress) (*v1beta1.Ingress, error) { + obj, err := s.objectClient.Update(o.Name, o) + return obj.(*v1beta1.Ingress), err +} + +func (s *ingressClient) Delete(name string, options *metav1.DeleteOptions) error { + return s.objectClient.Delete(name, options) +} + +func (s *ingressClient) DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespaced(namespace, name, options) +} + +func (s *ingressClient) List(opts metav1.ListOptions) (*IngressList, error) { + obj, err := s.objectClient.List(opts) + return obj.(*IngressList), err +} + +func (s *ingressClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { + return s.objectClient.Watch(opts) +} + +// Patch applies the patch and returns the patched deployment. +func (s *ingressClient) Patch(o *v1beta1.Ingress, data []byte, subresources ...string) (*v1beta1.Ingress, error) { + obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) + return obj.(*v1beta1.Ingress), err +} + +func (s *ingressClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error { + return s.objectClient.DeleteCollection(deleteOpts, listOpts) +} + +func (s *ingressClient) AddHandler(name string, sync IngressHandlerFunc) { + s.Controller().AddHandler(name, sync) +} + +func (s *ingressClient) AddLifecycle(name string, lifecycle IngressLifecycle) { + sync := NewIngressLifecycleAdapter(name, false, s, lifecycle) + s.AddHandler(name, sync) +} + +func (s *ingressClient) AddClusterScopedHandler(name, clusterName string, sync IngressHandlerFunc) { + s.Controller().AddClusterScopedHandler(name, clusterName, sync) +} + +func (s *ingressClient) AddClusterScopedLifecycle(name, clusterName string, lifecycle IngressLifecycle) { + sync := NewIngressLifecycleAdapter(name+"_"+clusterName, true, s, lifecycle) + s.AddClusterScopedHandler(name, clusterName, sync) +} diff --git a/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go b/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go new file mode 100644 index 00000000..d3c70f6b --- /dev/null +++ b/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go @@ -0,0 +1,52 @@ +package v1beta1 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/api/extensions/v1beta1" + "k8s.io/apimachinery/pkg/runtime" +) + +type IngressLifecycle interface { + Create(obj *v1beta1.Ingress) (*v1beta1.Ingress, error) + Remove(obj *v1beta1.Ingress) (*v1beta1.Ingress, error) + Updated(obj *v1beta1.Ingress) (*v1beta1.Ingress, error) +} + +type ingressLifecycleAdapter struct { + lifecycle IngressLifecycle +} + +func (w *ingressLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Create(obj.(*v1beta1.Ingress)) + if o == nil { + return nil, err + } + return o, err +} + +func (w *ingressLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Remove(obj.(*v1beta1.Ingress)) + if o == nil { + return nil, err + } + return o, err +} + +func (w *ingressLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Updated(obj.(*v1beta1.Ingress)) + if o == nil { + return nil, err + } + return o, err +} + +func NewIngressLifecycleAdapter(name string, clusterScoped bool, client IngressInterface, l IngressLifecycle) IngressHandlerFunc { + adapter := &ingressLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) + return func(key string, obj *v1beta1.Ingress) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/extensions/v1beta1/zz_generated_k8s_client.go b/apis/extensions/v1beta1/zz_generated_k8s_client.go index bcfb74d7..504505dd 100644 --- a/apis/extensions/v1beta1/zz_generated_k8s_client.go +++ b/apis/extensions/v1beta1/zz_generated_k8s_client.go @@ -15,6 +15,7 @@ type Interface interface { controller.Starter PodSecurityPoliciesGetter + IngressesGetter } type Client struct { @@ -23,6 +24,7 @@ type Client struct { starters []controller.Starter podSecurityPolicyControllers map[string]PodSecurityPolicyController + ingressControllers map[string]IngressController } func NewForConfig(config rest.Config) (Interface, error) { @@ -40,6 +42,7 @@ func NewForConfig(config rest.Config) (Interface, error) { restClient: restClient, podSecurityPolicyControllers: map[string]PodSecurityPolicyController{}, + ingressControllers: map[string]IngressController{}, }, nil } @@ -67,3 +70,16 @@ func (c *Client) PodSecurityPolicies(namespace string) PodSecurityPolicyInterfac objectClient: objectClient, } } + +type IngressesGetter interface { + Ingresses(namespace string) IngressInterface +} + +func (c *Client) Ingresses(namespace string) IngressInterface { + objectClient := clientbase.NewObjectClient(namespace, c.restClient, &IngressResource, IngressGroupVersionKind, ingressFactory{}) + return &ingressClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} diff --git a/apis/extensions/v1beta1/zz_generated_scheme.go b/apis/extensions/v1beta1/zz_generated_scheme.go index 41162a40..95c5b5cf 100644 --- a/apis/extensions/v1beta1/zz_generated_scheme.go +++ b/apis/extensions/v1beta1/zz_generated_scheme.go @@ -34,6 +34,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &PodSecurityPolicyList{}, + &IngressList{}, ) return nil } diff --git a/main.go b/main.go index 1c3dc26c..dc8230e7 100644 --- a/main.go +++ b/main.go @@ -59,5 +59,6 @@ func main() { generator.GenerateNativeTypes(extv1beta1.SchemeGroupVersion, nil, []interface{}{ extv1beta1.PodSecurityPolicy{}, + extv1beta1.Ingress{}, }) }