diff --git a/apis/apps/v1beta2/zz_generated_deployment_controller.go b/apis/apps/v1beta2/zz_generated_deployment_controller.go index f1775fed..2c1f452c 100644 --- a/apis/apps/v1beta2/zz_generated_deployment_controller.go +++ b/apis/apps/v1beta2/zz_generated_deployment_controller.go @@ -55,9 +55,11 @@ type DeploymentController interface { type DeploymentInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1beta2.Deployment) (*v1beta2.Deployment, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1beta2.Deployment, error) Get(name string, opts metav1.GetOptions) (*v1beta2.Deployment, error) Update(*v1beta2.Deployment) (*v1beta2.Deployment, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*DeploymentList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -174,6 +176,11 @@ func (s *deploymentClient) Get(name string, opts metav1.GetOptions) (*v1beta2.De return obj.(*v1beta2.Deployment), err } +func (s *deploymentClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1beta2.Deployment, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1beta2.Deployment), err +} + func (s *deploymentClient) Update(o *v1beta2.Deployment) (*v1beta2.Deployment, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1beta2.Deployment), err @@ -183,6 +190,10 @@ func (s *deploymentClient) Delete(name string, options *metav1.DeleteOptions) er return s.objectClient.Delete(name, options) } +func (s *deploymentClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *deploymentClient) List(opts metav1.ListOptions) (*DeploymentList, error) { obj, err := s.objectClient.List(opts) return obj.(*DeploymentList), err diff --git a/apis/core/v1/zz_generated_component_status_controller.go b/apis/core/v1/zz_generated_component_status_controller.go index 3aa13590..fb86ad24 100644 --- a/apis/core/v1/zz_generated_component_status_controller.go +++ b/apis/core/v1/zz_generated_component_status_controller.go @@ -54,9 +54,11 @@ type ComponentStatusController interface { type ComponentStatusInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.ComponentStatus) (*v1.ComponentStatus, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.ComponentStatus, error) Get(name string, opts metav1.GetOptions) (*v1.ComponentStatus, error) Update(*v1.ComponentStatus) (*v1.ComponentStatus, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ComponentStatusList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *componentStatusClient) Get(name string, opts metav1.GetOptions) (*v1.Co return obj.(*v1.ComponentStatus), err } +func (s *componentStatusClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.ComponentStatus, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.ComponentStatus), err +} + func (s *componentStatusClient) Update(o *v1.ComponentStatus) (*v1.ComponentStatus, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.ComponentStatus), err @@ -182,6 +189,10 @@ func (s *componentStatusClient) Delete(name string, options *metav1.DeleteOption return s.objectClient.Delete(name, options) } +func (s *componentStatusClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *componentStatusClient) List(opts metav1.ListOptions) (*ComponentStatusList, error) { obj, err := s.objectClient.List(opts) return obj.(*ComponentStatusList), err diff --git a/apis/core/v1/zz_generated_deepcopy.go b/apis/core/v1/zz_generated_deepcopy.go index 422302b6..07bbfbea 100644 --- a/apis/core/v1/zz_generated_deepcopy.go +++ b/apis/core/v1/zz_generated_deepcopy.go @@ -38,6 +38,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*PodList).DeepCopyInto(out.(*PodList)) return nil }, InType: reflect.TypeOf(&PodList{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*ServiceList).DeepCopyInto(out.(*ServiceList)) + return nil + }, InType: reflect.TypeOf(&ServiceList{})}, ) } @@ -210,3 +214,37 @@ func (in *PodList) DeepCopyObject() runtime.Object { return nil } } + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ServiceList) DeepCopyInto(out *ServiceList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]core_v1.Service, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceList. +func (in *ServiceList) DeepCopy() *ServiceList { + if in == nil { + return nil + } + out := new(ServiceList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ServiceList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} diff --git a/apis/core/v1/zz_generated_event_controller.go b/apis/core/v1/zz_generated_event_controller.go index 9eca51e1..746ade11 100644 --- a/apis/core/v1/zz_generated_event_controller.go +++ b/apis/core/v1/zz_generated_event_controller.go @@ -54,9 +54,11 @@ type EventController interface { type EventInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.Event) (*v1.Event, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Event, error) Get(name string, opts metav1.GetOptions) (*v1.Event, error) Update(*v1.Event) (*v1.Event, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*EventList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *eventClient) Get(name string, opts metav1.GetOptions) (*v1.Event, error return obj.(*v1.Event), err } +func (s *eventClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Event, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.Event), err +} + func (s *eventClient) Update(o *v1.Event) (*v1.Event, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.Event), err @@ -182,6 +189,10 @@ func (s *eventClient) Delete(name string, options *metav1.DeleteOptions) error { return s.objectClient.Delete(name, options) } +func (s *eventClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *eventClient) List(opts metav1.ListOptions) (*EventList, error) { obj, err := s.objectClient.List(opts) return obj.(*EventList), err diff --git a/apis/core/v1/zz_generated_k8s_client.go b/apis/core/v1/zz_generated_k8s_client.go index be605b67..784676a5 100644 --- a/apis/core/v1/zz_generated_k8s_client.go +++ b/apis/core/v1/zz_generated_k8s_client.go @@ -19,6 +19,7 @@ type Interface interface { NamespacesGetter EventsGetter PodsGetter + ServicesGetter } type Client struct { @@ -31,6 +32,7 @@ type Client struct { namespaceControllers map[string]NamespaceController eventControllers map[string]EventController podControllers map[string]PodController + serviceControllers map[string]ServiceController } func NewForConfig(config rest.Config) (Interface, error) { @@ -52,6 +54,7 @@ func NewForConfig(config rest.Config) (Interface, error) { namespaceControllers: map[string]NamespaceController{}, eventControllers: map[string]EventController{}, podControllers: map[string]PodController{}, + serviceControllers: map[string]ServiceController{}, }, nil } @@ -131,3 +134,16 @@ func (c *Client) Pods(namespace string) PodInterface { objectClient: objectClient, } } + +type ServicesGetter interface { + Services(namespace string) ServiceInterface +} + +func (c *Client) Services(namespace string) ServiceInterface { + objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ServiceResource, ServiceGroupVersionKind, serviceFactory{}) + return &serviceClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} diff --git a/apis/core/v1/zz_generated_namespace_controller.go b/apis/core/v1/zz_generated_namespace_controller.go index bad8640a..3449278a 100644 --- a/apis/core/v1/zz_generated_namespace_controller.go +++ b/apis/core/v1/zz_generated_namespace_controller.go @@ -54,9 +54,11 @@ type NamespaceController interface { type NamespaceInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.Namespace) (*v1.Namespace, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Namespace, error) Get(name string, opts metav1.GetOptions) (*v1.Namespace, error) Update(*v1.Namespace) (*v1.Namespace, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*NamespaceList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *namespaceClient) Get(name string, opts metav1.GetOptions) (*v1.Namespac return obj.(*v1.Namespace), err } +func (s *namespaceClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Namespace, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.Namespace), err +} + func (s *namespaceClient) Update(o *v1.Namespace) (*v1.Namespace, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.Namespace), err @@ -182,6 +189,10 @@ func (s *namespaceClient) Delete(name string, options *metav1.DeleteOptions) err return s.objectClient.Delete(name, options) } +func (s *namespaceClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *namespaceClient) List(opts metav1.ListOptions) (*NamespaceList, error) { obj, err := s.objectClient.List(opts) return obj.(*NamespaceList), err diff --git a/apis/core/v1/zz_generated_node_controller.go b/apis/core/v1/zz_generated_node_controller.go index 5dad2e51..bd41575f 100644 --- a/apis/core/v1/zz_generated_node_controller.go +++ b/apis/core/v1/zz_generated_node_controller.go @@ -54,9 +54,11 @@ type NodeController interface { type NodeInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.Node) (*v1.Node, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Node, error) Get(name string, opts metav1.GetOptions) (*v1.Node, error) Update(*v1.Node) (*v1.Node, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*NodeList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *nodeClient) Get(name string, opts metav1.GetOptions) (*v1.Node, error) return obj.(*v1.Node), err } +func (s *nodeClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Node, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.Node), err +} + func (s *nodeClient) Update(o *v1.Node) (*v1.Node, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.Node), err @@ -182,6 +189,10 @@ func (s *nodeClient) Delete(name string, options *metav1.DeleteOptions) error { return s.objectClient.Delete(name, options) } +func (s *nodeClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *nodeClient) List(opts metav1.ListOptions) (*NodeList, error) { obj, err := s.objectClient.List(opts) return obj.(*NodeList), err diff --git a/apis/core/v1/zz_generated_pod_controller.go b/apis/core/v1/zz_generated_pod_controller.go index 5d57908a..81efdf90 100644 --- a/apis/core/v1/zz_generated_pod_controller.go +++ b/apis/core/v1/zz_generated_pod_controller.go @@ -55,9 +55,11 @@ type PodController interface { type PodInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.Pod) (*v1.Pod, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Pod, error) Get(name string, opts metav1.GetOptions) (*v1.Pod, error) Update(*v1.Pod) (*v1.Pod, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*PodList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -174,6 +176,11 @@ func (s *podClient) Get(name string, opts metav1.GetOptions) (*v1.Pod, error) { return obj.(*v1.Pod), err } +func (s *podClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Pod, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.Pod), err +} + func (s *podClient) Update(o *v1.Pod) (*v1.Pod, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.Pod), err @@ -183,6 +190,10 @@ func (s *podClient) Delete(name string, options *metav1.DeleteOptions) error { return s.objectClient.Delete(name, options) } +func (s *podClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *podClient) List(opts metav1.ListOptions) (*PodList, error) { obj, err := s.objectClient.List(opts) return obj.(*PodList), err diff --git a/apis/core/v1/zz_generated_scheme.go b/apis/core/v1/zz_generated_scheme.go index 3fe68a2b..1f91efe6 100644 --- a/apis/core/v1/zz_generated_scheme.go +++ b/apis/core/v1/zz_generated_scheme.go @@ -38,6 +38,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &NamespaceList{}, &EventList{}, &PodList{}, + &ServiceList{}, ) return nil } diff --git a/apis/core/v1/zz_generated_service_controller.go b/apis/core/v1/zz_generated_service_controller.go new file mode 100644 index 00000000..30a9bb1f --- /dev/null +++ b/apis/core/v1/zz_generated_service_controller.go @@ -0,0 +1,223 @@ +package v1 + +import ( + "context" + + "github.com/rancher/norman/clientbase" + "github.com/rancher/norman/controller" + "k8s.io/api/core/v1" + "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 ( + ServiceGroupVersionKind = schema.GroupVersionKind{ + Version: Version, + Group: GroupName, + Kind: "Service", + } + ServiceResource = metav1.APIResource{ + Name: "services", + SingularName: "service", + Namespaced: true, + + Kind: ServiceGroupVersionKind.Kind, + } +) + +type ServiceList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []v1.Service +} + +type ServiceHandlerFunc func(key string, obj *v1.Service) error + +type ServiceLister interface { + List(namespace string, selector labels.Selector) (ret []*v1.Service, err error) + Get(namespace, name string) (*v1.Service, error) +} + +type ServiceController interface { + Informer() cache.SharedIndexInformer + Lister() ServiceLister + AddHandler(handler ServiceHandlerFunc) + Enqueue(namespace, name string) + Sync(ctx context.Context) error + Start(ctx context.Context, threadiness int) error +} + +type ServiceInterface interface { + ObjectClient() *clientbase.ObjectClient + Create(*v1.Service) (*v1.Service, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Service, error) + Get(name string, opts metav1.GetOptions) (*v1.Service, error) + Update(*v1.Service) (*v1.Service, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*ServiceList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) + DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error + Controller() ServiceController + AddSyncHandler(sync ServiceHandlerFunc) + AddLifecycle(name string, lifecycle ServiceLifecycle) +} + +type serviceLister struct { + controller *serviceController +} + +func (l *serviceLister) List(namespace string, selector labels.Selector) (ret []*v1.Service, err error) { + err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) { + ret = append(ret, obj.(*v1.Service)) + }) + return +} + +func (l *serviceLister) Get(namespace, name string) (*v1.Service, 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: ServiceGroupVersionKind.Group, + Resource: "service", + }, name) + } + return obj.(*v1.Service), nil +} + +type serviceController struct { + controller.GenericController +} + +func (c *serviceController) Lister() ServiceLister { + return &serviceLister{ + controller: c, + } +} + +func (c *serviceController) AddHandler(handler ServiceHandlerFunc) { + c.GenericController.AddHandler(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.(*v1.Service)) + }) +} + +type serviceFactory struct { +} + +func (c serviceFactory) Object() runtime.Object { + return &v1.Service{} +} + +func (c serviceFactory) List() runtime.Object { + return &ServiceList{} +} + +func (s *serviceClient) Controller() ServiceController { + s.client.Lock() + defer s.client.Unlock() + + c, ok := s.client.serviceControllers[s.ns] + if ok { + return c + } + + genericController := controller.NewGenericController(ServiceGroupVersionKind.Kind+"Controller", + s.objectClient) + + c = &serviceController{ + GenericController: genericController, + } + + s.client.serviceControllers[s.ns] = c + s.client.starters = append(s.client.starters, c) + + return c +} + +type serviceClient struct { + client *Client + ns string + objectClient *clientbase.ObjectClient + controller ServiceController +} + +func (s *serviceClient) ObjectClient() *clientbase.ObjectClient { + return s.objectClient +} + +func (s *serviceClient) Create(o *v1.Service) (*v1.Service, error) { + obj, err := s.objectClient.Create(o) + return obj.(*v1.Service), err +} + +func (s *serviceClient) Get(name string, opts metav1.GetOptions) (*v1.Service, error) { + obj, err := s.objectClient.Get(name, opts) + return obj.(*v1.Service), err +} + +func (s *serviceClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Service, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.Service), err +} + +func (s *serviceClient) Update(o *v1.Service) (*v1.Service, error) { + obj, err := s.objectClient.Update(o.Name, o) + return obj.(*v1.Service), err +} + +func (s *serviceClient) Delete(name string, options *metav1.DeleteOptions) error { + return s.objectClient.Delete(name, options) +} + +func (s *serviceClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + +func (s *serviceClient) List(opts metav1.ListOptions) (*ServiceList, error) { + obj, err := s.objectClient.List(opts) + return obj.(*ServiceList), err +} + +func (s *serviceClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { + return s.objectClient.Watch(opts) +} + +// Patch applies the patch and returns the patched deployment. +func (s *serviceClient) Patch(o *v1.Service, data []byte, subresources ...string) (*v1.Service, error) { + obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) + return obj.(*v1.Service), err +} + +func (s *serviceClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error { + return s.objectClient.DeleteCollection(deleteOpts, listOpts) +} + +func (s *serviceClient) AddSyncHandler(sync ServiceHandlerFunc) { + s.Controller().AddHandler(sync) +} + +func (s *serviceClient) AddLifecycle(name string, lifecycle ServiceLifecycle) { + sync := NewServiceLifecycleAdapter(name, s, lifecycle) + s.AddSyncHandler(sync) +} diff --git a/apis/core/v1/zz_generated_service_lifecycle_adapter.go b/apis/core/v1/zz_generated_service_lifecycle_adapter.go new file mode 100644 index 00000000..39fce09e --- /dev/null +++ b/apis/core/v1/zz_generated_service_lifecycle_adapter.go @@ -0,0 +1,52 @@ +package v1 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" +) + +type ServiceLifecycle interface { + Create(obj *v1.Service) (*v1.Service, error) + Remove(obj *v1.Service) (*v1.Service, error) + Updated(obj *v1.Service) (*v1.Service, error) +} + +type serviceLifecycleAdapter struct { + lifecycle ServiceLifecycle +} + +func (w *serviceLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Create(obj.(*v1.Service)) + if o == nil { + return nil, err + } + return o, err +} + +func (w *serviceLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Remove(obj.(*v1.Service)) + if o == nil { + return nil, err + } + return o, err +} + +func (w *serviceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Updated(obj.(*v1.Service)) + if o == nil { + return nil, err + } + return o, err +} + +func NewServiceLifecycleAdapter(name string, client ServiceInterface, l ServiceLifecycle) ServiceHandlerFunc { + adapter := &serviceLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *v1.Service) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go b/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go index fdeca1c6..12c6d0bb 100644 --- a/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go +++ b/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go @@ -54,9 +54,11 @@ type PodSecurityPolicyController interface { type PodSecurityPolicyInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1beta1.PodSecurityPolicy, error) Get(name string, opts metav1.GetOptions) (*v1beta1.PodSecurityPolicy, error) Update(*v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*PodSecurityPolicyList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *podSecurityPolicyClient) Get(name string, opts metav1.GetOptions) (*v1b return obj.(*v1beta1.PodSecurityPolicy), err } +func (s *podSecurityPolicyClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1beta1.PodSecurityPolicy, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1beta1.PodSecurityPolicy), err +} + func (s *podSecurityPolicyClient) Update(o *v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1beta1.PodSecurityPolicy), err @@ -182,6 +189,10 @@ func (s *podSecurityPolicyClient) Delete(name string, options *metav1.DeleteOpti return s.objectClient.Delete(name, options) } +func (s *podSecurityPolicyClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *podSecurityPolicyClient) List(opts metav1.ListOptions) (*PodSecurityPolicyList, error) { obj, err := s.objectClient.List(opts) return obj.(*PodSecurityPolicyList), err diff --git a/apis/management.cattle.io/v3/zz_generated_catalog_controller.go b/apis/management.cattle.io/v3/zz_generated_catalog_controller.go index e9f8fe06..5205a489 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_controller.go @@ -53,9 +53,11 @@ type CatalogController interface { type CatalogInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Catalog) (*Catalog, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Catalog, error) Get(name string, opts metav1.GetOptions) (*Catalog, error) Update(*Catalog) (*Catalog, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*CatalogList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *catalogClient) Get(name string, opts metav1.GetOptions) (*Catalog, erro return obj.(*Catalog), err } +func (s *catalogClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Catalog, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Catalog), err +} + func (s *catalogClient) Update(o *Catalog) (*Catalog, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Catalog), err @@ -181,6 +188,10 @@ func (s *catalogClient) Delete(name string, options *metav1.DeleteOptions) error return s.objectClient.Delete(name, options) } +func (s *catalogClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *catalogClient) List(opts metav1.ListOptions) (*CatalogList, error) { obj, err := s.objectClient.List(opts) return obj.(*CatalogList), err diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go index 5f2ad641..9258aab4 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go @@ -53,9 +53,11 @@ type ClusterController interface { type ClusterInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Cluster) (*Cluster, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Cluster, error) Get(name string, opts metav1.GetOptions) (*Cluster, error) Update(*Cluster) (*Cluster, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ClusterList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *clusterClient) Get(name string, opts metav1.GetOptions) (*Cluster, erro return obj.(*Cluster), err } +func (s *clusterClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Cluster, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Cluster), err +} + func (s *clusterClient) Update(o *Cluster) (*Cluster, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Cluster), err @@ -181,6 +188,10 @@ func (s *clusterClient) Delete(name string, options *metav1.DeleteOptions) error return s.objectClient.Delete(name, options) } +func (s *clusterClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *clusterClient) List(opts metav1.ListOptions) (*ClusterList, error) { obj, err := s.objectClient.List(opts) return obj.(*ClusterList), err diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go index 42350a9f..ef482353 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go @@ -53,9 +53,11 @@ type ClusterEventController interface { type ClusterEventInterface interface { ObjectClient() *clientbase.ObjectClient Create(*ClusterEvent) (*ClusterEvent, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*ClusterEvent, error) Get(name string, opts metav1.GetOptions) (*ClusterEvent, error) Update(*ClusterEvent) (*ClusterEvent, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ClusterEventList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *clusterEventClient) Get(name string, opts metav1.GetOptions) (*ClusterE return obj.(*ClusterEvent), err } +func (s *clusterEventClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*ClusterEvent, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*ClusterEvent), err +} + func (s *clusterEventClient) Update(o *ClusterEvent) (*ClusterEvent, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*ClusterEvent), err @@ -181,6 +188,10 @@ func (s *clusterEventClient) Delete(name string, options *metav1.DeleteOptions) return s.objectClient.Delete(name, options) } +func (s *clusterEventClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *clusterEventClient) List(opts metav1.ListOptions) (*ClusterEventList, error) { obj, err := s.objectClient.List(opts) return obj.(*ClusterEventList), err diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go index c509116b..9aac07ea 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go @@ -53,9 +53,11 @@ type ClusterRegistrationTokenController interface { type ClusterRegistrationTokenInterface interface { ObjectClient() *clientbase.ObjectClient Create(*ClusterRegistrationToken) (*ClusterRegistrationToken, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*ClusterRegistrationToken, error) Get(name string, opts metav1.GetOptions) (*ClusterRegistrationToken, error) Update(*ClusterRegistrationToken) (*ClusterRegistrationToken, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ClusterRegistrationTokenList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *clusterRegistrationTokenClient) Get(name string, opts metav1.GetOptions return obj.(*ClusterRegistrationToken), err } +func (s *clusterRegistrationTokenClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*ClusterRegistrationToken, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*ClusterRegistrationToken), err +} + func (s *clusterRegistrationTokenClient) Update(o *ClusterRegistrationToken) (*ClusterRegistrationToken, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*ClusterRegistrationToken), err @@ -181,6 +188,10 @@ func (s *clusterRegistrationTokenClient) Delete(name string, options *metav1.Del return s.objectClient.Delete(name, options) } +func (s *clusterRegistrationTokenClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *clusterRegistrationTokenClient) List(opts metav1.ListOptions) (*ClusterRegistrationTokenList, error) { obj, err := s.objectClient.List(opts) return obj.(*ClusterRegistrationTokenList), err diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go index 380e2f68..24e48e59 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go @@ -54,9 +54,11 @@ type ClusterRoleTemplateBindingController interface { type ClusterRoleTemplateBindingInterface interface { ObjectClient() *clientbase.ObjectClient Create(*ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*ClusterRoleTemplateBinding, error) Get(name string, opts metav1.GetOptions) (*ClusterRoleTemplateBinding, error) Update(*ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ClusterRoleTemplateBindingList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *clusterRoleTemplateBindingClient) Get(name string, opts metav1.GetOptio return obj.(*ClusterRoleTemplateBinding), err } +func (s *clusterRoleTemplateBindingClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*ClusterRoleTemplateBinding, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*ClusterRoleTemplateBinding), err +} + func (s *clusterRoleTemplateBindingClient) Update(o *ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*ClusterRoleTemplateBinding), err @@ -182,6 +189,10 @@ func (s *clusterRoleTemplateBindingClient) Delete(name string, options *metav1.D return s.objectClient.Delete(name, options) } +func (s *clusterRoleTemplateBindingClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *clusterRoleTemplateBindingClient) List(opts metav1.ListOptions) (*ClusterRoleTemplateBindingList, error) { obj, err := s.objectClient.List(opts) return obj.(*ClusterRoleTemplateBindingList), err diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 3b44531a..7fd4bdbc 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -1928,8 +1928,8 @@ func (in *MachineList) DeepCopyObject() runtime.Object { func (in *MachineSpec) DeepCopyInto(out *MachineSpec) { *out = *in in.NodeSpec.DeepCopyInto(&out.NodeSpec) - if in.Roles != nil { - in, out := &in.Roles, &out.Roles + if in.RequestedRoles != nil { + in, out := &in.RequestedRoles, &out.RequestedRoles *out = make([]string, len(*in)) copy(*out, *in) } diff --git a/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go b/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go index 79445f44..978141ad 100644 --- a/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go @@ -53,9 +53,11 @@ type DynamicSchemaController interface { type DynamicSchemaInterface interface { ObjectClient() *clientbase.ObjectClient Create(*DynamicSchema) (*DynamicSchema, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*DynamicSchema, error) Get(name string, opts metav1.GetOptions) (*DynamicSchema, error) Update(*DynamicSchema) (*DynamicSchema, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*DynamicSchemaList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *dynamicSchemaClient) Get(name string, opts metav1.GetOptions) (*Dynamic return obj.(*DynamicSchema), err } +func (s *dynamicSchemaClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*DynamicSchema, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*DynamicSchema), err +} + func (s *dynamicSchemaClient) Update(o *DynamicSchema) (*DynamicSchema, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*DynamicSchema), err @@ -181,6 +188,10 @@ func (s *dynamicSchemaClient) Delete(name string, options *metav1.DeleteOptions) return s.objectClient.Delete(name, options) } +func (s *dynamicSchemaClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *dynamicSchemaClient) List(opts metav1.ListOptions) (*DynamicSchemaList, error) { obj, err := s.objectClient.List(opts) return obj.(*DynamicSchemaList), err diff --git a/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go index ea1008fa..2942b379 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go @@ -53,9 +53,11 @@ type GlobalRoleBindingController interface { type GlobalRoleBindingInterface interface { ObjectClient() *clientbase.ObjectClient Create(*GlobalRoleBinding) (*GlobalRoleBinding, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*GlobalRoleBinding, error) Get(name string, opts metav1.GetOptions) (*GlobalRoleBinding, error) Update(*GlobalRoleBinding) (*GlobalRoleBinding, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*GlobalRoleBindingList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *globalRoleBindingClient) Get(name string, opts metav1.GetOptions) (*Glo return obj.(*GlobalRoleBinding), err } +func (s *globalRoleBindingClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*GlobalRoleBinding, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*GlobalRoleBinding), err +} + func (s *globalRoleBindingClient) Update(o *GlobalRoleBinding) (*GlobalRoleBinding, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*GlobalRoleBinding), err @@ -181,6 +188,10 @@ func (s *globalRoleBindingClient) Delete(name string, options *metav1.DeleteOpti return s.objectClient.Delete(name, options) } +func (s *globalRoleBindingClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *globalRoleBindingClient) List(opts metav1.ListOptions) (*GlobalRoleBindingList, error) { obj, err := s.objectClient.List(opts) return obj.(*GlobalRoleBindingList), err diff --git a/apis/management.cattle.io/v3/zz_generated_global_role_controller.go b/apis/management.cattle.io/v3/zz_generated_global_role_controller.go index e648e1c5..785ae58e 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_role_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_global_role_controller.go @@ -53,9 +53,11 @@ type GlobalRoleController interface { type GlobalRoleInterface interface { ObjectClient() *clientbase.ObjectClient Create(*GlobalRole) (*GlobalRole, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*GlobalRole, error) Get(name string, opts metav1.GetOptions) (*GlobalRole, error) Update(*GlobalRole) (*GlobalRole, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*GlobalRoleList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *globalRoleClient) Get(name string, opts metav1.GetOptions) (*GlobalRole return obj.(*GlobalRole), err } +func (s *globalRoleClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*GlobalRole, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*GlobalRole), err +} + func (s *globalRoleClient) Update(o *GlobalRole) (*GlobalRole, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*GlobalRole), err @@ -181,6 +188,10 @@ func (s *globalRoleClient) Delete(name string, options *metav1.DeleteOptions) er return s.objectClient.Delete(name, options) } +func (s *globalRoleClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *globalRoleClient) List(opts metav1.ListOptions) (*GlobalRoleList, error) { obj, err := s.objectClient.List(opts) return obj.(*GlobalRoleList), err diff --git a/apis/management.cattle.io/v3/zz_generated_group_controller.go b/apis/management.cattle.io/v3/zz_generated_group_controller.go index d8c0ff12..827bb541 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_group_controller.go @@ -53,9 +53,11 @@ type GroupController interface { type GroupInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Group) (*Group, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Group, error) Get(name string, opts metav1.GetOptions) (*Group, error) Update(*Group) (*Group, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*GroupList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *groupClient) Get(name string, opts metav1.GetOptions) (*Group, error) { return obj.(*Group), err } +func (s *groupClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Group, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Group), err +} + func (s *groupClient) Update(o *Group) (*Group, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Group), err @@ -181,6 +188,10 @@ func (s *groupClient) Delete(name string, options *metav1.DeleteOptions) error { return s.objectClient.Delete(name, options) } +func (s *groupClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *groupClient) List(opts metav1.ListOptions) (*GroupList, error) { obj, err := s.objectClient.List(opts) return obj.(*GroupList), err diff --git a/apis/management.cattle.io/v3/zz_generated_group_member_controller.go b/apis/management.cattle.io/v3/zz_generated_group_member_controller.go index 174fb458..1d662814 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_member_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_group_member_controller.go @@ -53,9 +53,11 @@ type GroupMemberController interface { type GroupMemberInterface interface { ObjectClient() *clientbase.ObjectClient Create(*GroupMember) (*GroupMember, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*GroupMember, error) Get(name string, opts metav1.GetOptions) (*GroupMember, error) Update(*GroupMember) (*GroupMember, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*GroupMemberList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *groupMemberClient) Get(name string, opts metav1.GetOptions) (*GroupMemb return obj.(*GroupMember), err } +func (s *groupMemberClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*GroupMember, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*GroupMember), err +} + func (s *groupMemberClient) Update(o *GroupMember) (*GroupMember, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*GroupMember), err @@ -181,6 +188,10 @@ func (s *groupMemberClient) Delete(name string, options *metav1.DeleteOptions) e return s.objectClient.Delete(name, options) } +func (s *groupMemberClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *groupMemberClient) List(opts metav1.ListOptions) (*GroupMemberList, error) { obj, err := s.objectClient.List(opts) return obj.(*GroupMemberList), err diff --git a/apis/management.cattle.io/v3/zz_generated_machine_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_controller.go index fb21c89d..74416c36 100644 --- a/apis/management.cattle.io/v3/zz_generated_machine_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_controller.go @@ -53,9 +53,11 @@ type MachineController interface { type MachineInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Machine) (*Machine, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Machine, error) Get(name string, opts metav1.GetOptions) (*Machine, error) Update(*Machine) (*Machine, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*MachineList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *machineClient) Get(name string, opts metav1.GetOptions) (*Machine, erro return obj.(*Machine), err } +func (s *machineClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Machine, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Machine), err +} + func (s *machineClient) Update(o *Machine) (*Machine, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Machine), err @@ -181,6 +188,10 @@ func (s *machineClient) Delete(name string, options *metav1.DeleteOptions) error return s.objectClient.Delete(name, options) } +func (s *machineClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *machineClient) List(opts metav1.ListOptions) (*MachineList, error) { obj, err := s.objectClient.List(opts) return obj.(*MachineList), err diff --git a/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go index 50736b2c..959fe407 100644 --- a/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go @@ -53,9 +53,11 @@ type MachineDriverController interface { type MachineDriverInterface interface { ObjectClient() *clientbase.ObjectClient Create(*MachineDriver) (*MachineDriver, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*MachineDriver, error) Get(name string, opts metav1.GetOptions) (*MachineDriver, error) Update(*MachineDriver) (*MachineDriver, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*MachineDriverList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *machineDriverClient) Get(name string, opts metav1.GetOptions) (*Machine return obj.(*MachineDriver), err } +func (s *machineDriverClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*MachineDriver, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*MachineDriver), err +} + func (s *machineDriverClient) Update(o *MachineDriver) (*MachineDriver, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*MachineDriver), err @@ -181,6 +188,10 @@ func (s *machineDriverClient) Delete(name string, options *metav1.DeleteOptions) return s.objectClient.Delete(name, options) } +func (s *machineDriverClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *machineDriverClient) List(opts metav1.ListOptions) (*MachineDriverList, error) { obj, err := s.objectClient.List(opts) return obj.(*MachineDriverList), err diff --git a/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go index 43ab89a1..899fade4 100644 --- a/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go @@ -53,9 +53,11 @@ type MachineTemplateController interface { type MachineTemplateInterface interface { ObjectClient() *clientbase.ObjectClient Create(*MachineTemplate) (*MachineTemplate, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*MachineTemplate, error) Get(name string, opts metav1.GetOptions) (*MachineTemplate, error) Update(*MachineTemplate) (*MachineTemplate, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*MachineTemplateList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *machineTemplateClient) Get(name string, opts metav1.GetOptions) (*Machi return obj.(*MachineTemplate), err } +func (s *machineTemplateClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*MachineTemplate, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*MachineTemplate), err +} + func (s *machineTemplateClient) Update(o *MachineTemplate) (*MachineTemplate, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*MachineTemplate), err @@ -181,6 +188,10 @@ func (s *machineTemplateClient) Delete(name string, options *metav1.DeleteOption return s.objectClient.Delete(name, options) } +func (s *machineTemplateClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *machineTemplateClient) List(opts metav1.ListOptions) (*MachineTemplateList, error) { obj, err := s.objectClient.List(opts) return obj.(*MachineTemplateList), err diff --git a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go index 2c2ee6ce..51bd1d13 100644 --- a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go @@ -53,9 +53,11 @@ type PodSecurityPolicyTemplateController interface { type PodSecurityPolicyTemplateInterface interface { ObjectClient() *clientbase.ObjectClient Create(*PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*PodSecurityPolicyTemplate, error) Get(name string, opts metav1.GetOptions) (*PodSecurityPolicyTemplate, error) Update(*PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*PodSecurityPolicyTemplateList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *podSecurityPolicyTemplateClient) Get(name string, opts metav1.GetOption return obj.(*PodSecurityPolicyTemplate), err } +func (s *podSecurityPolicyTemplateClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*PodSecurityPolicyTemplate, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*PodSecurityPolicyTemplate), err +} + func (s *podSecurityPolicyTemplateClient) Update(o *PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*PodSecurityPolicyTemplate), err @@ -181,6 +188,10 @@ func (s *podSecurityPolicyTemplateClient) Delete(name string, options *metav1.De return s.objectClient.Delete(name, options) } +func (s *podSecurityPolicyTemplateClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *podSecurityPolicyTemplateClient) List(opts metav1.ListOptions) (*PodSecurityPolicyTemplateList, error) { obj, err := s.objectClient.List(opts) return obj.(*PodSecurityPolicyTemplateList), err diff --git a/apis/management.cattle.io/v3/zz_generated_principal_controller.go b/apis/management.cattle.io/v3/zz_generated_principal_controller.go index 785f52bb..382d4dae 100644 --- a/apis/management.cattle.io/v3/zz_generated_principal_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_principal_controller.go @@ -53,9 +53,11 @@ type PrincipalController interface { type PrincipalInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Principal) (*Principal, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Principal, error) Get(name string, opts metav1.GetOptions) (*Principal, error) Update(*Principal) (*Principal, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*PrincipalList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *principalClient) Get(name string, opts metav1.GetOptions) (*Principal, return obj.(*Principal), err } +func (s *principalClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Principal, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Principal), err +} + func (s *principalClient) Update(o *Principal) (*Principal, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Principal), err @@ -181,6 +188,10 @@ func (s *principalClient) Delete(name string, options *metav1.DeleteOptions) err return s.objectClient.Delete(name, options) } +func (s *principalClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *principalClient) List(opts metav1.ListOptions) (*PrincipalList, error) { obj, err := s.objectClient.List(opts) return obj.(*PrincipalList), err diff --git a/apis/management.cattle.io/v3/zz_generated_project_controller.go b/apis/management.cattle.io/v3/zz_generated_project_controller.go index 4b42edaf..8058022b 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_controller.go @@ -53,9 +53,11 @@ type ProjectController interface { type ProjectInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Project) (*Project, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Project, error) Get(name string, opts metav1.GetOptions) (*Project, error) Update(*Project) (*Project, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ProjectList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *projectClient) Get(name string, opts metav1.GetOptions) (*Project, erro return obj.(*Project), err } +func (s *projectClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Project, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Project), err +} + func (s *projectClient) Update(o *Project) (*Project, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Project), err @@ -181,6 +188,10 @@ func (s *projectClient) Delete(name string, options *metav1.DeleteOptions) error return s.objectClient.Delete(name, options) } +func (s *projectClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *projectClient) List(opts metav1.ListOptions) (*ProjectList, error) { obj, err := s.objectClient.List(opts) return obj.(*ProjectList), err diff --git a/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go index 99208603..5ff21ef9 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go @@ -54,9 +54,11 @@ type ProjectRoleTemplateBindingController interface { type ProjectRoleTemplateBindingInterface interface { ObjectClient() *clientbase.ObjectClient Create(*ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*ProjectRoleTemplateBinding, error) Get(name string, opts metav1.GetOptions) (*ProjectRoleTemplateBinding, error) Update(*ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ProjectRoleTemplateBindingList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *projectRoleTemplateBindingClient) Get(name string, opts metav1.GetOptio return obj.(*ProjectRoleTemplateBinding), err } +func (s *projectRoleTemplateBindingClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*ProjectRoleTemplateBinding, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*ProjectRoleTemplateBinding), err +} + func (s *projectRoleTemplateBindingClient) Update(o *ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*ProjectRoleTemplateBinding), err @@ -182,6 +189,10 @@ func (s *projectRoleTemplateBindingClient) Delete(name string, options *metav1.D return s.objectClient.Delete(name, options) } +func (s *projectRoleTemplateBindingClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *projectRoleTemplateBindingClient) List(opts metav1.ListOptions) (*ProjectRoleTemplateBindingList, error) { obj, err := s.objectClient.List(opts) return obj.(*ProjectRoleTemplateBindingList), err diff --git a/apis/management.cattle.io/v3/zz_generated_role_template_controller.go b/apis/management.cattle.io/v3/zz_generated_role_template_controller.go index 7016096c..83277a0f 100644 --- a/apis/management.cattle.io/v3/zz_generated_role_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_role_template_controller.go @@ -53,9 +53,11 @@ type RoleTemplateController interface { type RoleTemplateInterface interface { ObjectClient() *clientbase.ObjectClient Create(*RoleTemplate) (*RoleTemplate, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*RoleTemplate, error) Get(name string, opts metav1.GetOptions) (*RoleTemplate, error) Update(*RoleTemplate) (*RoleTemplate, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*RoleTemplateList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *roleTemplateClient) Get(name string, opts metav1.GetOptions) (*RoleTemp return obj.(*RoleTemplate), err } +func (s *roleTemplateClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*RoleTemplate, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*RoleTemplate), err +} + func (s *roleTemplateClient) Update(o *RoleTemplate) (*RoleTemplate, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*RoleTemplate), err @@ -181,6 +188,10 @@ func (s *roleTemplateClient) Delete(name string, options *metav1.DeleteOptions) return s.objectClient.Delete(name, options) } +func (s *roleTemplateClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *roleTemplateClient) List(opts metav1.ListOptions) (*RoleTemplateList, error) { obj, err := s.objectClient.List(opts) return obj.(*RoleTemplateList), err diff --git a/apis/management.cattle.io/v3/zz_generated_template_controller.go b/apis/management.cattle.io/v3/zz_generated_template_controller.go index 3fae1115..7fd72b3e 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_template_controller.go @@ -53,9 +53,11 @@ type TemplateController interface { type TemplateInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Template) (*Template, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Template, error) Get(name string, opts metav1.GetOptions) (*Template, error) Update(*Template) (*Template, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*TemplateList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *templateClient) Get(name string, opts metav1.GetOptions) (*Template, er return obj.(*Template), err } +func (s *templateClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Template, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Template), err +} + func (s *templateClient) Update(o *Template) (*Template, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Template), err @@ -181,6 +188,10 @@ func (s *templateClient) Delete(name string, options *metav1.DeleteOptions) erro return s.objectClient.Delete(name, options) } +func (s *templateClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *templateClient) List(opts metav1.ListOptions) (*TemplateList, error) { obj, err := s.objectClient.List(opts) return obj.(*TemplateList), err diff --git a/apis/management.cattle.io/v3/zz_generated_template_version_controller.go b/apis/management.cattle.io/v3/zz_generated_template_version_controller.go index 2a094b3a..fcc5a87d 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_version_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_template_version_controller.go @@ -53,9 +53,11 @@ type TemplateVersionController interface { type TemplateVersionInterface interface { ObjectClient() *clientbase.ObjectClient Create(*TemplateVersion) (*TemplateVersion, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*TemplateVersion, error) Get(name string, opts metav1.GetOptions) (*TemplateVersion, error) Update(*TemplateVersion) (*TemplateVersion, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*TemplateVersionList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *templateVersionClient) Get(name string, opts metav1.GetOptions) (*Templ return obj.(*TemplateVersion), err } +func (s *templateVersionClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*TemplateVersion, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*TemplateVersion), err +} + func (s *templateVersionClient) Update(o *TemplateVersion) (*TemplateVersion, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*TemplateVersion), err @@ -181,6 +188,10 @@ func (s *templateVersionClient) Delete(name string, options *metav1.DeleteOption return s.objectClient.Delete(name, options) } +func (s *templateVersionClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *templateVersionClient) List(opts metav1.ListOptions) (*TemplateVersionList, error) { obj, err := s.objectClient.List(opts) return obj.(*TemplateVersionList), err diff --git a/apis/management.cattle.io/v3/zz_generated_token_controller.go b/apis/management.cattle.io/v3/zz_generated_token_controller.go index fdfb9673..588c2ceb 100644 --- a/apis/management.cattle.io/v3/zz_generated_token_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_token_controller.go @@ -53,9 +53,11 @@ type TokenController interface { type TokenInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Token) (*Token, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Token, error) Get(name string, opts metav1.GetOptions) (*Token, error) Update(*Token) (*Token, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*TokenList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *tokenClient) Get(name string, opts metav1.GetOptions) (*Token, error) { return obj.(*Token), err } +func (s *tokenClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Token, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Token), err +} + func (s *tokenClient) Update(o *Token) (*Token, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Token), err @@ -181,6 +188,10 @@ func (s *tokenClient) Delete(name string, options *metav1.DeleteOptions) error { return s.objectClient.Delete(name, options) } +func (s *tokenClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *tokenClient) List(opts metav1.ListOptions) (*TokenList, error) { obj, err := s.objectClient.List(opts) return obj.(*TokenList), err diff --git a/apis/management.cattle.io/v3/zz_generated_user_controller.go b/apis/management.cattle.io/v3/zz_generated_user_controller.go index 07a3c80d..1627614f 100644 --- a/apis/management.cattle.io/v3/zz_generated_user_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_user_controller.go @@ -53,9 +53,11 @@ type UserController interface { type UserInterface interface { ObjectClient() *clientbase.ObjectClient Create(*User) (*User, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*User, error) Get(name string, opts metav1.GetOptions) (*User, error) Update(*User) (*User, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*UserList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -172,6 +174,11 @@ func (s *userClient) Get(name string, opts metav1.GetOptions) (*User, error) { return obj.(*User), err } +func (s *userClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*User, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*User), err +} + func (s *userClient) Update(o *User) (*User, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*User), err @@ -181,6 +188,10 @@ func (s *userClient) Delete(name string, options *metav1.DeleteOptions) error { return s.objectClient.Delete(name, options) } +func (s *userClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *userClient) List(opts metav1.ListOptions) (*UserList, error) { obj, err := s.objectClient.List(opts) return obj.(*UserList), err diff --git a/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go b/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go index 031212bd..0c0aa5bf 100644 --- a/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go @@ -54,9 +54,11 @@ type BasicAuthController interface { type BasicAuthInterface interface { ObjectClient() *clientbase.ObjectClient Create(*BasicAuth) (*BasicAuth, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*BasicAuth, error) Get(name string, opts metav1.GetOptions) (*BasicAuth, error) Update(*BasicAuth) (*BasicAuth, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*BasicAuthList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *basicAuthClient) Get(name string, opts metav1.GetOptions) (*BasicAuth, return obj.(*BasicAuth), err } +func (s *basicAuthClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*BasicAuth, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*BasicAuth), err +} + func (s *basicAuthClient) Update(o *BasicAuth) (*BasicAuth, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*BasicAuth), err @@ -182,6 +189,10 @@ func (s *basicAuthClient) Delete(name string, options *metav1.DeleteOptions) err return s.objectClient.Delete(name, options) } +func (s *basicAuthClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *basicAuthClient) List(opts metav1.ListOptions) (*BasicAuthList, error) { obj, err := s.objectClient.List(opts) return obj.(*BasicAuthList), err diff --git a/apis/project.cattle.io/v3/zz_generated_certificate_controller.go b/apis/project.cattle.io/v3/zz_generated_certificate_controller.go index e5a775fe..83d8f1c8 100644 --- a/apis/project.cattle.io/v3/zz_generated_certificate_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_certificate_controller.go @@ -54,9 +54,11 @@ type CertificateController interface { type CertificateInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Certificate) (*Certificate, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Certificate, error) Get(name string, opts metav1.GetOptions) (*Certificate, error) Update(*Certificate) (*Certificate, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*CertificateList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *certificateClient) Get(name string, opts metav1.GetOptions) (*Certifica return obj.(*Certificate), err } +func (s *certificateClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Certificate, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Certificate), err +} + func (s *certificateClient) Update(o *Certificate) (*Certificate, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Certificate), err @@ -182,6 +189,10 @@ func (s *certificateClient) Delete(name string, options *metav1.DeleteOptions) e return s.objectClient.Delete(name, options) } +func (s *certificateClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *certificateClient) List(opts metav1.ListOptions) (*CertificateList, error) { obj, err := s.objectClient.List(opts) return obj.(*CertificateList), err diff --git a/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go b/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go index 92d3836b..136da675 100644 --- a/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go @@ -54,9 +54,11 @@ type DockerCredentialController interface { type DockerCredentialInterface interface { ObjectClient() *clientbase.ObjectClient Create(*DockerCredential) (*DockerCredential, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*DockerCredential, error) Get(name string, opts metav1.GetOptions) (*DockerCredential, error) Update(*DockerCredential) (*DockerCredential, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*DockerCredentialList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *dockerCredentialClient) Get(name string, opts metav1.GetOptions) (*Dock return obj.(*DockerCredential), err } +func (s *dockerCredentialClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*DockerCredential, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*DockerCredential), err +} + func (s *dockerCredentialClient) Update(o *DockerCredential) (*DockerCredential, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*DockerCredential), err @@ -182,6 +189,10 @@ func (s *dockerCredentialClient) Delete(name string, options *metav1.DeleteOptio return s.objectClient.Delete(name, options) } +func (s *dockerCredentialClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *dockerCredentialClient) List(opts metav1.ListOptions) (*DockerCredentialList, error) { obj, err := s.objectClient.List(opts) return obj.(*DockerCredentialList), err diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go index 7c0968cc..f02a420c 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go @@ -54,9 +54,11 @@ type NamespacedBasicAuthController interface { type NamespacedBasicAuthInterface interface { ObjectClient() *clientbase.ObjectClient Create(*NamespacedBasicAuth) (*NamespacedBasicAuth, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedBasicAuth, error) Get(name string, opts metav1.GetOptions) (*NamespacedBasicAuth, error) Update(*NamespacedBasicAuth) (*NamespacedBasicAuth, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*NamespacedBasicAuthList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *namespacedBasicAuthClient) Get(name string, opts metav1.GetOptions) (*N return obj.(*NamespacedBasicAuth), err } +func (s *namespacedBasicAuthClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedBasicAuth, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*NamespacedBasicAuth), err +} + func (s *namespacedBasicAuthClient) Update(o *NamespacedBasicAuth) (*NamespacedBasicAuth, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*NamespacedBasicAuth), err @@ -182,6 +189,10 @@ func (s *namespacedBasicAuthClient) Delete(name string, options *metav1.DeleteOp return s.objectClient.Delete(name, options) } +func (s *namespacedBasicAuthClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *namespacedBasicAuthClient) List(opts metav1.ListOptions) (*NamespacedBasicAuthList, error) { obj, err := s.objectClient.List(opts) return obj.(*NamespacedBasicAuthList), err diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go index e40f0d8b..15e79eff 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go @@ -54,9 +54,11 @@ type NamespacedCertificateController interface { type NamespacedCertificateInterface interface { ObjectClient() *clientbase.ObjectClient Create(*NamespacedCertificate) (*NamespacedCertificate, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedCertificate, error) Get(name string, opts metav1.GetOptions) (*NamespacedCertificate, error) Update(*NamespacedCertificate) (*NamespacedCertificate, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*NamespacedCertificateList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *namespacedCertificateClient) Get(name string, opts metav1.GetOptions) ( return obj.(*NamespacedCertificate), err } +func (s *namespacedCertificateClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedCertificate, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*NamespacedCertificate), err +} + func (s *namespacedCertificateClient) Update(o *NamespacedCertificate) (*NamespacedCertificate, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*NamespacedCertificate), err @@ -182,6 +189,10 @@ func (s *namespacedCertificateClient) Delete(name string, options *metav1.Delete return s.objectClient.Delete(name, options) } +func (s *namespacedCertificateClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *namespacedCertificateClient) List(opts metav1.ListOptions) (*NamespacedCertificateList, error) { obj, err := s.objectClient.List(opts) return obj.(*NamespacedCertificateList), err diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go index 2a44dce0..9bbe5d76 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go @@ -54,9 +54,11 @@ type NamespacedDockerCredentialController interface { type NamespacedDockerCredentialInterface interface { ObjectClient() *clientbase.ObjectClient Create(*NamespacedDockerCredential) (*NamespacedDockerCredential, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedDockerCredential, error) Get(name string, opts metav1.GetOptions) (*NamespacedDockerCredential, error) Update(*NamespacedDockerCredential) (*NamespacedDockerCredential, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*NamespacedDockerCredentialList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *namespacedDockerCredentialClient) Get(name string, opts metav1.GetOptio return obj.(*NamespacedDockerCredential), err } +func (s *namespacedDockerCredentialClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedDockerCredential, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*NamespacedDockerCredential), err +} + func (s *namespacedDockerCredentialClient) Update(o *NamespacedDockerCredential) (*NamespacedDockerCredential, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*NamespacedDockerCredential), err @@ -182,6 +189,10 @@ func (s *namespacedDockerCredentialClient) Delete(name string, options *metav1.D return s.objectClient.Delete(name, options) } +func (s *namespacedDockerCredentialClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *namespacedDockerCredentialClient) List(opts metav1.ListOptions) (*NamespacedDockerCredentialList, error) { obj, err := s.objectClient.List(opts) return obj.(*NamespacedDockerCredentialList), err diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go index 9ba389db..54164d01 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go @@ -54,9 +54,11 @@ type NamespacedServiceAccountTokenController interface { type NamespacedServiceAccountTokenInterface interface { ObjectClient() *clientbase.ObjectClient Create(*NamespacedServiceAccountToken) (*NamespacedServiceAccountToken, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedServiceAccountToken, error) Get(name string, opts metav1.GetOptions) (*NamespacedServiceAccountToken, error) Update(*NamespacedServiceAccountToken) (*NamespacedServiceAccountToken, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*NamespacedServiceAccountTokenList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *namespacedServiceAccountTokenClient) Get(name string, opts metav1.GetOp return obj.(*NamespacedServiceAccountToken), err } +func (s *namespacedServiceAccountTokenClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedServiceAccountToken, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*NamespacedServiceAccountToken), err +} + func (s *namespacedServiceAccountTokenClient) Update(o *NamespacedServiceAccountToken) (*NamespacedServiceAccountToken, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*NamespacedServiceAccountToken), err @@ -182,6 +189,10 @@ func (s *namespacedServiceAccountTokenClient) Delete(name string, options *metav return s.objectClient.Delete(name, options) } +func (s *namespacedServiceAccountTokenClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *namespacedServiceAccountTokenClient) List(opts metav1.ListOptions) (*NamespacedServiceAccountTokenList, error) { obj, err := s.objectClient.List(opts) return obj.(*NamespacedServiceAccountTokenList), err diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go index 4352ff90..d9747ded 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go @@ -54,9 +54,11 @@ type NamespacedSSHAuthController interface { type NamespacedSSHAuthInterface interface { ObjectClient() *clientbase.ObjectClient Create(*NamespacedSSHAuth) (*NamespacedSSHAuth, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedSSHAuth, error) Get(name string, opts metav1.GetOptions) (*NamespacedSSHAuth, error) Update(*NamespacedSSHAuth) (*NamespacedSSHAuth, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*NamespacedSSHAuthList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *namespacedSshAuthClient) Get(name string, opts metav1.GetOptions) (*Nam return obj.(*NamespacedSSHAuth), err } +func (s *namespacedSshAuthClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*NamespacedSSHAuth, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*NamespacedSSHAuth), err +} + func (s *namespacedSshAuthClient) Update(o *NamespacedSSHAuth) (*NamespacedSSHAuth, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*NamespacedSSHAuth), err @@ -182,6 +189,10 @@ func (s *namespacedSshAuthClient) Delete(name string, options *metav1.DeleteOpti return s.objectClient.Delete(name, options) } +func (s *namespacedSshAuthClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *namespacedSshAuthClient) List(opts metav1.ListOptions) (*NamespacedSSHAuthList, error) { obj, err := s.objectClient.List(opts) return obj.(*NamespacedSSHAuthList), err diff --git a/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go b/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go index 4a83ea82..61195bff 100644 --- a/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go @@ -54,9 +54,11 @@ type ServiceAccountTokenController interface { type ServiceAccountTokenInterface interface { ObjectClient() *clientbase.ObjectClient Create(*ServiceAccountToken) (*ServiceAccountToken, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*ServiceAccountToken, error) Get(name string, opts metav1.GetOptions) (*ServiceAccountToken, error) Update(*ServiceAccountToken) (*ServiceAccountToken, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ServiceAccountTokenList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *serviceAccountTokenClient) Get(name string, opts metav1.GetOptions) (*S return obj.(*ServiceAccountToken), err } +func (s *serviceAccountTokenClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*ServiceAccountToken, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*ServiceAccountToken), err +} + func (s *serviceAccountTokenClient) Update(o *ServiceAccountToken) (*ServiceAccountToken, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*ServiceAccountToken), err @@ -182,6 +189,10 @@ func (s *serviceAccountTokenClient) Delete(name string, options *metav1.DeleteOp return s.objectClient.Delete(name, options) } +func (s *serviceAccountTokenClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *serviceAccountTokenClient) List(opts metav1.ListOptions) (*ServiceAccountTokenList, error) { obj, err := s.objectClient.List(opts) return obj.(*ServiceAccountTokenList), err diff --git a/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go b/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go index e1aeeb7c..23a092f9 100644 --- a/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go @@ -54,9 +54,11 @@ type SSHAuthController interface { type SSHAuthInterface interface { ObjectClient() *clientbase.ObjectClient Create(*SSHAuth) (*SSHAuth, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*SSHAuth, error) Get(name string, opts metav1.GetOptions) (*SSHAuth, error) Update(*SSHAuth) (*SSHAuth, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*SSHAuthList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *sshAuthClient) Get(name string, opts metav1.GetOptions) (*SSHAuth, erro return obj.(*SSHAuth), err } +func (s *sshAuthClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*SSHAuth, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*SSHAuth), err +} + func (s *sshAuthClient) Update(o *SSHAuth) (*SSHAuth, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*SSHAuth), err @@ -182,6 +189,10 @@ func (s *sshAuthClient) Delete(name string, options *metav1.DeleteOptions) error return s.objectClient.Delete(name, options) } +func (s *sshAuthClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *sshAuthClient) List(opts metav1.ListOptions) (*SSHAuthList, error) { obj, err := s.objectClient.List(opts) return obj.(*SSHAuthList), err diff --git a/apis/project.cattle.io/v3/zz_generated_workload_controller.go b/apis/project.cattle.io/v3/zz_generated_workload_controller.go index 883ab966..336347e9 100644 --- a/apis/project.cattle.io/v3/zz_generated_workload_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_workload_controller.go @@ -54,9 +54,11 @@ type WorkloadController interface { type WorkloadInterface interface { ObjectClient() *clientbase.ObjectClient Create(*Workload) (*Workload, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*Workload, error) Get(name string, opts metav1.GetOptions) (*Workload, error) Update(*Workload) (*Workload, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*WorkloadList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *workloadClient) Get(name string, opts metav1.GetOptions) (*Workload, er return obj.(*Workload), err } +func (s *workloadClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*Workload, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*Workload), err +} + func (s *workloadClient) Update(o *Workload) (*Workload, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*Workload), err @@ -182,6 +189,10 @@ func (s *workloadClient) Delete(name string, options *metav1.DeleteOptions) erro return s.objectClient.Delete(name, options) } +func (s *workloadClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *workloadClient) List(opts metav1.ListOptions) (*WorkloadList, error) { obj, err := s.objectClient.List(opts) return obj.(*WorkloadList), err diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go index f1107e2c..7b0693a5 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go @@ -54,9 +54,11 @@ type ClusterRoleBindingController interface { type ClusterRoleBindingInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.ClusterRoleBinding, error) Get(name string, opts metav1.GetOptions) (*v1.ClusterRoleBinding, error) Update(*v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ClusterRoleBindingList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *clusterRoleBindingClient) Get(name string, opts metav1.GetOptions) (*v1 return obj.(*v1.ClusterRoleBinding), err } +func (s *clusterRoleBindingClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.ClusterRoleBinding, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.ClusterRoleBinding), err +} + func (s *clusterRoleBindingClient) Update(o *v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.ClusterRoleBinding), err @@ -182,6 +189,10 @@ func (s *clusterRoleBindingClient) Delete(name string, options *metav1.DeleteOpt return s.objectClient.Delete(name, options) } +func (s *clusterRoleBindingClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *clusterRoleBindingClient) List(opts metav1.ListOptions) (*ClusterRoleBindingList, error) { obj, err := s.objectClient.List(opts) return obj.(*ClusterRoleBindingList), err diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go index 2127a26c..2b8fc94c 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go @@ -54,9 +54,11 @@ type ClusterRoleController interface { type ClusterRoleInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.ClusterRole) (*v1.ClusterRole, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.ClusterRole, error) Get(name string, opts metav1.GetOptions) (*v1.ClusterRole, error) Update(*v1.ClusterRole) (*v1.ClusterRole, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*ClusterRoleList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -173,6 +175,11 @@ func (s *clusterRoleClient) Get(name string, opts metav1.GetOptions) (*v1.Cluste return obj.(*v1.ClusterRole), err } +func (s *clusterRoleClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.ClusterRole, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.ClusterRole), err +} + func (s *clusterRoleClient) Update(o *v1.ClusterRole) (*v1.ClusterRole, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.ClusterRole), err @@ -182,6 +189,10 @@ func (s *clusterRoleClient) Delete(name string, options *metav1.DeleteOptions) e return s.objectClient.Delete(name, options) } +func (s *clusterRoleClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *clusterRoleClient) List(opts metav1.ListOptions) (*ClusterRoleList, error) { obj, err := s.objectClient.List(opts) return obj.(*ClusterRoleList), err diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go index 32ce22a7..30d7725e 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go @@ -55,9 +55,11 @@ type RoleBindingController interface { type RoleBindingInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.RoleBinding) (*v1.RoleBinding, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.RoleBinding, error) Get(name string, opts metav1.GetOptions) (*v1.RoleBinding, error) Update(*v1.RoleBinding) (*v1.RoleBinding, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*RoleBindingList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -174,6 +176,11 @@ func (s *roleBindingClient) Get(name string, opts metav1.GetOptions) (*v1.RoleBi return obj.(*v1.RoleBinding), err } +func (s *roleBindingClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.RoleBinding, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.RoleBinding), err +} + func (s *roleBindingClient) Update(o *v1.RoleBinding) (*v1.RoleBinding, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.RoleBinding), err @@ -183,6 +190,10 @@ func (s *roleBindingClient) Delete(name string, options *metav1.DeleteOptions) e return s.objectClient.Delete(name, options) } +func (s *roleBindingClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *roleBindingClient) List(opts metav1.ListOptions) (*RoleBindingList, error) { obj, err := s.objectClient.List(opts) return obj.(*RoleBindingList), err diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go index dab37b7e..f8a5fd0b 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go @@ -55,9 +55,11 @@ type RoleController interface { type RoleInterface interface { ObjectClient() *clientbase.ObjectClient Create(*v1.Role) (*v1.Role, error) + GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Role, error) Get(name string, opts metav1.GetOptions) (*v1.Role, error) Update(*v1.Role) (*v1.Role, error) Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error List(opts metav1.ListOptions) (*RoleList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error @@ -174,6 +176,11 @@ func (s *roleClient) Get(name string, opts metav1.GetOptions) (*v1.Role, error) return obj.(*v1.Role), err } +func (s *roleClient) GetNamespace(name, namespace string, opts metav1.GetOptions) (*v1.Role, error) { + obj, err := s.objectClient.GetNamespace(name, namespace, opts) + return obj.(*v1.Role), err +} + func (s *roleClient) Update(o *v1.Role) (*v1.Role, error) { obj, err := s.objectClient.Update(o.Name, o) return obj.(*v1.Role), err @@ -183,6 +190,10 @@ func (s *roleClient) Delete(name string, options *metav1.DeleteOptions) error { return s.objectClient.Delete(name, options) } +func (s *roleClient) DeleteNamespace(name, namespace string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespace(name, namespace, options) +} + func (s *roleClient) List(opts metav1.ListOptions) (*RoleList, error) { obj, err := s.objectClient.List(opts) return obj.(*RoleList), err diff --git a/client/cluster/v3/zz_generated_namespace.go b/client/cluster/v3/zz_generated_namespace.go index db71d260..36365ce4 100644 --- a/client/cluster/v3/zz_generated_namespace.go +++ b/client/cluster/v3/zz_generated_namespace.go @@ -6,10 +6,10 @@ import ( const ( NamespaceType = "namespace" - NamespaceField = "creatorId" NamespaceFieldAnnotations = "annotations" NamespaceFieldAnswers = "answers" NamespaceFieldCreated = "created" + NamespaceFieldCreatorID = "creatorId" NamespaceFieldExternalID = "externalId" NamespaceFieldFinalizers = "finalizers" NamespaceFieldLabels = "labels" @@ -29,10 +29,10 @@ const ( type Namespace struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Answers map[string]interface{} `json:"answers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` ExternalID string `json:"externalId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/cluster/v3/zz_generated_node.go b/client/cluster/v3/zz_generated_node.go index aefddfe7..60bbb4f8 100644 --- a/client/cluster/v3/zz_generated_node.go +++ b/client/cluster/v3/zz_generated_node.go @@ -6,13 +6,11 @@ import ( const ( NodeType = "node" - NodeField = "creatorId" NodeFieldAllocatable = "allocatable" NodeFieldAnnotations = "annotations" NodeFieldCapacity = "capacity" - NodeFieldConfigSource = "configSource" NodeFieldCreated = "created" - NodeFieldExternalId = "externalId" + NodeFieldCreatorID = "creatorId" NodeFieldFinalizers = "finalizers" NodeFieldHostname = "hostname" NodeFieldIPAddress = "ipAddress" @@ -20,9 +18,8 @@ const ( NodeFieldLabels = "labels" NodeFieldName = "name" NodeFieldOwnerReferences = "ownerReferences" - NodeFieldPhase = "phase" - NodeFieldPodCIDR = "podCIDR" - NodeFieldProviderID = "providerID" + NodeFieldPodCidr = "podCidr" + NodeFieldProviderId = "providerId" NodeFieldRemoved = "removed" NodeFieldState = "state" NodeFieldTaints = "taints" @@ -36,13 +33,11 @@ const ( type Node struct { types.Resource - string `json:"creatorId,omitempty"` Allocatable map[string]string `json:"allocatable,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Capacity map[string]string `json:"capacity,omitempty"` - ConfigSource *NodeConfigSource `json:"configSource,omitempty"` Created string `json:"created,omitempty"` - ExternalId string `json:"externalId,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` @@ -50,9 +45,8 @@ type Node struct { Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` - Phase string `json:"phase,omitempty"` - PodCIDR string `json:"podCIDR,omitempty"` - ProviderID string `json:"providerID,omitempty"` + PodCidr string `json:"podCidr,omitempty"` + ProviderId string `json:"providerId,omitempty"` Removed string `json:"removed,omitempty"` State string `json:"state,omitempty"` Taints []Taint `json:"taints,omitempty"` diff --git a/client/cluster/v3/zz_generated_node_spec.go b/client/cluster/v3/zz_generated_node_spec.go index c032b311..60fc355e 100644 --- a/client/cluster/v3/zz_generated_node_spec.go +++ b/client/cluster/v3/zz_generated_node_spec.go @@ -2,19 +2,15 @@ package client const ( NodeSpecType = "nodeSpec" - NodeSpecFieldConfigSource = "configSource" - NodeSpecFieldExternalId = "externalId" - NodeSpecFieldPodCIDR = "podCIDR" - NodeSpecFieldProviderID = "providerID" + NodeSpecFieldPodCidr = "podCidr" + NodeSpecFieldProviderId = "providerId" NodeSpecFieldTaints = "taints" NodeSpecFieldUnschedulable = "unschedulable" ) type NodeSpec struct { - ConfigSource *NodeConfigSource `json:"configSource,omitempty"` - ExternalId string `json:"externalId,omitempty"` - PodCIDR string `json:"podCIDR,omitempty"` - ProviderID string `json:"providerID,omitempty"` - Taints []Taint `json:"taints,omitempty"` - Unschedulable *bool `json:"unschedulable,omitempty"` + PodCidr string `json:"podCidr,omitempty"` + ProviderId string `json:"providerId,omitempty"` + Taints []Taint `json:"taints,omitempty"` + Unschedulable *bool `json:"unschedulable,omitempty"` } diff --git a/client/cluster/v3/zz_generated_node_status.go b/client/cluster/v3/zz_generated_node_status.go index fd6bb54f..e7e42d69 100644 --- a/client/cluster/v3/zz_generated_node_status.go +++ b/client/cluster/v3/zz_generated_node_status.go @@ -4,11 +4,9 @@ const ( NodeStatusType = "nodeStatus" NodeStatusFieldAllocatable = "allocatable" NodeStatusFieldCapacity = "capacity" - NodeStatusFieldConditions = "conditions" NodeStatusFieldHostname = "hostname" NodeStatusFieldIPAddress = "ipAddress" NodeStatusFieldInfo = "info" - NodeStatusFieldPhase = "phase" NodeStatusFieldVolumesAttached = "volumesAttached" NodeStatusFieldVolumesInUse = "volumesInUse" ) @@ -16,11 +14,9 @@ const ( type NodeStatus struct { Allocatable map[string]string `json:"allocatable,omitempty"` Capacity map[string]string `json:"capacity,omitempty"` - Conditions []NodeCondition `json:"conditions,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` Info *NodeInfo `json:"info,omitempty"` - Phase string `json:"phase,omitempty"` VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` VolumesInUse []string `json:"volumesInUse,omitempty"` } diff --git a/client/cluster/v3/zz_generated_persistent_volume.go b/client/cluster/v3/zz_generated_persistent_volume.go index 98f71726..397e77af 100644 --- a/client/cluster/v3/zz_generated_persistent_volume.go +++ b/client/cluster/v3/zz_generated_persistent_volume.go @@ -6,7 +6,6 @@ import ( const ( PersistentVolumeType = "persistentVolume" - PersistentVolumeField = "creatorId" PersistentVolumeFieldAWSElasticBlockStore = "awsElasticBlockStore" PersistentVolumeFieldAccessModes = "accessModes" PersistentVolumeFieldAnnotations = "annotations" @@ -17,6 +16,7 @@ const ( PersistentVolumeFieldCinder = "cinder" PersistentVolumeFieldClaimRef = "claimRef" PersistentVolumeFieldCreated = "created" + PersistentVolumeFieldCreatorID = "creatorId" PersistentVolumeFieldFC = "fc" PersistentVolumeFieldFinalizers = "finalizers" PersistentVolumeFieldFlexVolume = "flexVolume" @@ -50,7 +50,6 @@ const ( type PersistentVolume struct { types.Resource - string `json:"creatorId,omitempty"` AWSElasticBlockStore *AWSElasticBlockStoreVolumeSource `json:"awsElasticBlockStore,omitempty"` AccessModes []string `json:"accessModes,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` @@ -61,6 +60,7 @@ type PersistentVolume struct { Cinder *CinderVolumeSource `json:"cinder,omitempty"` ClaimRef *ObjectReference `json:"claimRef,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` FC *FCVolumeSource `json:"fc,omitempty"` Finalizers []string `json:"finalizers,omitempty"` FlexVolume *FlexVolumeSource `json:"flexVolume,omitempty"` diff --git a/client/management/v3/zz_generated_catalog.go b/client/management/v3/zz_generated_catalog.go index 1293796d..06f2ab6f 100644 --- a/client/management/v3/zz_generated_catalog.go +++ b/client/management/v3/zz_generated_catalog.go @@ -6,11 +6,11 @@ import ( const ( CatalogType = "catalog" - CatalogField = "creatorId" CatalogFieldAnnotations = "annotations" CatalogFieldBranch = "branch" CatalogFieldCatalogKind = "catalogKind" CatalogFieldCreated = "created" + CatalogFieldCreatorID = "creatorId" CatalogFieldFinalizers = "finalizers" CatalogFieldLabels = "labels" CatalogFieldName = "name" @@ -26,11 +26,11 @@ const ( type Catalog struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Branch string `json:"branch,omitempty"` CatalogKind string `json:"catalogKind,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/management/v3/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go index 66c03938..026c25f2 100644 --- a/client/management/v3/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -6,7 +6,6 @@ import ( const ( ClusterType = "cluster" - ClusterField = "creatorId" ClusterFieldAPIEndpoint = "apiEndpoint" ClusterFieldAllocatable = "allocatable" ClusterFieldAnnotations = "annotations" @@ -16,6 +15,7 @@ const ( ClusterFieldComponentStatuses = "componentStatuses" ClusterFieldConditions = "conditions" ClusterFieldCreated = "created" + ClusterFieldCreatorID = "creatorId" ClusterFieldDefaultClusterRoleForProjectMembers = "defaultClusterRoleForProjectMembers" ClusterFieldDefaultPodSecurityPolicyTemplateId = "defaultPodSecurityPolicyTemplateId" ClusterFieldDescription = "description" @@ -38,7 +38,6 @@ const ( type Cluster struct { types.Resource - string `json:"creatorId,omitempty"` APIEndpoint string `json:"apiEndpoint,omitempty"` Allocatable map[string]string `json:"allocatable,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` @@ -48,6 +47,7 @@ type Cluster struct { ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty"` Conditions []ClusterCondition `json:"conditions,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty"` DefaultPodSecurityPolicyTemplateId string `json:"defaultPodSecurityPolicyTemplateId,omitempty"` Description string `json:"description,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_event.go b/client/management/v3/zz_generated_cluster_event.go index 55551187..a66e3df0 100644 --- a/client/management/v3/zz_generated_cluster_event.go +++ b/client/management/v3/zz_generated_cluster_event.go @@ -6,11 +6,11 @@ import ( const ( ClusterEventType = "clusterEvent" - ClusterEventField = "creatorId" ClusterEventFieldAnnotations = "annotations" ClusterEventFieldClusterId = "clusterId" ClusterEventFieldCount = "count" ClusterEventFieldCreated = "created" + ClusterEventFieldCreatorID = "creatorId" ClusterEventFieldEventType = "eventType" ClusterEventFieldFinalizers = "finalizers" ClusterEventFieldFirstTimestamp = "firstTimestamp" @@ -28,11 +28,11 @@ const ( type ClusterEvent struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` ClusterId string `json:"clusterId,omitempty"` Count *int64 `json:"count,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` EventType string `json:"eventType,omitempty"` Finalizers []string `json:"finalizers,omitempty"` FirstTimestamp string `json:"firstTimestamp,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_registration_token.go b/client/management/v3/zz_generated_cluster_registration_token.go index 847ae500..d068a7dc 100644 --- a/client/management/v3/zz_generated_cluster_registration_token.go +++ b/client/management/v3/zz_generated_cluster_registration_token.go @@ -6,9 +6,9 @@ import ( const ( ClusterRegistrationTokenType = "clusterRegistrationToken" - ClusterRegistrationTokenField = "creatorId" ClusterRegistrationTokenFieldAnnotations = "annotations" ClusterRegistrationTokenFieldCreated = "created" + ClusterRegistrationTokenFieldCreatorID = "creatorId" ClusterRegistrationTokenFieldFinalizers = "finalizers" ClusterRegistrationTokenFieldLabels = "labels" ClusterRegistrationTokenFieldName = "name" @@ -23,9 +23,9 @@ const ( type ClusterRegistrationToken struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_role_template_binding.go b/client/management/v3/zz_generated_cluster_role_template_binding.go index 371327a4..ed0f2951 100644 --- a/client/management/v3/zz_generated_cluster_role_template_binding.go +++ b/client/management/v3/zz_generated_cluster_role_template_binding.go @@ -6,10 +6,10 @@ import ( const ( ClusterRoleTemplateBindingType = "clusterRoleTemplateBinding" - ClusterRoleTemplateBindingField = "creatorId" ClusterRoleTemplateBindingFieldAnnotations = "annotations" ClusterRoleTemplateBindingFieldClusterId = "clusterId" ClusterRoleTemplateBindingFieldCreated = "created" + ClusterRoleTemplateBindingFieldCreatorID = "creatorId" ClusterRoleTemplateBindingFieldFinalizers = "finalizers" ClusterRoleTemplateBindingFieldLabels = "labels" ClusterRoleTemplateBindingFieldName = "name" @@ -25,10 +25,10 @@ const ( type ClusterRoleTemplateBinding struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` ClusterId string `json:"clusterId,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/management/v3/zz_generated_dynamic_schema.go b/client/management/v3/zz_generated_dynamic_schema.go index fad392c1..2c8e5313 100644 --- a/client/management/v3/zz_generated_dynamic_schema.go +++ b/client/management/v3/zz_generated_dynamic_schema.go @@ -6,13 +6,13 @@ import ( const ( DynamicSchemaType = "dynamicSchema" - DynamicSchemaField = "creatorId" DynamicSchemaFieldAnnotations = "annotations" DynamicSchemaFieldCollectionActions = "collectionActions" DynamicSchemaFieldCollectionFields = "collectionFields" DynamicSchemaFieldCollectionFilters = "collectionFilters" DynamicSchemaFieldCollectionMethods = "collectionMethods" DynamicSchemaFieldCreated = "created" + DynamicSchemaFieldCreatorID = "creatorId" DynamicSchemaFieldEmbed = "embed" DynamicSchemaFieldEmbedType = "embedType" DynamicSchemaFieldFinalizers = "finalizers" @@ -34,13 +34,13 @@ const ( type DynamicSchema struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` CollectionActions map[string]Action `json:"collectionActions,omitempty"` CollectionFields map[string]Field `json:"collectionFields,omitempty"` CollectionFilters map[string]Filter `json:"collectionFilters,omitempty"` CollectionMethods []string `json:"collectionMethods,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Embed *bool `json:"embed,omitempty"` EmbedType string `json:"embedType,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/management/v3/zz_generated_global_role.go b/client/management/v3/zz_generated_global_role.go index 9a1cb480..605e5ae5 100644 --- a/client/management/v3/zz_generated_global_role.go +++ b/client/management/v3/zz_generated_global_role.go @@ -6,10 +6,10 @@ import ( const ( GlobalRoleType = "globalRole" - GlobalRoleField = "creatorId" GlobalRoleFieldAnnotations = "annotations" GlobalRoleFieldBuiltin = "builtin" GlobalRoleFieldCreated = "created" + GlobalRoleFieldCreatorID = "creatorId" GlobalRoleFieldFinalizers = "finalizers" GlobalRoleFieldId = "id" GlobalRoleFieldLabels = "labels" @@ -22,10 +22,10 @@ const ( type GlobalRole struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Builtin *bool `json:"builtin,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Id string `json:"id,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/management/v3/zz_generated_global_role_binding.go b/client/management/v3/zz_generated_global_role_binding.go index b023ff4d..c26f2f19 100644 --- a/client/management/v3/zz_generated_global_role_binding.go +++ b/client/management/v3/zz_generated_global_role_binding.go @@ -6,9 +6,9 @@ import ( const ( GlobalRoleBindingType = "globalRoleBinding" - GlobalRoleBindingField = "creatorId" GlobalRoleBindingFieldAnnotations = "annotations" GlobalRoleBindingFieldCreated = "created" + GlobalRoleBindingFieldCreatorID = "creatorId" GlobalRoleBindingFieldFinalizers = "finalizers" GlobalRoleBindingFieldGlobalRoleId = "globalRoleId" GlobalRoleBindingFieldLabels = "labels" @@ -22,9 +22,9 @@ const ( type GlobalRoleBinding struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` GlobalRoleId string `json:"globalRoleId,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/management/v3/zz_generated_group.go b/client/management/v3/zz_generated_group.go index 20653551..1ac34341 100644 --- a/client/management/v3/zz_generated_group.go +++ b/client/management/v3/zz_generated_group.go @@ -6,9 +6,9 @@ import ( const ( GroupType = "group" - GroupField = "creatorId" GroupFieldAnnotations = "annotations" GroupFieldCreated = "created" + GroupFieldCreatorID = "creatorId" GroupFieldFinalizers = "finalizers" GroupFieldId = "id" GroupFieldLabels = "labels" @@ -20,9 +20,9 @@ const ( type Group struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Id string `json:"id,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/management/v3/zz_generated_group_member.go b/client/management/v3/zz_generated_group_member.go index 5f52b98d..5f5496d2 100644 --- a/client/management/v3/zz_generated_group_member.go +++ b/client/management/v3/zz_generated_group_member.go @@ -6,9 +6,9 @@ import ( const ( GroupMemberType = "groupMember" - GroupMemberField = "creatorId" GroupMemberFieldAnnotations = "annotations" GroupMemberFieldCreated = "created" + GroupMemberFieldCreatorID = "creatorId" GroupMemberFieldFinalizers = "finalizers" GroupMemberFieldGroupId = "groupId" GroupMemberFieldLabels = "labels" @@ -21,9 +21,9 @@ const ( type GroupMember struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` GroupId string `json:"groupId,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/management/v3/zz_generated_machine.go b/client/management/v3/zz_generated_machine.go index 239ffcab..0ab25afb 100644 --- a/client/management/v3/zz_generated_machine.go +++ b/client/management/v3/zz_generated_machine.go @@ -6,16 +6,13 @@ import ( const ( MachineType = "machine" - MachineField = "creatorId" MachineFieldAllocatable = "allocatable" MachineFieldAnnotations = "annotations" MachineFieldCapacity = "capacity" MachineFieldClusterId = "clusterId" - MachineFieldConditions = "conditions" - MachineFieldConfigSource = "configSource" MachineFieldCreated = "created" + MachineFieldCreatorID = "creatorId" MachineFieldDescription = "description" - MachineFieldExternalId = "externalId" MachineFieldFinalizers = "finalizers" MachineFieldHostname = "hostname" MachineFieldIPAddress = "ipAddress" @@ -23,18 +20,17 @@ const ( MachineFieldInfo = "info" MachineFieldLabels = "labels" MachineFieldLimits = "limits" - MachineFieldMachineDriverConfig = "machineDriverConfig" MachineFieldMachineTemplateId = "machineTemplateId" - MachineFieldMachineTemplateSpec = "machineTemplateSpec" MachineFieldName = "name" - MachineFieldNodeConfig = "rkeNode" + MachineFieldNodeName = "nodeName" MachineFieldOwnerReferences = "ownerReferences" - MachineFieldPhase = "phase" - MachineFieldPodCIDR = "podCIDR" - MachineFieldProviderID = "providerID" + MachineFieldPodCidr = "podCidr" + MachineFieldProviderId = "providerId" MachineFieldRemoved = "removed" MachineFieldRequested = "requested" - MachineFieldRoles = "roles" + MachineFieldRequestedClusterId = "requestedClusterId" + MachineFieldRequestedHostname = "requestedHostname" + MachineFieldRequestedRoles = "requestedRoles" MachineFieldSSHUser = "sshUser" MachineFieldState = "state" MachineFieldTaints = "taints" @@ -48,16 +44,13 @@ const ( type Machine struct { types.Resource - string `json:"creatorId,omitempty"` Allocatable map[string]string `json:"allocatable,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Capacity map[string]string `json:"capacity,omitempty"` ClusterId string `json:"clusterId,omitempty"` - Conditions []NodeCondition `json:"conditions,omitempty"` - ConfigSource *NodeConfigSource `json:"configSource,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Description string `json:"description,omitempty"` - ExternalId string `json:"externalId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` @@ -65,18 +58,17 @@ type Machine struct { Info *NodeInfo `json:"info,omitempty"` Labels map[string]string `json:"labels,omitempty"` Limits map[string]string `json:"limits,omitempty"` - MachineDriverConfig string `json:"machineDriverConfig,omitempty"` MachineTemplateId string `json:"machineTemplateId,omitempty"` - MachineTemplateSpec *MachineTemplateSpec `json:"machineTemplateSpec,omitempty"` Name string `json:"name,omitempty"` - NodeConfig *RKEConfigNode `json:"rkeNode,omitempty"` + NodeName string `json:"nodeName,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` - Phase string `json:"phase,omitempty"` - PodCIDR string `json:"podCIDR,omitempty"` - ProviderID string `json:"providerID,omitempty"` + PodCidr string `json:"podCidr,omitempty"` + ProviderId string `json:"providerId,omitempty"` Removed string `json:"removed,omitempty"` Requested map[string]string `json:"requested,omitempty"` - Roles []string `json:"roles,omitempty"` + RequestedClusterId string `json:"requestedClusterId,omitempty"` + RequestedHostname string `json:"requestedHostname,omitempty"` + RequestedRoles []string `json:"requestedRoles,omitempty"` SSHUser string `json:"sshUser,omitempty"` State string `json:"state,omitempty"` Taints []Taint `json:"taints,omitempty"` diff --git a/client/management/v3/zz_generated_machine_driver.go b/client/management/v3/zz_generated_machine_driver.go index 3e090642..c589e878 100644 --- a/client/management/v3/zz_generated_machine_driver.go +++ b/client/management/v3/zz_generated_machine_driver.go @@ -6,12 +6,12 @@ import ( const ( MachineDriverType = "machineDriver" - MachineDriverField = "creatorId" MachineDriverFieldActive = "active" MachineDriverFieldAnnotations = "annotations" MachineDriverFieldBuiltin = "builtin" MachineDriverFieldChecksum = "checksum" MachineDriverFieldCreated = "created" + MachineDriverFieldCreatorID = "creatorId" MachineDriverFieldDescription = "description" MachineDriverFieldExternalID = "externalId" MachineDriverFieldFinalizers = "finalizers" @@ -30,12 +30,12 @@ const ( type MachineDriver struct { types.Resource - string `json:"creatorId,omitempty"` Active *bool `json:"active,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Builtin *bool `json:"builtin,omitempty"` Checksum string `json:"checksum,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Description string `json:"description,omitempty"` ExternalID string `json:"externalId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/management/v3/zz_generated_machine_spec.go b/client/management/v3/zz_generated_machine_spec.go index 6f445f31..d27f5c4e 100644 --- a/client/management/v3/zz_generated_machine_spec.go +++ b/client/management/v3/zz_generated_machine_spec.go @@ -1,28 +1,28 @@ package client const ( - MachineSpecType = "machineSpec" - MachineSpecFieldClusterId = "clusterId" - MachineSpecFieldConfigSource = "configSource" - MachineSpecFieldDescription = "description" - MachineSpecFieldExternalId = "externalId" - MachineSpecFieldMachineTemplateId = "machineTemplateId" - MachineSpecFieldPodCIDR = "podCIDR" - MachineSpecFieldProviderID = "providerID" - MachineSpecFieldRoles = "roles" - MachineSpecFieldTaints = "taints" - MachineSpecFieldUnschedulable = "unschedulable" + MachineSpecType = "machineSpec" + MachineSpecFieldDescription = "description" + MachineSpecFieldDisplayName = "displayName" + MachineSpecFieldMachineTemplateId = "machineTemplateId" + MachineSpecFieldPodCidr = "podCidr" + MachineSpecFieldProviderId = "providerId" + MachineSpecFieldRequestedClusterId = "requestedClusterId" + MachineSpecFieldRequestedHostname = "requestedHostname" + MachineSpecFieldRequestedRoles = "requestedRoles" + MachineSpecFieldTaints = "taints" + MachineSpecFieldUnschedulable = "unschedulable" ) type MachineSpec struct { - ClusterId string `json:"clusterId,omitempty"` - ConfigSource *NodeConfigSource `json:"configSource,omitempty"` - Description string `json:"description,omitempty"` - ExternalId string `json:"externalId,omitempty"` - MachineTemplateId string `json:"machineTemplateId,omitempty"` - PodCIDR string `json:"podCIDR,omitempty"` - ProviderID string `json:"providerID,omitempty"` - Roles []string `json:"roles,omitempty"` - Taints []Taint `json:"taints,omitempty"` - Unschedulable *bool `json:"unschedulable,omitempty"` + Description string `json:"description,omitempty"` + DisplayName string `json:"displayName,omitempty"` + MachineTemplateId string `json:"machineTemplateId,omitempty"` + PodCidr string `json:"podCidr,omitempty"` + ProviderId string `json:"providerId,omitempty"` + RequestedClusterId string `json:"requestedClusterId,omitempty"` + RequestedHostname string `json:"requestedHostname,omitempty"` + RequestedRoles []string `json:"requestedRoles,omitempty"` + Taints []Taint `json:"taints,omitempty"` + Unschedulable *bool `json:"unschedulable,omitempty"` } diff --git a/client/management/v3/zz_generated_machine_status.go b/client/management/v3/zz_generated_machine_status.go index 4394cef0..7bc31137 100644 --- a/client/management/v3/zz_generated_machine_status.go +++ b/client/management/v3/zz_generated_machine_status.go @@ -1,40 +1,32 @@ package client const ( - MachineStatusType = "machineStatus" - MachineStatusFieldAllocatable = "allocatable" - MachineStatusFieldCapacity = "capacity" - MachineStatusFieldConditions = "conditions" - MachineStatusFieldHostname = "hostname" - MachineStatusFieldIPAddress = "ipAddress" - MachineStatusFieldInfo = "info" - MachineStatusFieldLimits = "limits" - MachineStatusFieldMachineDriverConfig = "machineDriverConfig" - MachineStatusFieldMachineTemplateSpec = "machineTemplateSpec" - MachineStatusFieldNodeConfig = "rkeNode" - MachineStatusFieldNodeName = "nodeName" - MachineStatusFieldPhase = "phase" - MachineStatusFieldRequested = "requested" - MachineStatusFieldSSHUser = "sshUser" - MachineStatusFieldVolumesAttached = "volumesAttached" - MachineStatusFieldVolumesInUse = "volumesInUse" + MachineStatusType = "machineStatus" + MachineStatusFieldAllocatable = "allocatable" + MachineStatusFieldCapacity = "capacity" + MachineStatusFieldClusterId = "clusterId" + MachineStatusFieldHostname = "hostname" + MachineStatusFieldIPAddress = "ipAddress" + MachineStatusFieldInfo = "info" + MachineStatusFieldLimits = "limits" + MachineStatusFieldNodeName = "nodeName" + MachineStatusFieldRequested = "requested" + MachineStatusFieldSSHUser = "sshUser" + MachineStatusFieldVolumesAttached = "volumesAttached" + MachineStatusFieldVolumesInUse = "volumesInUse" ) type MachineStatus struct { - Allocatable map[string]string `json:"allocatable,omitempty"` - Capacity map[string]string `json:"capacity,omitempty"` - Conditions []NodeCondition `json:"conditions,omitempty"` - Hostname string `json:"hostname,omitempty"` - IPAddress string `json:"ipAddress,omitempty"` - Info *NodeInfo `json:"info,omitempty"` - Limits map[string]string `json:"limits,omitempty"` - MachineDriverConfig string `json:"machineDriverConfig,omitempty"` - MachineTemplateSpec *MachineTemplateSpec `json:"machineTemplateSpec,omitempty"` - NodeConfig *RKEConfigNode `json:"rkeNode,omitempty"` - NodeName string `json:"nodeName,omitempty"` - Phase string `json:"phase,omitempty"` - Requested map[string]string `json:"requested,omitempty"` - SSHUser string `json:"sshUser,omitempty"` - VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` - VolumesInUse []string `json:"volumesInUse,omitempty"` + Allocatable map[string]string `json:"allocatable,omitempty"` + Capacity map[string]string `json:"capacity,omitempty"` + ClusterId string `json:"clusterId,omitempty"` + Hostname string `json:"hostname,omitempty"` + IPAddress string `json:"ipAddress,omitempty"` + Info *NodeInfo `json:"info,omitempty"` + Limits map[string]string `json:"limits,omitempty"` + NodeName string `json:"nodeName,omitempty"` + Requested map[string]string `json:"requested,omitempty"` + SSHUser string `json:"sshUser,omitempty"` + VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` + VolumesInUse []string `json:"volumesInUse,omitempty"` } diff --git a/client/management/v3/zz_generated_machine_template.go b/client/management/v3/zz_generated_machine_template.go index 02433c64..b0dd9469 100644 --- a/client/management/v3/zz_generated_machine_template.go +++ b/client/management/v3/zz_generated_machine_template.go @@ -6,11 +6,11 @@ import ( const ( MachineTemplateType = "machineTemplate" - MachineTemplateField = "creatorId" MachineTemplateFieldAnnotations = "annotations" MachineTemplateFieldAuthCertificateAuthority = "authCertificateAuthority" MachineTemplateFieldAuthKey = "authKey" MachineTemplateFieldCreated = "created" + MachineTemplateFieldCreatorID = "creatorId" MachineTemplateFieldDescription = "description" MachineTemplateFieldDockerVersion = "dockerVersion" MachineTemplateFieldDriver = "driver" @@ -36,11 +36,11 @@ const ( type MachineTemplate struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AuthCertificateAuthority string `json:"authCertificateAuthority,omitempty"` AuthKey string `json:"authKey,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Description string `json:"description,omitempty"` DockerVersion string `json:"dockerVersion,omitempty"` Driver string `json:"driver,omitempty"` diff --git a/client/management/v3/zz_generated_node.go b/client/management/v3/zz_generated_node.go index aefddfe7..60bbb4f8 100644 --- a/client/management/v3/zz_generated_node.go +++ b/client/management/v3/zz_generated_node.go @@ -6,13 +6,11 @@ import ( const ( NodeType = "node" - NodeField = "creatorId" NodeFieldAllocatable = "allocatable" NodeFieldAnnotations = "annotations" NodeFieldCapacity = "capacity" - NodeFieldConfigSource = "configSource" NodeFieldCreated = "created" - NodeFieldExternalId = "externalId" + NodeFieldCreatorID = "creatorId" NodeFieldFinalizers = "finalizers" NodeFieldHostname = "hostname" NodeFieldIPAddress = "ipAddress" @@ -20,9 +18,8 @@ const ( NodeFieldLabels = "labels" NodeFieldName = "name" NodeFieldOwnerReferences = "ownerReferences" - NodeFieldPhase = "phase" - NodeFieldPodCIDR = "podCIDR" - NodeFieldProviderID = "providerID" + NodeFieldPodCidr = "podCidr" + NodeFieldProviderId = "providerId" NodeFieldRemoved = "removed" NodeFieldState = "state" NodeFieldTaints = "taints" @@ -36,13 +33,11 @@ const ( type Node struct { types.Resource - string `json:"creatorId,omitempty"` Allocatable map[string]string `json:"allocatable,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Capacity map[string]string `json:"capacity,omitempty"` - ConfigSource *NodeConfigSource `json:"configSource,omitempty"` Created string `json:"created,omitempty"` - ExternalId string `json:"externalId,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` @@ -50,9 +45,8 @@ type Node struct { Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` - Phase string `json:"phase,omitempty"` - PodCIDR string `json:"podCIDR,omitempty"` - ProviderID string `json:"providerID,omitempty"` + PodCidr string `json:"podCidr,omitempty"` + ProviderId string `json:"providerId,omitempty"` Removed string `json:"removed,omitempty"` State string `json:"state,omitempty"` Taints []Taint `json:"taints,omitempty"` diff --git a/client/management/v3/zz_generated_node_spec.go b/client/management/v3/zz_generated_node_spec.go index c032b311..60fc355e 100644 --- a/client/management/v3/zz_generated_node_spec.go +++ b/client/management/v3/zz_generated_node_spec.go @@ -2,19 +2,15 @@ package client const ( NodeSpecType = "nodeSpec" - NodeSpecFieldConfigSource = "configSource" - NodeSpecFieldExternalId = "externalId" - NodeSpecFieldPodCIDR = "podCIDR" - NodeSpecFieldProviderID = "providerID" + NodeSpecFieldPodCidr = "podCidr" + NodeSpecFieldProviderId = "providerId" NodeSpecFieldTaints = "taints" NodeSpecFieldUnschedulable = "unschedulable" ) type NodeSpec struct { - ConfigSource *NodeConfigSource `json:"configSource,omitempty"` - ExternalId string `json:"externalId,omitempty"` - PodCIDR string `json:"podCIDR,omitempty"` - ProviderID string `json:"providerID,omitempty"` - Taints []Taint `json:"taints,omitempty"` - Unschedulable *bool `json:"unschedulable,omitempty"` + PodCidr string `json:"podCidr,omitempty"` + ProviderId string `json:"providerId,omitempty"` + Taints []Taint `json:"taints,omitempty"` + Unschedulable *bool `json:"unschedulable,omitempty"` } diff --git a/client/management/v3/zz_generated_node_status.go b/client/management/v3/zz_generated_node_status.go index fd6bb54f..e7e42d69 100644 --- a/client/management/v3/zz_generated_node_status.go +++ b/client/management/v3/zz_generated_node_status.go @@ -4,11 +4,9 @@ const ( NodeStatusType = "nodeStatus" NodeStatusFieldAllocatable = "allocatable" NodeStatusFieldCapacity = "capacity" - NodeStatusFieldConditions = "conditions" NodeStatusFieldHostname = "hostname" NodeStatusFieldIPAddress = "ipAddress" NodeStatusFieldInfo = "info" - NodeStatusFieldPhase = "phase" NodeStatusFieldVolumesAttached = "volumesAttached" NodeStatusFieldVolumesInUse = "volumesInUse" ) @@ -16,11 +14,9 @@ const ( type NodeStatus struct { Allocatable map[string]string `json:"allocatable,omitempty"` Capacity map[string]string `json:"capacity,omitempty"` - Conditions []NodeCondition `json:"conditions,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` Info *NodeInfo `json:"info,omitempty"` - Phase string `json:"phase,omitempty"` VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` VolumesInUse []string `json:"volumesInUse,omitempty"` } diff --git a/client/management/v3/zz_generated_pod_security_policy_template.go b/client/management/v3/zz_generated_pod_security_policy_template.go index deefc777..584bd487 100644 --- a/client/management/v3/zz_generated_pod_security_policy_template.go +++ b/client/management/v3/zz_generated_pod_security_policy_template.go @@ -6,12 +6,12 @@ import ( const ( PodSecurityPolicyTemplateType = "podSecurityPolicyTemplate" - PodSecurityPolicyTemplateField = "creatorId" PodSecurityPolicyTemplateFieldAllowPrivilegeEscalation = "allowPrivilegeEscalation" PodSecurityPolicyTemplateFieldAllowedCapabilities = "allowedCapabilities" PodSecurityPolicyTemplateFieldAllowedHostPaths = "allowedHostPaths" PodSecurityPolicyTemplateFieldAnnotations = "annotations" PodSecurityPolicyTemplateFieldCreated = "created" + PodSecurityPolicyTemplateFieldCreatorID = "creatorId" PodSecurityPolicyTemplateFieldDefaultAddCapabilities = "defaultAddCapabilities" PodSecurityPolicyTemplateFieldDefaultAllowPrivilegeEscalation = "defaultAllowPrivilegeEscalation" PodSecurityPolicyTemplateFieldFSGroup = "fsGroup" @@ -36,12 +36,12 @@ const ( type PodSecurityPolicyTemplate struct { types.Resource - string `json:"creatorId,omitempty"` AllowPrivilegeEscalation *bool `json:"allowPrivilegeEscalation,omitempty"` AllowedCapabilities []string `json:"allowedCapabilities,omitempty"` AllowedHostPaths []AllowedHostPath `json:"allowedHostPaths,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DefaultAddCapabilities []string `json:"defaultAddCapabilities,omitempty"` DefaultAllowPrivilegeEscalation *bool `json:"defaultAllowPrivilegeEscalation,omitempty"` FSGroup *FSGroupStrategyOptions `json:"fsGroup,omitempty"` diff --git a/client/management/v3/zz_generated_principal.go b/client/management/v3/zz_generated_principal.go index 34e7735f..4d040f46 100644 --- a/client/management/v3/zz_generated_principal.go +++ b/client/management/v3/zz_generated_principal.go @@ -6,9 +6,9 @@ import ( const ( PrincipalType = "principal" - PrincipalField = "creatorId" PrincipalFieldAnnotations = "annotations" PrincipalFieldCreated = "created" + PrincipalFieldCreatorID = "creatorId" PrincipalFieldDisplayName = "displayName" PrincipalFieldExtraInfo = "extraInfo" PrincipalFieldFinalizers = "finalizers" @@ -26,9 +26,9 @@ const ( type Principal struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DisplayName string `json:"displayName,omitempty"` ExtraInfo map[string]string `json:"extraInfo,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/management/v3/zz_generated_project.go b/client/management/v3/zz_generated_project.go index dbd3692a..d0ff7ac6 100644 --- a/client/management/v3/zz_generated_project.go +++ b/client/management/v3/zz_generated_project.go @@ -6,11 +6,11 @@ import ( const ( ProjectType = "project" - ProjectField = "creatorId" ProjectFieldAnnotations = "annotations" ProjectFieldClusterId = "clusterId" ProjectFieldConditions = "conditions" ProjectFieldCreated = "created" + ProjectFieldCreatorID = "creatorId" ProjectFieldFinalizers = "finalizers" ProjectFieldId = "id" ProjectFieldLabels = "labels" @@ -26,11 +26,11 @@ const ( type Project struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` ClusterId string `json:"clusterId,omitempty"` Conditions []ProjectCondition `json:"conditions,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Id string `json:"id,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/management/v3/zz_generated_project_role_template_binding.go b/client/management/v3/zz_generated_project_role_template_binding.go index 3a5ad9a5..779c0c4f 100644 --- a/client/management/v3/zz_generated_project_role_template_binding.go +++ b/client/management/v3/zz_generated_project_role_template_binding.go @@ -6,9 +6,9 @@ import ( const ( ProjectRoleTemplateBindingType = "projectRoleTemplateBinding" - ProjectRoleTemplateBindingField = "creatorId" ProjectRoleTemplateBindingFieldAnnotations = "annotations" ProjectRoleTemplateBindingFieldCreated = "created" + ProjectRoleTemplateBindingFieldCreatorID = "creatorId" ProjectRoleTemplateBindingFieldFinalizers = "finalizers" ProjectRoleTemplateBindingFieldLabels = "labels" ProjectRoleTemplateBindingFieldName = "name" @@ -25,9 +25,9 @@ const ( type ProjectRoleTemplateBinding struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/management/v3/zz_generated_role_template.go b/client/management/v3/zz_generated_role_template.go index 44eb5cfb..61668943 100644 --- a/client/management/v3/zz_generated_role_template.go +++ b/client/management/v3/zz_generated_role_template.go @@ -6,10 +6,10 @@ import ( const ( RoleTemplateType = "roleTemplate" - RoleTemplateField = "creatorId" RoleTemplateFieldAnnotations = "annotations" RoleTemplateFieldBuiltin = "builtin" RoleTemplateFieldCreated = "created" + RoleTemplateFieldCreatorID = "creatorId" RoleTemplateFieldExternal = "external" RoleTemplateFieldFinalizers = "finalizers" RoleTemplateFieldHidden = "hidden" @@ -25,10 +25,10 @@ const ( type RoleTemplate struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Builtin *bool `json:"builtin,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` External *bool `json:"external,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Hidden *bool `json:"hidden,omitempty"` diff --git a/client/management/v3/zz_generated_template.go b/client/management/v3/zz_generated_template.go index bfd75aa7..0687635d 100644 --- a/client/management/v3/zz_generated_template.go +++ b/client/management/v3/zz_generated_template.go @@ -6,13 +6,13 @@ import ( const ( TemplateType = "template" - TemplateField = "creatorId" TemplateFieldAnnotations = "annotations" TemplateFieldBase = "templateBase" TemplateFieldCatalogID = "catalogId" TemplateFieldCategories = "categories" TemplateFieldCategory = "category" TemplateFieldCreated = "created" + TemplateFieldCreatorID = "creatorId" TemplateFieldDefaultTemplateVersionID = "defaultTemplateVersionId" TemplateFieldDefaultVersion = "defaultVersion" TemplateFieldDescription = "description" @@ -41,13 +41,13 @@ const ( type Template struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Base string `json:"templateBase,omitempty"` CatalogID string `json:"catalogId,omitempty"` Categories []string `json:"categories,omitempty"` Category string `json:"category,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DefaultTemplateVersionID string `json:"defaultTemplateVersionId,omitempty"` DefaultVersion string `json:"defaultVersion,omitempty"` Description string `json:"description,omitempty"` diff --git a/client/management/v3/zz_generated_template_version.go b/client/management/v3/zz_generated_template_version.go index 8e4d007d..692ffdbd 100644 --- a/client/management/v3/zz_generated_template_version.go +++ b/client/management/v3/zz_generated_template_version.go @@ -6,9 +6,9 @@ import ( const ( TemplateVersionType = "templateVersion" - TemplateVersionField = "creatorId" TemplateVersionFieldAnnotations = "annotations" TemplateVersionFieldCreated = "created" + TemplateVersionFieldCreatorID = "creatorId" TemplateVersionFieldExternalID = "externalId" TemplateVersionFieldFiles = "files" TemplateVersionFieldFinalizers = "finalizers" @@ -33,9 +33,9 @@ const ( type TemplateVersion struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` ExternalID string `json:"externalId,omitempty"` Files []File `json:"files,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/management/v3/zz_generated_token.go b/client/management/v3/zz_generated_token.go index f72ad3c0..d4f918cb 100644 --- a/client/management/v3/zz_generated_token.go +++ b/client/management/v3/zz_generated_token.go @@ -6,10 +6,10 @@ import ( const ( TokenType = "token" - TokenField = "creatorId" TokenFieldAnnotations = "annotations" TokenFieldAuthProvider = "authProvider" TokenFieldCreated = "created" + TokenFieldCreatorID = "creatorId" TokenFieldDescription = "description" TokenFieldFinalizers = "finalizers" TokenFieldGroupPrincipals = "groupPrincipals" @@ -28,10 +28,10 @@ const ( type Token struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AuthProvider string `json:"authProvider,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Description string `json:"description,omitempty"` Finalizers []string `json:"finalizers,omitempty"` GroupPrincipals []string `json:"groupPrincipals,omitempty"` diff --git a/client/management/v3/zz_generated_user.go b/client/management/v3/zz_generated_user.go index 9c3b453c..8fccacac 100644 --- a/client/management/v3/zz_generated_user.go +++ b/client/management/v3/zz_generated_user.go @@ -6,9 +6,9 @@ import ( const ( UserType = "user" - UserField = "creatorId" UserFieldAnnotations = "annotations" UserFieldCreated = "created" + UserFieldCreatorID = "creatorId" UserFieldFinalizers = "finalizers" UserFieldId = "id" UserFieldLabels = "labels" @@ -25,9 +25,9 @@ const ( type User struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Id string `json:"id,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/project/v3/zz_generated_basic_auth.go b/client/project/v3/zz_generated_basic_auth.go index dc4f60d6..45f1dbe4 100644 --- a/client/project/v3/zz_generated_basic_auth.go +++ b/client/project/v3/zz_generated_basic_auth.go @@ -6,9 +6,9 @@ import ( const ( BasicAuthType = "basicAuth" - BasicAuthField = "creatorId" BasicAuthFieldAnnotations = "annotations" BasicAuthFieldCreated = "created" + BasicAuthFieldCreatorID = "creatorId" BasicAuthFieldFinalizers = "finalizers" BasicAuthFieldLabels = "labels" BasicAuthFieldName = "name" @@ -23,9 +23,9 @@ const ( type BasicAuth struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/project/v3/zz_generated_certificate.go b/client/project/v3/zz_generated_certificate.go index 5bfde285..dc0025ed 100644 --- a/client/project/v3/zz_generated_certificate.go +++ b/client/project/v3/zz_generated_certificate.go @@ -6,13 +6,13 @@ import ( const ( CertificateType = "certificate" - CertificateField = "creatorId" CertificateFieldAlgorithm = "algorithm" CertificateFieldAnnotations = "annotations" CertificateFieldCN = "cn" CertificateFieldCertFingerprint = "certFingerprint" CertificateFieldCerts = "certs" CertificateFieldCreated = "created" + CertificateFieldCreatorID = "creatorId" CertificateFieldFinalizers = "finalizers" CertificateFieldIssuedAt = "issuedAt" CertificateFieldIssuer = "issuer" @@ -32,13 +32,13 @@ const ( type Certificate struct { types.Resource - string `json:"creatorId,omitempty"` Algorithm string `json:"algorithm,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` CN string `json:"cn,omitempty"` CertFingerprint string `json:"certFingerprint,omitempty"` Certs string `json:"certs,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` IssuedAt string `json:"issuedAt,omitempty"` Issuer string `json:"issuer,omitempty"` diff --git a/client/project/v3/zz_generated_client.go b/client/project/v3/zz_generated_client.go index 5b9aff86..317f43e7 100644 --- a/client/project/v3/zz_generated_client.go +++ b/client/project/v3/zz_generated_client.go @@ -23,7 +23,7 @@ type Client struct { NamespacedBasicAuth NamespacedBasicAuthOperations NamespacedSSHAuth NamespacedSSHAuthOperations Service ServiceOperations - Endpoint EndpointOperations + DNSRecord DNSRecordOperations Pod PodOperations Deployment DeploymentOperations StatefulSet StatefulSetOperations @@ -59,7 +59,7 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) { client.NamespacedBasicAuth = newNamespacedBasicAuthClient(client) client.NamespacedSSHAuth = newNamespacedSSHAuthClient(client) client.Service = newServiceClient(client) - client.Endpoint = newEndpointClient(client) + client.DNSRecord = newDNSRecordClient(client) client.Pod = newPodClient(client) client.Deployment = newDeploymentClient(client) client.StatefulSet = newStatefulSetClient(client) diff --git a/client/project/v3/zz_generated_daemon_set.go b/client/project/v3/zz_generated_daemon_set.go index 3a7dd34d..3854a42e 100644 --- a/client/project/v3/zz_generated_daemon_set.go +++ b/client/project/v3/zz_generated_daemon_set.go @@ -6,13 +6,13 @@ import ( const ( DaemonSetType = "daemonSet" - DaemonSetField = "creatorId" DaemonSetFieldActiveDeadlineSeconds = "activeDeadlineSeconds" DaemonSetFieldAnnotations = "annotations" DaemonSetFieldAutomountServiceAccountToken = "automountServiceAccountToken" DaemonSetFieldBatchSize = "batchSize" DaemonSetFieldContainers = "containers" DaemonSetFieldCreated = "created" + DaemonSetFieldCreatorID = "creatorId" DaemonSetFieldDNSPolicy = "dnsPolicy" DaemonSetFieldDeploymentStrategy = "deploymentStrategy" DaemonSetFieldFinalizers = "finalizers" @@ -56,13 +56,13 @@ const ( type DaemonSet struct { types.Resource - string `json:"creatorId,omitempty"` ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` BatchSize string `json:"batchSize,omitempty"` Containers []Container `json:"containers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/project/v3/zz_generated_deployment.go b/client/project/v3/zz_generated_deployment.go index 496372b7..cd6f6806 100644 --- a/client/project/v3/zz_generated_deployment.go +++ b/client/project/v3/zz_generated_deployment.go @@ -6,13 +6,13 @@ import ( const ( DeploymentType = "deployment" - DeploymentField = "creatorId" DeploymentFieldActiveDeadlineSeconds = "activeDeadlineSeconds" DeploymentFieldAnnotations = "annotations" DeploymentFieldAutomountServiceAccountToken = "automountServiceAccountToken" DeploymentFieldBatchSize = "batchSize" DeploymentFieldContainers = "containers" DeploymentFieldCreated = "created" + DeploymentFieldCreatorID = "creatorId" DeploymentFieldDNSPolicy = "dnsPolicy" DeploymentFieldDeploymentStrategy = "deploymentStrategy" DeploymentFieldFinalizers = "finalizers" @@ -56,13 +56,13 @@ const ( type Deployment struct { types.Resource - string `json:"creatorId,omitempty"` ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` BatchSize string `json:"batchSize,omitempty"` Containers []Container `json:"containers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/project/v3/zz_generated_dns_record.go b/client/project/v3/zz_generated_dns_record.go new file mode 100644 index 00000000..0f1daa1b --- /dev/null +++ b/client/project/v3/zz_generated_dns_record.go @@ -0,0 +1,117 @@ +package client + +import ( + "github.com/rancher/norman/types" +) + +const ( + DNSRecordType = "dnsRecord" + DNSRecordFieldAnnotations = "annotations" + DNSRecordFieldClusterIp = "clusterIp" + DNSRecordFieldCreated = "created" + DNSRecordFieldCreatorID = "creatorId" + DNSRecordFieldFinalizers = "finalizers" + DNSRecordFieldHostname = "hostname" + DNSRecordFieldIPAddresses = "ipAddresses" + DNSRecordFieldLabels = "labels" + DNSRecordFieldName = "name" + DNSRecordFieldNamespaceId = "namespaceId" + DNSRecordFieldOwnerReferences = "ownerReferences" + DNSRecordFieldProjectID = "projectId" + DNSRecordFieldRemoved = "removed" + DNSRecordFieldSelector = "selector" + DNSRecordFieldState = "state" + DNSRecordFieldTargetDNSRecordIDs = "targetDnsRecordIds" + DNSRecordFieldTargetWorkloadIDs = "targetWorkloadIds" + DNSRecordFieldTransitioning = "transitioning" + DNSRecordFieldTransitioningMessage = "transitioningMessage" + DNSRecordFieldUuid = "uuid" + DNSRecordFieldWorkloadID = "workloadId" +) + +type DNSRecord struct { + types.Resource + Annotations map[string]string `json:"annotations,omitempty"` + ClusterIp string `json:"clusterIp,omitempty"` + Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` + Hostname string `json:"hostname,omitempty"` + IPAddresses []string `json:"ipAddresses,omitempty"` + Labels map[string]string `json:"labels,omitempty"` + Name string `json:"name,omitempty"` + NamespaceId string `json:"namespaceId,omitempty"` + OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` + ProjectID string `json:"projectId,omitempty"` + Removed string `json:"removed,omitempty"` + Selector map[string]string `json:"selector,omitempty"` + State string `json:"state,omitempty"` + TargetDNSRecordIDs []string `json:"targetDnsRecordIds,omitempty"` + TargetWorkloadIDs []string `json:"targetWorkloadIds,omitempty"` + Transitioning string `json:"transitioning,omitempty"` + TransitioningMessage string `json:"transitioningMessage,omitempty"` + Uuid string `json:"uuid,omitempty"` + WorkloadID string `json:"workloadId,omitempty"` +} +type DNSRecordCollection struct { + types.Collection + Data []DNSRecord `json:"data,omitempty"` + client *DNSRecordClient +} + +type DNSRecordClient struct { + apiClient *Client +} + +type DNSRecordOperations interface { + List(opts *types.ListOpts) (*DNSRecordCollection, error) + Create(opts *DNSRecord) (*DNSRecord, error) + Update(existing *DNSRecord, updates interface{}) (*DNSRecord, error) + ByID(id string) (*DNSRecord, error) + Delete(container *DNSRecord) error +} + +func newDNSRecordClient(apiClient *Client) *DNSRecordClient { + return &DNSRecordClient{ + apiClient: apiClient, + } +} + +func (c *DNSRecordClient) Create(container *DNSRecord) (*DNSRecord, error) { + resp := &DNSRecord{} + err := c.apiClient.Ops.DoCreate(DNSRecordType, container, resp) + return resp, err +} + +func (c *DNSRecordClient) Update(existing *DNSRecord, updates interface{}) (*DNSRecord, error) { + resp := &DNSRecord{} + err := c.apiClient.Ops.DoUpdate(DNSRecordType, &existing.Resource, updates, resp) + return resp, err +} + +func (c *DNSRecordClient) List(opts *types.ListOpts) (*DNSRecordCollection, error) { + resp := &DNSRecordCollection{} + err := c.apiClient.Ops.DoList(DNSRecordType, opts, resp) + resp.client = c + return resp, err +} + +func (cc *DNSRecordCollection) Next() (*DNSRecordCollection, error) { + if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { + resp := &DNSRecordCollection{} + err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) + resp.client = cc.client + return resp, err + } + return nil, nil +} + +func (c *DNSRecordClient) ByID(id string) (*DNSRecord, error) { + resp := &DNSRecord{} + err := c.apiClient.Ops.DoByID(DNSRecordType, id, resp) + return resp, err +} + +func (c *DNSRecordClient) Delete(container *DNSRecord) error { + return c.apiClient.Ops.DoResourceDelete(DNSRecordType, &container.Resource) +} diff --git a/client/project/v3/zz_generated_docker_credential.go b/client/project/v3/zz_generated_docker_credential.go index b78fe7aa..aa48dafc 100644 --- a/client/project/v3/zz_generated_docker_credential.go +++ b/client/project/v3/zz_generated_docker_credential.go @@ -6,9 +6,9 @@ import ( const ( DockerCredentialType = "dockerCredential" - DockerCredentialField = "creatorId" DockerCredentialFieldAnnotations = "annotations" DockerCredentialFieldCreated = "created" + DockerCredentialFieldCreatorID = "creatorId" DockerCredentialFieldFinalizers = "finalizers" DockerCredentialFieldLabels = "labels" DockerCredentialFieldName = "name" @@ -22,9 +22,9 @@ const ( type DockerCredential struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/project/v3/zz_generated_endpoint.go b/client/project/v3/zz_generated_endpoint.go deleted file mode 100644 index 5fb88cfd..00000000 --- a/client/project/v3/zz_generated_endpoint.go +++ /dev/null @@ -1,101 +0,0 @@ -package client - -import ( - "github.com/rancher/norman/types" -) - -const ( - EndpointType = "endpoint" - EndpointField = "creatorId" - EndpointFieldAnnotations = "annotations" - EndpointFieldCreated = "created" - EndpointFieldFinalizers = "finalizers" - EndpointFieldLabels = "labels" - EndpointFieldName = "name" - EndpointFieldNamespaceId = "namespaceId" - EndpointFieldOwnerReferences = "ownerReferences" - EndpointFieldPodIDs = "podIds" - EndpointFieldProjectID = "projectId" - EndpointFieldRemoved = "removed" - EndpointFieldTargets = "targets" - EndpointFieldUuid = "uuid" -) - -type Endpoint struct { - types.Resource - string `json:"creatorId,omitempty"` - Annotations map[string]string `json:"annotations,omitempty"` - Created string `json:"created,omitempty"` - Finalizers []string `json:"finalizers,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - Name string `json:"name,omitempty"` - NamespaceId string `json:"namespaceId,omitempty"` - OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` - PodIDs []string `json:"podIds,omitempty"` - ProjectID string `json:"projectId,omitempty"` - Removed string `json:"removed,omitempty"` - Targets []Target `json:"targets,omitempty"` - Uuid string `json:"uuid,omitempty"` -} -type EndpointCollection struct { - types.Collection - Data []Endpoint `json:"data,omitempty"` - client *EndpointClient -} - -type EndpointClient struct { - apiClient *Client -} - -type EndpointOperations interface { - List(opts *types.ListOpts) (*EndpointCollection, error) - Create(opts *Endpoint) (*Endpoint, error) - Update(existing *Endpoint, updates interface{}) (*Endpoint, error) - ByID(id string) (*Endpoint, error) - Delete(container *Endpoint) error -} - -func newEndpointClient(apiClient *Client) *EndpointClient { - return &EndpointClient{ - apiClient: apiClient, - } -} - -func (c *EndpointClient) Create(container *Endpoint) (*Endpoint, error) { - resp := &Endpoint{} - err := c.apiClient.Ops.DoCreate(EndpointType, container, resp) - return resp, err -} - -func (c *EndpointClient) Update(existing *Endpoint, updates interface{}) (*Endpoint, error) { - resp := &Endpoint{} - err := c.apiClient.Ops.DoUpdate(EndpointType, &existing.Resource, updates, resp) - return resp, err -} - -func (c *EndpointClient) List(opts *types.ListOpts) (*EndpointCollection, error) { - resp := &EndpointCollection{} - err := c.apiClient.Ops.DoList(EndpointType, opts, resp) - resp.client = c - return resp, err -} - -func (cc *EndpointCollection) Next() (*EndpointCollection, error) { - if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { - resp := &EndpointCollection{} - err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) - resp.client = cc.client - return resp, err - } - return nil, nil -} - -func (c *EndpointClient) ByID(id string) (*Endpoint, error) { - resp := &Endpoint{} - err := c.apiClient.Ops.DoByID(EndpointType, id, resp) - return resp, err -} - -func (c *EndpointClient) Delete(container *Endpoint) error { - return c.apiClient.Ops.DoResourceDelete(EndpointType, &container.Resource) -} diff --git a/client/project/v3/zz_generated_endpoint_address.go b/client/project/v3/zz_generated_endpoint_address.go deleted file mode 100644 index 9f6be0bd..00000000 --- a/client/project/v3/zz_generated_endpoint_address.go +++ /dev/null @@ -1,16 +0,0 @@ -package client - -const ( - EndpointAddressType = "endpointAddress" - EndpointAddressFieldHostname = "hostname" - EndpointAddressFieldIP = "ip" - EndpointAddressFieldNodeName = "nodeName" - EndpointAddressFieldTargetRef = "targetRef" -) - -type EndpointAddress struct { - Hostname string `json:"hostname,omitempty"` - IP string `json:"ip,omitempty"` - NodeName string `json:"nodeName,omitempty"` - TargetRef *ObjectReference `json:"targetRef,omitempty"` -} diff --git a/client/project/v3/zz_generated_endpoint_port.go b/client/project/v3/zz_generated_endpoint_port.go deleted file mode 100644 index c06607da..00000000 --- a/client/project/v3/zz_generated_endpoint_port.go +++ /dev/null @@ -1,14 +0,0 @@ -package client - -const ( - EndpointPortType = "endpointPort" - EndpointPortFieldName = "name" - EndpointPortFieldPort = "port" - EndpointPortFieldProtocol = "protocol" -) - -type EndpointPort struct { - Name string `json:"name,omitempty"` - Port *int64 `json:"port,omitempty"` - Protocol string `json:"protocol,omitempty"` -} diff --git a/client/project/v3/zz_generated_endpoint_subset.go b/client/project/v3/zz_generated_endpoint_subset.go deleted file mode 100644 index ff154079..00000000 --- a/client/project/v3/zz_generated_endpoint_subset.go +++ /dev/null @@ -1,14 +0,0 @@ -package client - -const ( - EndpointSubsetType = "endpointSubset" - EndpointSubsetFieldAddresses = "addresses" - EndpointSubsetFieldNotReadyAddresses = "notReadyAddresses" - EndpointSubsetFieldPorts = "ports" -) - -type EndpointSubset struct { - Addresses []EndpointAddress `json:"addresses,omitempty"` - NotReadyAddresses []EndpointAddress `json:"notReadyAddresses,omitempty"` - Ports []EndpointPort `json:"ports,omitempty"` -} diff --git a/client/project/v3/zz_generated_handler.go b/client/project/v3/zz_generated_handler.go index 71c7a2cf..4f168b12 100644 --- a/client/project/v3/zz_generated_handler.go +++ b/client/project/v3/zz_generated_handler.go @@ -1,5 +1,7 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( HandlerType = "handler" HandlerFieldCommand = "command" @@ -12,11 +14,11 @@ const ( ) type Handler struct { - Command []string `json:"command,omitempty"` - HTTPHeaders []HTTPHeader `json:"httpHeaders,omitempty"` - Host string `json:"host,omitempty"` - Path string `json:"path,omitempty"` - Port string `json:"port,omitempty"` - Scheme string `json:"scheme,omitempty"` - TCP *bool `json:"tcp,omitempty"` + Command []string `json:"command,omitempty"` + HTTPHeaders []HTTPHeader `json:"httpHeaders,omitempty"` + Host string `json:"host,omitempty"` + Path string `json:"path,omitempty"` + Port intstr.IntOrString `json:"port,omitempty"` + Scheme string `json:"scheme,omitempty"` + TCP *bool `json:"tcp,omitempty"` } diff --git a/client/project/v3/zz_generated_http_get_action.go b/client/project/v3/zz_generated_http_get_action.go index 7e3bbd75..1dcbe232 100644 --- a/client/project/v3/zz_generated_http_get_action.go +++ b/client/project/v3/zz_generated_http_get_action.go @@ -1,5 +1,7 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( HTTPGetActionType = "httpGetAction" HTTPGetActionFieldHTTPHeaders = "httpHeaders" @@ -9,8 +11,8 @@ const ( ) type HTTPGetAction struct { - HTTPHeaders []HTTPHeader `json:"httpHeaders,omitempty"` - Path string `json:"path,omitempty"` - Port string `json:"port,omitempty"` - Scheme string `json:"scheme,omitempty"` + HTTPHeaders []HTTPHeader `json:"httpHeaders,omitempty"` + Path string `json:"path,omitempty"` + Port intstr.IntOrString `json:"port,omitempty"` + Scheme string `json:"scheme,omitempty"` } diff --git a/client/project/v3/zz_generated_http_ingress_path.go b/client/project/v3/zz_generated_http_ingress_path.go index 32d9ea00..94b6fbcc 100644 --- a/client/project/v3/zz_generated_http_ingress_path.go +++ b/client/project/v3/zz_generated_http_ingress_path.go @@ -1,5 +1,7 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( HTTPIngressPathType = "httpIngressPath" HTTPIngressPathFieldServiceId = "serviceId" @@ -8,7 +10,7 @@ const ( ) type HTTPIngressPath struct { - ServiceId string `json:"serviceId,omitempty"` - TargetPort string `json:"targetPort,omitempty"` - WorkloadIDs []string `json:"workloadIds,omitempty"` + ServiceId string `json:"serviceId,omitempty"` + TargetPort intstr.IntOrString `json:"targetPort,omitempty"` + WorkloadIDs []string `json:"workloadIds,omitempty"` } diff --git a/client/project/v3/zz_generated_ingress.go b/client/project/v3/zz_generated_ingress.go index 1da2f782..637e1109 100644 --- a/client/project/v3/zz_generated_ingress.go +++ b/client/project/v3/zz_generated_ingress.go @@ -6,9 +6,9 @@ import ( const ( IngressType = "ingress" - IngressField = "creatorId" IngressFieldAnnotations = "annotations" IngressFieldCreated = "created" + IngressFieldCreatorID = "creatorId" IngressFieldDefaultBackend = "defaultBackend" IngressFieldFinalizers = "finalizers" IngressFieldLabels = "labels" @@ -28,9 +28,9 @@ const ( type Ingress struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DefaultBackend *IngressBackend `json:"defaultBackend,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/project/v3/zz_generated_ingress_backend.go b/client/project/v3/zz_generated_ingress_backend.go index 769a37ef..a276e6e0 100644 --- a/client/project/v3/zz_generated_ingress_backend.go +++ b/client/project/v3/zz_generated_ingress_backend.go @@ -1,5 +1,7 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( IngressBackendType = "ingressBackend" IngressBackendFieldServiceId = "serviceId" @@ -8,7 +10,7 @@ const ( ) type IngressBackend struct { - ServiceId string `json:"serviceId,omitempty"` - TargetPort string `json:"targetPort,omitempty"` - WorkloadIDs []string `json:"workloadIds,omitempty"` + ServiceId string `json:"serviceId,omitempty"` + TargetPort intstr.IntOrString `json:"targetPort,omitempty"` + WorkloadIDs []string `json:"workloadIds,omitempty"` } diff --git a/client/project/v3/zz_generated_ingress_rule.go b/client/project/v3/zz_generated_ingress_rule.go index 2833e49e..7f558dae 100644 --- a/client/project/v3/zz_generated_ingress_rule.go +++ b/client/project/v3/zz_generated_ingress_rule.go @@ -7,6 +7,6 @@ const ( ) type IngressRule struct { - Host string `json:"host,omitempty"` - Paths map[string]HTTPIngressPath `json:"paths,omitempty"` + Host string `json:"host,omitempty"` + Paths map[string]IngressBackend `json:"paths,omitempty"` } diff --git a/client/project/v3/zz_generated_namespace.go b/client/project/v3/zz_generated_namespace.go index db71d260..36365ce4 100644 --- a/client/project/v3/zz_generated_namespace.go +++ b/client/project/v3/zz_generated_namespace.go @@ -6,10 +6,10 @@ import ( const ( NamespaceType = "namespace" - NamespaceField = "creatorId" NamespaceFieldAnnotations = "annotations" NamespaceFieldAnswers = "answers" NamespaceFieldCreated = "created" + NamespaceFieldCreatorID = "creatorId" NamespaceFieldExternalID = "externalId" NamespaceFieldFinalizers = "finalizers" NamespaceFieldLabels = "labels" @@ -29,10 +29,10 @@ const ( type Namespace struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Answers map[string]interface{} `json:"answers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` ExternalID string `json:"externalId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/project/v3/zz_generated_namespaced_basic_auth.go b/client/project/v3/zz_generated_namespaced_basic_auth.go index 2218b9b1..0961010e 100644 --- a/client/project/v3/zz_generated_namespaced_basic_auth.go +++ b/client/project/v3/zz_generated_namespaced_basic_auth.go @@ -6,9 +6,9 @@ import ( const ( NamespacedBasicAuthType = "namespacedBasicAuth" - NamespacedBasicAuthField = "creatorId" NamespacedBasicAuthFieldAnnotations = "annotations" NamespacedBasicAuthFieldCreated = "created" + NamespacedBasicAuthFieldCreatorID = "creatorId" NamespacedBasicAuthFieldFinalizers = "finalizers" NamespacedBasicAuthFieldLabels = "labels" NamespacedBasicAuthFieldName = "name" @@ -23,9 +23,9 @@ const ( type NamespacedBasicAuth struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/project/v3/zz_generated_namespaced_certificate.go b/client/project/v3/zz_generated_namespaced_certificate.go index 9bbdf0f0..da57ab5a 100644 --- a/client/project/v3/zz_generated_namespaced_certificate.go +++ b/client/project/v3/zz_generated_namespaced_certificate.go @@ -6,13 +6,13 @@ import ( const ( NamespacedCertificateType = "namespacedCertificate" - NamespacedCertificateField = "creatorId" NamespacedCertificateFieldAlgorithm = "algorithm" NamespacedCertificateFieldAnnotations = "annotations" NamespacedCertificateFieldCN = "cn" NamespacedCertificateFieldCertFingerprint = "certFingerprint" NamespacedCertificateFieldCerts = "certs" NamespacedCertificateFieldCreated = "created" + NamespacedCertificateFieldCreatorID = "creatorId" NamespacedCertificateFieldFinalizers = "finalizers" NamespacedCertificateFieldIssuedAt = "issuedAt" NamespacedCertificateFieldIssuer = "issuer" @@ -32,13 +32,13 @@ const ( type NamespacedCertificate struct { types.Resource - string `json:"creatorId,omitempty"` Algorithm string `json:"algorithm,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` CN string `json:"cn,omitempty"` CertFingerprint string `json:"certFingerprint,omitempty"` Certs string `json:"certs,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` IssuedAt string `json:"issuedAt,omitempty"` Issuer string `json:"issuer,omitempty"` diff --git a/client/project/v3/zz_generated_namespaced_docker_credential.go b/client/project/v3/zz_generated_namespaced_docker_credential.go index ec0c6bf6..d1056be7 100644 --- a/client/project/v3/zz_generated_namespaced_docker_credential.go +++ b/client/project/v3/zz_generated_namespaced_docker_credential.go @@ -6,9 +6,9 @@ import ( const ( NamespacedDockerCredentialType = "namespacedDockerCredential" - NamespacedDockerCredentialField = "creatorId" NamespacedDockerCredentialFieldAnnotations = "annotations" NamespacedDockerCredentialFieldCreated = "created" + NamespacedDockerCredentialFieldCreatorID = "creatorId" NamespacedDockerCredentialFieldFinalizers = "finalizers" NamespacedDockerCredentialFieldLabels = "labels" NamespacedDockerCredentialFieldName = "name" @@ -22,9 +22,9 @@ const ( type NamespacedDockerCredential struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/project/v3/zz_generated_namespaced_secret.go b/client/project/v3/zz_generated_namespaced_secret.go index 3758ff7b..c6b26235 100644 --- a/client/project/v3/zz_generated_namespaced_secret.go +++ b/client/project/v3/zz_generated_namespaced_secret.go @@ -6,9 +6,9 @@ import ( const ( NamespacedSecretType = "namespacedSecret" - NamespacedSecretField = "creatorId" NamespacedSecretFieldAnnotations = "annotations" NamespacedSecretFieldCreated = "created" + NamespacedSecretFieldCreatorID = "creatorId" NamespacedSecretFieldData = "data" NamespacedSecretFieldFinalizers = "finalizers" NamespacedSecretFieldKind = "kind" @@ -24,9 +24,9 @@ const ( type NamespacedSecret struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Data map[string]string `json:"data,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Kind string `json:"kind,omitempty"` diff --git a/client/project/v3/zz_generated_namespaced_service_account_token.go b/client/project/v3/zz_generated_namespaced_service_account_token.go index 2c4fef3a..ec007926 100644 --- a/client/project/v3/zz_generated_namespaced_service_account_token.go +++ b/client/project/v3/zz_generated_namespaced_service_account_token.go @@ -6,12 +6,12 @@ import ( const ( NamespacedServiceAccountTokenType = "namespacedServiceAccountToken" - NamespacedServiceAccountTokenField = "creatorId" NamespacedServiceAccountTokenFieldAccountName = "accountName" NamespacedServiceAccountTokenFieldAccountUID = "accountUid" NamespacedServiceAccountTokenFieldAnnotations = "annotations" NamespacedServiceAccountTokenFieldCACRT = "caCrt" NamespacedServiceAccountTokenFieldCreated = "created" + NamespacedServiceAccountTokenFieldCreatorID = "creatorId" NamespacedServiceAccountTokenFieldFinalizers = "finalizers" NamespacedServiceAccountTokenFieldLabels = "labels" NamespacedServiceAccountTokenFieldName = "name" @@ -25,12 +25,12 @@ const ( type NamespacedServiceAccountToken struct { types.Resource - string `json:"creatorId,omitempty"` AccountName string `json:"accountName,omitempty"` AccountUID string `json:"accountUid,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` CACRT string `json:"caCrt,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/project/v3/zz_generated_namespaced_ssh_auth.go b/client/project/v3/zz_generated_namespaced_ssh_auth.go index cbf42dee..f47e044e 100644 --- a/client/project/v3/zz_generated_namespaced_ssh_auth.go +++ b/client/project/v3/zz_generated_namespaced_ssh_auth.go @@ -6,9 +6,9 @@ import ( const ( NamespacedSSHAuthType = "namespacedSshAuth" - NamespacedSSHAuthField = "creatorId" NamespacedSSHAuthFieldAnnotations = "annotations" NamespacedSSHAuthFieldCreated = "created" + NamespacedSSHAuthFieldCreatorID = "creatorId" NamespacedSSHAuthFieldFinalizers = "finalizers" NamespacedSSHAuthFieldFingerprint = "certFingerprint" NamespacedSSHAuthFieldLabels = "labels" @@ -23,9 +23,9 @@ const ( type NamespacedSSHAuth struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Fingerprint string `json:"certFingerprint,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/project/v3/zz_generated_object_reference.go b/client/project/v3/zz_generated_object_reference.go deleted file mode 100644 index 83d443d2..00000000 --- a/client/project/v3/zz_generated_object_reference.go +++ /dev/null @@ -1,22 +0,0 @@ -package client - -const ( - ObjectReferenceType = "objectReference" - ObjectReferenceFieldAPIVersion = "apiVersion" - ObjectReferenceFieldFieldPath = "fieldPath" - ObjectReferenceFieldKind = "kind" - ObjectReferenceFieldName = "name" - ObjectReferenceFieldNamespace = "namespace" - ObjectReferenceFieldResourceVersion = "resourceVersion" - ObjectReferenceFieldUID = "uid" -) - -type ObjectReference struct { - APIVersion string `json:"apiVersion,omitempty"` - FieldPath string `json:"fieldPath,omitempty"` - Kind string `json:"kind,omitempty"` - Name string `json:"name,omitempty"` - Namespace string `json:"namespace,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` - UID string `json:"uid,omitempty"` -} diff --git a/client/project/v3/zz_generated_persistent_volume_claim.go b/client/project/v3/zz_generated_persistent_volume_claim.go index f19ad587..1c49e6ac 100644 --- a/client/project/v3/zz_generated_persistent_volume_claim.go +++ b/client/project/v3/zz_generated_persistent_volume_claim.go @@ -6,10 +6,10 @@ import ( const ( PersistentVolumeClaimType = "persistentVolumeClaim" - PersistentVolumeClaimField = "creatorId" PersistentVolumeClaimFieldAccessModes = "accessModes" PersistentVolumeClaimFieldAnnotations = "annotations" PersistentVolumeClaimFieldCreated = "created" + PersistentVolumeClaimFieldCreatorID = "creatorId" PersistentVolumeClaimFieldFinalizers = "finalizers" PersistentVolumeClaimFieldLabels = "labels" PersistentVolumeClaimFieldName = "name" @@ -30,10 +30,10 @@ const ( type PersistentVolumeClaim struct { types.Resource - string `json:"creatorId,omitempty"` AccessModes []string `json:"accessModes,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/project/v3/zz_generated_pod.go b/client/project/v3/zz_generated_pod.go index 35f7f8bb..a930c241 100644 --- a/client/project/v3/zz_generated_pod.go +++ b/client/project/v3/zz_generated_pod.go @@ -6,12 +6,12 @@ import ( const ( PodType = "pod" - PodField = "creatorId" PodFieldActiveDeadlineSeconds = "activeDeadlineSeconds" PodFieldAnnotations = "annotations" PodFieldAutomountServiceAccountToken = "automountServiceAccountToken" PodFieldContainers = "containers" PodFieldCreated = "created" + PodFieldCreatorID = "creatorId" PodFieldDNSPolicy = "dnsPolicy" PodFieldFinalizers = "finalizers" PodFieldFsgid = "fsgid" @@ -50,12 +50,12 @@ const ( type Pod struct { types.Resource - string `json:"creatorId,omitempty"` ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` Containers []Container `json:"containers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Fsgid *int64 `json:"fsgid,omitempty"` diff --git a/client/project/v3/zz_generated_probe.go b/client/project/v3/zz_generated_probe.go index 25102a82..a3aa03b6 100644 --- a/client/project/v3/zz_generated_probe.go +++ b/client/project/v3/zz_generated_probe.go @@ -1,5 +1,7 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( ProbeType = "probe" ProbeFieldCommand = "command" @@ -17,16 +19,16 @@ const ( ) type Probe struct { - Command []string `json:"command,omitempty"` - FailureThreshold *int64 `json:"failureThreshold,omitempty"` - HTTPHeaders []HTTPHeader `json:"httpHeaders,omitempty"` - Host string `json:"host,omitempty"` - InitialDelaySeconds *int64 `json:"initialDelaySeconds,omitempty"` - Path string `json:"path,omitempty"` - PeriodSeconds *int64 `json:"periodSeconds,omitempty"` - Port string `json:"port,omitempty"` - Scheme string `json:"scheme,omitempty"` - SuccessThreshold *int64 `json:"successThreshold,omitempty"` - TCP *bool `json:"tcp,omitempty"` - TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` + Command []string `json:"command,omitempty"` + FailureThreshold *int64 `json:"failureThreshold,omitempty"` + HTTPHeaders []HTTPHeader `json:"httpHeaders,omitempty"` + Host string `json:"host,omitempty"` + InitialDelaySeconds *int64 `json:"initialDelaySeconds,omitempty"` + Path string `json:"path,omitempty"` + PeriodSeconds *int64 `json:"periodSeconds,omitempty"` + Port intstr.IntOrString `json:"port,omitempty"` + Scheme string `json:"scheme,omitempty"` + SuccessThreshold *int64 `json:"successThreshold,omitempty"` + TCP *bool `json:"tcp,omitempty"` + TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } diff --git a/client/project/v3/zz_generated_replica_set.go b/client/project/v3/zz_generated_replica_set.go index 1dd64933..59417c65 100644 --- a/client/project/v3/zz_generated_replica_set.go +++ b/client/project/v3/zz_generated_replica_set.go @@ -6,13 +6,13 @@ import ( const ( ReplicaSetType = "replicaSet" - ReplicaSetField = "creatorId" ReplicaSetFieldActiveDeadlineSeconds = "activeDeadlineSeconds" ReplicaSetFieldAnnotations = "annotations" ReplicaSetFieldAutomountServiceAccountToken = "automountServiceAccountToken" ReplicaSetFieldBatchSize = "batchSize" ReplicaSetFieldContainers = "containers" ReplicaSetFieldCreated = "created" + ReplicaSetFieldCreatorID = "creatorId" ReplicaSetFieldDNSPolicy = "dnsPolicy" ReplicaSetFieldDeploymentStrategy = "deploymentStrategy" ReplicaSetFieldFinalizers = "finalizers" @@ -54,13 +54,13 @@ const ( type ReplicaSet struct { types.Resource - string `json:"creatorId,omitempty"` ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` BatchSize string `json:"batchSize,omitempty"` Containers []Container `json:"containers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/project/v3/zz_generated_replication_controller.go b/client/project/v3/zz_generated_replication_controller.go index dd7c4571..56eef484 100644 --- a/client/project/v3/zz_generated_replication_controller.go +++ b/client/project/v3/zz_generated_replication_controller.go @@ -6,13 +6,13 @@ import ( const ( ReplicationControllerType = "replicationController" - ReplicationControllerField = "creatorId" ReplicationControllerFieldActiveDeadlineSeconds = "activeDeadlineSeconds" ReplicationControllerFieldAnnotations = "annotations" ReplicationControllerFieldAutomountServiceAccountToken = "automountServiceAccountToken" ReplicationControllerFieldBatchSize = "batchSize" ReplicationControllerFieldContainers = "containers" ReplicationControllerFieldCreated = "created" + ReplicationControllerFieldCreatorID = "creatorId" ReplicationControllerFieldDNSPolicy = "dnsPolicy" ReplicationControllerFieldDeploymentStrategy = "deploymentStrategy" ReplicationControllerFieldFinalizers = "finalizers" @@ -54,13 +54,13 @@ const ( type ReplicationController struct { types.Resource - string `json:"creatorId,omitempty"` ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` BatchSize string `json:"batchSize,omitempty"` Containers []Container `json:"containers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/project/v3/zz_generated_rolling_update_daemon_set.go b/client/project/v3/zz_generated_rolling_update_daemon_set.go index 09cb02c9..b2d971d2 100644 --- a/client/project/v3/zz_generated_rolling_update_daemon_set.go +++ b/client/project/v3/zz_generated_rolling_update_daemon_set.go @@ -1,10 +1,12 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( RollingUpdateDaemonSetType = "rollingUpdateDaemonSet" RollingUpdateDaemonSetFieldMaxUnavailable = "maxUnavailable" ) type RollingUpdateDaemonSet struct { - MaxUnavailable string `json:"maxUnavailable,omitempty"` + MaxUnavailable intstr.IntOrString `json:"maxUnavailable,omitempty"` } diff --git a/client/project/v3/zz_generated_rolling_update_deployment.go b/client/project/v3/zz_generated_rolling_update_deployment.go index d3f12a60..99e9e6e6 100644 --- a/client/project/v3/zz_generated_rolling_update_deployment.go +++ b/client/project/v3/zz_generated_rolling_update_deployment.go @@ -1,5 +1,7 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( RollingUpdateDeploymentType = "rollingUpdateDeployment" RollingUpdateDeploymentFieldMaxSurge = "maxSurge" @@ -7,6 +9,6 @@ const ( ) type RollingUpdateDeployment struct { - MaxSurge string `json:"maxSurge,omitempty"` - MaxUnavailable string `json:"maxUnavailable,omitempty"` + MaxSurge intstr.IntOrString `json:"maxSurge,omitempty"` + MaxUnavailable intstr.IntOrString `json:"maxUnavailable,omitempty"` } diff --git a/client/project/v3/zz_generated_secret.go b/client/project/v3/zz_generated_secret.go index b9b4e0ee..0a6f76dd 100644 --- a/client/project/v3/zz_generated_secret.go +++ b/client/project/v3/zz_generated_secret.go @@ -6,9 +6,9 @@ import ( const ( SecretType = "secret" - SecretField = "creatorId" SecretFieldAnnotations = "annotations" SecretFieldCreated = "created" + SecretFieldCreatorID = "creatorId" SecretFieldData = "data" SecretFieldFinalizers = "finalizers" SecretFieldKind = "kind" @@ -24,9 +24,9 @@ const ( type Secret struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Data map[string]string `json:"data,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Kind string `json:"kind,omitempty"` diff --git a/client/project/v3/zz_generated_service.go b/client/project/v3/zz_generated_service.go index 61809c81..b30378ec 100644 --- a/client/project/v3/zz_generated_service.go +++ b/client/project/v3/zz_generated_service.go @@ -6,15 +6,16 @@ import ( const ( ServiceType = "service" - ServiceField = "creatorId" ServiceFieldAnnotations = "annotations" ServiceFieldClusterIp = "clusterIp" ServiceFieldCreated = "created" + ServiceFieldCreatorID = "creatorId" ServiceFieldExternalIPs = "externalIPs" ServiceFieldExternalTrafficPolicy = "externalTrafficPolicy" ServiceFieldFinalizers = "finalizers" ServiceFieldHealthCheckNodePort = "healthCheckNodePort" ServiceFieldHostname = "hostname" + ServiceFieldIPAddresses = "ipAddresses" ServiceFieldKind = "kind" ServiceFieldLabels = "labels" ServiceFieldLoadBalancerIP = "loadBalancerIP" @@ -30,7 +31,7 @@ const ( ServiceFieldSessionAffinity = "sessionAffinity" ServiceFieldSessionAffinityConfig = "sessionAffinityConfig" ServiceFieldState = "state" - ServiceFieldTargetServiceIDs = "targetServiceIds" + ServiceFieldTargetDNSRecordIDs = "targetDnsRecordIds" ServiceFieldTargetWorkloadIDs = "targetWorkloadIds" ServiceFieldTransitioning = "transitioning" ServiceFieldTransitioningMessage = "transitioningMessage" @@ -40,15 +41,16 @@ const ( type Service struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` ClusterIp string `json:"clusterIp,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` ExternalIPs []string `json:"externalIPs,omitempty"` ExternalTrafficPolicy string `json:"externalTrafficPolicy,omitempty"` Finalizers []string `json:"finalizers,omitempty"` HealthCheckNodePort *int64 `json:"healthCheckNodePort,omitempty"` Hostname string `json:"hostname,omitempty"` + IPAddresses []string `json:"ipAddresses,omitempty"` Kind string `json:"kind,omitempty"` Labels map[string]string `json:"labels,omitempty"` LoadBalancerIP string `json:"loadBalancerIP,omitempty"` @@ -64,7 +66,7 @@ type Service struct { SessionAffinity string `json:"sessionAffinity,omitempty"` SessionAffinityConfig *SessionAffinityConfig `json:"sessionAffinityConfig,omitempty"` State string `json:"state,omitempty"` - TargetServiceIDs []string `json:"targetServiceIds,omitempty"` + TargetDNSRecordIDs []string `json:"targetDnsRecordIds,omitempty"` TargetWorkloadIDs []string `json:"targetWorkloadIds,omitempty"` Transitioning string `json:"transitioning,omitempty"` TransitioningMessage string `json:"transitioningMessage,omitempty"` diff --git a/client/project/v3/zz_generated_service_account_token.go b/client/project/v3/zz_generated_service_account_token.go index 274a9eef..b2fde8e6 100644 --- a/client/project/v3/zz_generated_service_account_token.go +++ b/client/project/v3/zz_generated_service_account_token.go @@ -6,12 +6,12 @@ import ( const ( ServiceAccountTokenType = "serviceAccountToken" - ServiceAccountTokenField = "creatorId" ServiceAccountTokenFieldAccountName = "accountName" ServiceAccountTokenFieldAccountUID = "accountUid" ServiceAccountTokenFieldAnnotations = "annotations" ServiceAccountTokenFieldCACRT = "caCrt" ServiceAccountTokenFieldCreated = "created" + ServiceAccountTokenFieldCreatorID = "creatorId" ServiceAccountTokenFieldFinalizers = "finalizers" ServiceAccountTokenFieldLabels = "labels" ServiceAccountTokenFieldName = "name" @@ -25,12 +25,12 @@ const ( type ServiceAccountToken struct { types.Resource - string `json:"creatorId,omitempty"` AccountName string `json:"accountName,omitempty"` AccountUID string `json:"accountUid,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` CACRT string `json:"caCrt,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/project/v3/zz_generated_service_port.go b/client/project/v3/zz_generated_service_port.go index e8ee6220..82a3d27c 100644 --- a/client/project/v3/zz_generated_service_port.go +++ b/client/project/v3/zz_generated_service_port.go @@ -1,5 +1,7 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( ServicePortType = "servicePort" ServicePortFieldName = "name" @@ -10,9 +12,9 @@ const ( ) type ServicePort struct { - Name string `json:"name,omitempty"` - NodePort *int64 `json:"nodePort,omitempty"` - Port *int64 `json:"port,omitempty"` - Protocol string `json:"protocol,omitempty"` - TargetPort string `json:"targetPort,omitempty"` + Name string `json:"name,omitempty"` + NodePort *int64 `json:"nodePort,omitempty"` + Port *int64 `json:"port,omitempty"` + Protocol string `json:"protocol,omitempty"` + TargetPort intstr.IntOrString `json:"targetPort,omitempty"` } diff --git a/client/project/v3/zz_generated_ssh_auth.go b/client/project/v3/zz_generated_ssh_auth.go index ff0e03f9..e6b1e26c 100644 --- a/client/project/v3/zz_generated_ssh_auth.go +++ b/client/project/v3/zz_generated_ssh_auth.go @@ -6,9 +6,9 @@ import ( const ( SSHAuthType = "sshAuth" - SSHAuthField = "creatorId" SSHAuthFieldAnnotations = "annotations" SSHAuthFieldCreated = "created" + SSHAuthFieldCreatorID = "creatorId" SSHAuthFieldFinalizers = "finalizers" SSHAuthFieldFingerprint = "certFingerprint" SSHAuthFieldLabels = "labels" @@ -23,9 +23,9 @@ const ( type SSHAuth struct { types.Resource - string `json:"creatorId,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Fingerprint string `json:"certFingerprint,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/client/project/v3/zz_generated_stateful_set.go b/client/project/v3/zz_generated_stateful_set.go index 6076827d..bb287ef3 100644 --- a/client/project/v3/zz_generated_stateful_set.go +++ b/client/project/v3/zz_generated_stateful_set.go @@ -6,13 +6,13 @@ import ( const ( StatefulSetType = "statefulSet" - StatefulSetField = "creatorId" StatefulSetFieldActiveDeadlineSeconds = "activeDeadlineSeconds" StatefulSetFieldAnnotations = "annotations" StatefulSetFieldAutomountServiceAccountToken = "automountServiceAccountToken" StatefulSetFieldBatchSize = "batchSize" StatefulSetFieldContainers = "containers" StatefulSetFieldCreated = "created" + StatefulSetFieldCreatorID = "creatorId" StatefulSetFieldDNSPolicy = "dnsPolicy" StatefulSetFieldDeploymentStrategy = "deploymentStrategy" StatefulSetFieldFinalizers = "finalizers" @@ -59,13 +59,13 @@ const ( type StatefulSet struct { types.Resource - string `json:"creatorId,omitempty"` ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` BatchSize string `json:"batchSize,omitempty"` Containers []Container `json:"containers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` Finalizers []string `json:"finalizers,omitempty"` diff --git a/client/project/v3/zz_generated_target.go b/client/project/v3/zz_generated_target.go deleted file mode 100644 index aae11087..00000000 --- a/client/project/v3/zz_generated_target.go +++ /dev/null @@ -1,16 +0,0 @@ -package client - -const ( - TargetType = "target" - TargetFieldAddresses = "addresses" - TargetFieldNotReadyAddresses = "notReadyAddresses" - TargetFieldPort = "port" - TargetFieldProtocol = "protocol" -) - -type Target struct { - Addresses []string `json:"addresses,omitempty"` - NotReadyAddresses []string `json:"notReadyAddresses,omitempty"` - Port *int64 `json:"port,omitempty"` - Protocol string `json:"protocol,omitempty"` -} diff --git a/client/project/v3/zz_generated_tcp_socket_action.go b/client/project/v3/zz_generated_tcp_socket_action.go index db0f35c0..3f49ff85 100644 --- a/client/project/v3/zz_generated_tcp_socket_action.go +++ b/client/project/v3/zz_generated_tcp_socket_action.go @@ -1,5 +1,7 @@ package client +import "k8s.io/apimachinery/pkg/util/intstr" + const ( TCPSocketActionType = "tcpSocketAction" TCPSocketActionFieldHost = "host" @@ -7,6 +9,6 @@ const ( ) type TCPSocketAction struct { - Host string `json:"host,omitempty"` - Port string `json:"port,omitempty"` + Host string `json:"host,omitempty"` + Port intstr.IntOrString `json:"port,omitempty"` } diff --git a/client/project/v3/zz_generated_workload.go b/client/project/v3/zz_generated_workload.go index 5ca031e8..ff211fe5 100644 --- a/client/project/v3/zz_generated_workload.go +++ b/client/project/v3/zz_generated_workload.go @@ -6,13 +6,13 @@ import ( const ( WorkloadType = "workload" - WorkloadField = "creatorId" WorkloadFieldActiveDeadlineSeconds = "activeDeadlineSeconds" WorkloadFieldAnnotations = "annotations" WorkloadFieldAutomountServiceAccountToken = "automountServiceAccountToken" WorkloadFieldBatchSize = "batchSize" WorkloadFieldContainers = "containers" WorkloadFieldCreated = "created" + WorkloadFieldCreatorID = "creatorId" WorkloadFieldDNSPolicy = "dnsPolicy" WorkloadFieldDeploymentStrategy = "deploymentStrategy" WorkloadFieldFinalizers = "finalizers" @@ -55,13 +55,13 @@ const ( type Workload struct { types.Resource - string `json:"creatorId,omitempty"` ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` BatchSize string `json:"batchSize,omitempty"` Containers []Container `json:"containers,omitempty"` Created string `json:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` Finalizers []string `json:"finalizers,omitempty"`