diff --git a/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go b/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go new file mode 100644 index 00000000..45cca3fb --- /dev/null +++ b/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go @@ -0,0 +1,40 @@ +package v1beta2 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/api/apps/v1beta2" + "k8s.io/apimachinery/pkg/runtime" +) + +type DeploymentLifecycle interface { + Initialize(obj *v1beta2.Deployment) error + Remove(obj *v1beta2.Deployment) error + Updated(obj *v1beta2.Deployment) error +} + +type deploymentLifecycleAdapter struct { + lifecycle DeploymentLifecycle +} + +func (w *deploymentLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*v1beta2.Deployment)) +} + +func (w *deploymentLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*v1beta2.Deployment)) +} + +func (w *deploymentLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*v1beta2.Deployment)) +} + +func NewDeploymentLifecycleAdapter(name string, client DeploymentInterface, l DeploymentLifecycle) DeploymentHandlerFunc { + adapter := &deploymentLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *v1beta2.Deployment) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/authorization.cattle.io/v1/zz_generated_deepcopy.go b/apis/authorization.cattle.io/v1/zz_generated_deepcopy.go deleted file mode 100644 index 579ce288..00000000 --- a/apis/authorization.cattle.io/v1/zz_generated_deepcopy.go +++ /dev/null @@ -1,416 +0,0 @@ -package v1 - -import ( - rbac_v1 "k8s.io/api/rbac/v1" - runtime "k8s.io/apimachinery/pkg/runtime" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterRoleTemplate) DeepCopyInto(out *ClusterRoleTemplate) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - if in.Rules != nil { - in, out := &in.Rules, &out.Rules - *out = make([]rbac_v1.PolicyRule, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.ClusterRoleTemplateNames != nil { - in, out := &in.ClusterRoleTemplateNames, &out.ClusterRoleTemplateNames - *out = make([]string, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplate. -func (in *ClusterRoleTemplate) DeepCopy() *ClusterRoleTemplate { - if in == nil { - return nil - } - out := new(ClusterRoleTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ClusterRoleTemplate) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterRoleTemplateBinding) DeepCopyInto(out *ClusterRoleTemplateBinding) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Subject = in.Subject - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplateBinding. -func (in *ClusterRoleTemplateBinding) DeepCopy() *ClusterRoleTemplateBinding { - if in == nil { - return nil - } - out := new(ClusterRoleTemplateBinding) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ClusterRoleTemplateBinding) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterRoleTemplateBindingList) DeepCopyInto(out *ClusterRoleTemplateBindingList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterRoleTemplateBinding, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplateBindingList. -func (in *ClusterRoleTemplateBindingList) DeepCopy() *ClusterRoleTemplateBindingList { - if in == nil { - return nil - } - out := new(ClusterRoleTemplateBindingList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ClusterRoleTemplateBindingList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterRoleTemplateList) DeepCopyInto(out *ClusterRoleTemplateList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterRoleTemplate, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplateList. -func (in *ClusterRoleTemplateList) DeepCopy() *ClusterRoleTemplateList { - if in == nil { - return nil - } - out := new(ClusterRoleTemplateList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ClusterRoleTemplateList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PodSecurityPolicyTemplate) DeepCopyInto(out *PodSecurityPolicyTemplate) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSecurityPolicyTemplate. -func (in *PodSecurityPolicyTemplate) DeepCopy() *PodSecurityPolicyTemplate { - if in == nil { - return nil - } - out := new(PodSecurityPolicyTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *PodSecurityPolicyTemplate) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PodSecurityPolicyTemplateList) DeepCopyInto(out *PodSecurityPolicyTemplateList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PodSecurityPolicyTemplate, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSecurityPolicyTemplateList. -func (in *PodSecurityPolicyTemplateList) DeepCopy() *PodSecurityPolicyTemplateList { - if in == nil { - return nil - } - out := new(PodSecurityPolicyTemplateList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *PodSecurityPolicyTemplateList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Project) DeepCopyInto(out *Project) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Project. -func (in *Project) DeepCopy() *Project { - if in == nil { - return nil - } - out := new(Project) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Project) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProjectList) DeepCopyInto(out *ProjectList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Project, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectList. -func (in *ProjectList) DeepCopy() *ProjectList { - if in == nil { - return nil - } - out := new(ProjectList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ProjectList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProjectRoleTemplate) DeepCopyInto(out *ProjectRoleTemplate) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - if in.Rules != nil { - in, out := &in.Rules, &out.Rules - *out = make([]rbac_v1.PolicyRule, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.ProjectRoleTemplateNames != nil { - in, out := &in.ProjectRoleTemplateNames, &out.ProjectRoleTemplateNames - *out = make([]string, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplate. -func (in *ProjectRoleTemplate) DeepCopy() *ProjectRoleTemplate { - if in == nil { - return nil - } - out := new(ProjectRoleTemplate) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ProjectRoleTemplate) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProjectRoleTemplateBinding) DeepCopyInto(out *ProjectRoleTemplateBinding) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Subject = in.Subject - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplateBinding. -func (in *ProjectRoleTemplateBinding) DeepCopy() *ProjectRoleTemplateBinding { - if in == nil { - return nil - } - out := new(ProjectRoleTemplateBinding) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ProjectRoleTemplateBinding) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProjectRoleTemplateBindingList) DeepCopyInto(out *ProjectRoleTemplateBindingList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ProjectRoleTemplateBinding, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplateBindingList. -func (in *ProjectRoleTemplateBindingList) DeepCopy() *ProjectRoleTemplateBindingList { - if in == nil { - return nil - } - out := new(ProjectRoleTemplateBindingList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ProjectRoleTemplateBindingList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProjectRoleTemplateList) DeepCopyInto(out *ProjectRoleTemplateList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ProjectRoleTemplate, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplateList. -func (in *ProjectRoleTemplateList) DeepCopy() *ProjectRoleTemplateList { - if in == nil { - return nil - } - out := new(ProjectRoleTemplateList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ProjectRoleTemplateList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } else { - return nil - } -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProjectSpec) DeepCopyInto(out *ProjectSpec) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectSpec. -func (in *ProjectSpec) DeepCopy() *ProjectSpec { - if in == nil { - return nil - } - out := new(ProjectSpec) - in.DeepCopyInto(out) - return out -} diff --git a/apis/cluster.cattle.io/v1/zz_generated_cluster_node_controller.go b/apis/cluster.cattle.io/v1/zz_generated_cluster_node_controller.go deleted file mode 100644 index 56550f6b..00000000 --- a/apis/cluster.cattle.io/v1/zz_generated_cluster_node_controller.go +++ /dev/null @@ -1,187 +0,0 @@ -package v1 - -import ( - "context" - - "github.com/rancher/norman/clientbase" - "github.com/rancher/norman/controller" - "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 ( - ClusterNodeGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "cluster.cattle.io", - Kind: "ClusterNode", - } - ClusterNodeResource = metav1.APIResource{ - Name: "clusternodes", - SingularName: "clusternode", - Namespaced: false, - Kind: ClusterNodeGroupVersionKind.Kind, - } -) - -type ClusterNodeList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []ClusterNode -} - -type ClusterNodeHandlerFunc func(key string, obj *ClusterNode) error - -type ClusterNodeLister interface { - List(namespace string, selector labels.Selector) (ret []*ClusterNode, err error) - Get(namespace, name string) (*ClusterNode, error) -} - -type ClusterNodeController interface { - Informer() cache.SharedIndexInformer - Lister() ClusterNodeLister - AddHandler(handler ClusterNodeHandlerFunc) - Enqueue(namespace, name string) - Sync(ctx context.Context) error - Start(ctx context.Context, threadiness int) error -} - -type ClusterNodeInterface interface { - ObjectClient() *clientbase.ObjectClient - Create(*ClusterNode) (*ClusterNode, error) - Get(name string, opts metav1.GetOptions) (*ClusterNode, error) - Update(*ClusterNode) (*ClusterNode, error) - Delete(name string, options *metav1.DeleteOptions) error - List(opts metav1.ListOptions) (*ClusterNodeList, error) - Watch(opts metav1.ListOptions) (watch.Interface, error) - DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error - Controller() ClusterNodeController -} - -type clusterNodeLister struct { - controller *clusterNodeController -} - -func (l *clusterNodeLister) List(namespace string, selector labels.Selector) (ret []*ClusterNode, err error) { - err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) { - ret = append(ret, obj.(*ClusterNode)) - }) - return -} - -func (l *clusterNodeLister) Get(namespace, name string) (*ClusterNode, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(schema.GroupResource{ - Group: ClusterNodeGroupVersionKind.Group, - Resource: "clusterNode", - }, name) - } - return obj.(*ClusterNode), nil -} - -type clusterNodeController struct { - controller.GenericController -} - -func (c *clusterNodeController) Lister() ClusterNodeLister { - return &clusterNodeLister{ - controller: c, - } -} - -func (c *clusterNodeController) AddHandler(handler ClusterNodeHandlerFunc) { - 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.(*ClusterNode)) - }) -} - -type clusterNodeFactory struct { -} - -func (c clusterNodeFactory) Object() runtime.Object { - return &ClusterNode{} -} - -func (c clusterNodeFactory) List() runtime.Object { - return &ClusterNodeList{} -} - -func (s *clusterNodeClient) Controller() ClusterNodeController { - s.client.Lock() - defer s.client.Unlock() - - c, ok := s.client.clusterNodeControllers[s.ns] - if ok { - return c - } - - genericController := controller.NewGenericController(ClusterNodeGroupVersionKind.Kind+"Controller", - s.objectClient) - - c = &clusterNodeController{ - GenericController: genericController, - } - - s.client.clusterNodeControllers[s.ns] = c - s.client.starters = append(s.client.starters, c) - - return c -} - -type clusterNodeClient struct { - client *Client - ns string - objectClient *clientbase.ObjectClient - controller ClusterNodeController -} - -func (s *clusterNodeClient) ObjectClient() *clientbase.ObjectClient { - return s.objectClient -} - -func (s *clusterNodeClient) Create(o *ClusterNode) (*ClusterNode, error) { - obj, err := s.objectClient.Create(o) - return obj.(*ClusterNode), err -} - -func (s *clusterNodeClient) Get(name string, opts metav1.GetOptions) (*ClusterNode, error) { - obj, err := s.objectClient.Get(name, opts) - return obj.(*ClusterNode), err -} - -func (s *clusterNodeClient) Update(o *ClusterNode) (*ClusterNode, error) { - obj, err := s.objectClient.Update(o.Name, o) - return obj.(*ClusterNode), err -} - -func (s *clusterNodeClient) Delete(name string, options *metav1.DeleteOptions) error { - return s.objectClient.Delete(name, options) -} - -func (s *clusterNodeClient) List(opts metav1.ListOptions) (*ClusterNodeList, error) { - obj, err := s.objectClient.List(opts) - return obj.(*ClusterNodeList), err -} - -func (s *clusterNodeClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { - return s.objectClient.Watch(opts) -} - -func (s *clusterNodeClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error { - return s.objectClient.DeleteCollection(deleteOpts, listOpts) -} diff --git a/apis/cluster.cattle.io/v1/zz_generated_k8s_client.go b/apis/cluster.cattle.io/v1/zz_generated_k8s_client.go deleted file mode 100644 index d97cb998..00000000 --- a/apis/cluster.cattle.io/v1/zz_generated_k8s_client.go +++ /dev/null @@ -1,133 +0,0 @@ -package v1 - -import ( - "context" - "sync" - - "github.com/rancher/norman/clientbase" - "github.com/rancher/norman/controller" - "k8s.io/client-go/dynamic" - "k8s.io/client-go/rest" -) - -type Interface interface { - RESTClient() rest.Interface - controller.Starter - - ClustersGetter - ClusterNodesGetter - MachinesGetter - MachineDriversGetter - MachineTemplatesGetter -} - -type Client struct { - sync.Mutex - restClient rest.Interface - starters []controller.Starter - - clusterControllers map[string]ClusterController - clusterNodeControllers map[string]ClusterNodeController - machineControllers map[string]MachineController - machineDriverControllers map[string]MachineDriverController - machineTemplateControllers map[string]MachineTemplateController -} - -func NewForConfig(config rest.Config) (Interface, error) { - if config.NegotiatedSerializer == nil { - configConfig := dynamic.ContentConfig() - config.NegotiatedSerializer = configConfig.NegotiatedSerializer - } - - restClient, err := rest.UnversionedRESTClientFor(&config) - if err != nil { - return nil, err - } - - return &Client{ - restClient: restClient, - - clusterControllers: map[string]ClusterController{}, - clusterNodeControllers: map[string]ClusterNodeController{}, - machineControllers: map[string]MachineController{}, - machineDriverControllers: map[string]MachineDriverController{}, - machineTemplateControllers: map[string]MachineTemplateController{}, - }, nil -} - -func (c *Client) RESTClient() rest.Interface { - return c.restClient -} - -func (c *Client) Sync(ctx context.Context) error { - return controller.Sync(ctx, c.starters...) -} - -func (c *Client) Start(ctx context.Context, threadiness int) error { - return controller.Start(ctx, threadiness, c.starters...) -} - -type ClustersGetter interface { - Clusters(namespace string) ClusterInterface -} - -func (c *Client) Clusters(namespace string) ClusterInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterResource, ClusterGroupVersionKind, clusterFactory{}) - return &clusterClient{ - ns: namespace, - client: c, - objectClient: objectClient, - } -} - -type ClusterNodesGetter interface { - ClusterNodes(namespace string) ClusterNodeInterface -} - -func (c *Client) ClusterNodes(namespace string) ClusterNodeInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterNodeResource, ClusterNodeGroupVersionKind, clusterNodeFactory{}) - return &clusterNodeClient{ - ns: namespace, - client: c, - objectClient: objectClient, - } -} - -type MachinesGetter interface { - Machines(namespace string) MachineInterface -} - -func (c *Client) Machines(namespace string) MachineInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &MachineResource, MachineGroupVersionKind, machineFactory{}) - return &machineClient{ - ns: namespace, - client: c, - objectClient: objectClient, - } -} - -type MachineDriversGetter interface { - MachineDrivers(namespace string) MachineDriverInterface -} - -func (c *Client) MachineDrivers(namespace string) MachineDriverInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &MachineDriverResource, MachineDriverGroupVersionKind, machineDriverFactory{}) - return &machineDriverClient{ - ns: namespace, - client: c, - objectClient: objectClient, - } -} - -type MachineTemplatesGetter interface { - MachineTemplates(namespace string) MachineTemplateInterface -} - -func (c *Client) MachineTemplates(namespace string) MachineTemplateInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &MachineTemplateResource, MachineTemplateGroupVersionKind, machineTemplateFactory{}) - return &machineTemplateClient{ - ns: namespace, - client: c, - objectClient: objectClient, - } -} diff --git a/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go b/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go new file mode 100644 index 00000000..dc63b9d8 --- /dev/null +++ b/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go @@ -0,0 +1,40 @@ +package v1 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" +) + +type ComponentStatusLifecycle interface { + Initialize(obj *v1.ComponentStatus) error + Remove(obj *v1.ComponentStatus) error + Updated(obj *v1.ComponentStatus) error +} + +type componentStatusLifecycleAdapter struct { + lifecycle ComponentStatusLifecycle +} + +func (w *componentStatusLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*v1.ComponentStatus)) +} + +func (w *componentStatusLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*v1.ComponentStatus)) +} + +func (w *componentStatusLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*v1.ComponentStatus)) +} + +func NewComponentStatusLifecycleAdapter(name string, client ComponentStatusInterface, l ComponentStatusLifecycle) ComponentStatusHandlerFunc { + adapter := &componentStatusLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *v1.ComponentStatus) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/core/v1/zz_generated_node_lifecycle_adapter.go b/apis/core/v1/zz_generated_node_lifecycle_adapter.go new file mode 100644 index 00000000..7e27018f --- /dev/null +++ b/apis/core/v1/zz_generated_node_lifecycle_adapter.go @@ -0,0 +1,40 @@ +package v1 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" +) + +type NodeLifecycle interface { + Initialize(obj *v1.Node) error + Remove(obj *v1.Node) error + Updated(obj *v1.Node) error +} + +type nodeLifecycleAdapter struct { + lifecycle NodeLifecycle +} + +func (w *nodeLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*v1.Node)) +} + +func (w *nodeLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*v1.Node)) +} + +func (w *nodeLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*v1.Node)) +} + +func NewNodeLifecycleAdapter(name string, client NodeInterface, l NodeLifecycle) NodeHandlerFunc { + adapter := &nodeLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *v1.Node) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/core/v1/zz_generated_pod_lifecycle_adapter.go b/apis/core/v1/zz_generated_pod_lifecycle_adapter.go new file mode 100644 index 00000000..15fcd646 --- /dev/null +++ b/apis/core/v1/zz_generated_pod_lifecycle_adapter.go @@ -0,0 +1,40 @@ +package v1 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" +) + +type PodLifecycle interface { + Initialize(obj *v1.Pod) error + Remove(obj *v1.Pod) error + Updated(obj *v1.Pod) error +} + +type podLifecycleAdapter struct { + lifecycle PodLifecycle +} + +func (w *podLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*v1.Pod)) +} + +func (w *podLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*v1.Pod)) +} + +func (w *podLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*v1.Pod)) +} + +func NewPodLifecycleAdapter(name string, client PodInterface, l PodLifecycle) PodHandlerFunc { + adapter := &podLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *v1.Pod) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/cluster.cattle.io/v1/zz_generated_cluster_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go similarity index 98% rename from apis/cluster.cattle.io/v1/zz_generated_cluster_controller.go rename to apis/management.cattle.io/v3/zz_generated_cluster_controller.go index 1d0e7f9f..93de9350 100644 --- a/apis/cluster.cattle.io/v1/zz_generated_cluster_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( ClusterGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "cluster.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "Cluster", } ClusterResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_lifecycle_adapter.go new file mode 100644 index 00000000..5c12361d --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_cluster_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type ClusterLifecycle interface { + Initialize(obj *Cluster) error + Remove(obj *Cluster) error + Updated(obj *Cluster) error +} + +type clusterLifecycleAdapter struct { + lifecycle ClusterLifecycle +} + +func (w *clusterLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*Cluster)) +} + +func (w *clusterLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*Cluster)) +} + +func (w *clusterLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*Cluster)) +} + +func NewClusterLifecycleAdapter(name string, client ClusterInterface, l ClusterLifecycle) ClusterHandlerFunc { + adapter := &clusterLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *Cluster) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/authorization.cattle.io/v1/zz_generated_cluster_role_template_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go similarity index 98% rename from apis/authorization.cattle.io/v1/zz_generated_cluster_role_template_binding_controller.go rename to apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go index 08f59e38..82a59dd0 100644 --- a/apis/authorization.cattle.io/v1/zz_generated_cluster_role_template_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( ClusterRoleTemplateBindingGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "authorization.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "ClusterRoleTemplateBinding", } ClusterRoleTemplateBindingResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_lifecycle_adapter.go new file mode 100644 index 00000000..4f52c7c7 --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type ClusterRoleTemplateBindingLifecycle interface { + Initialize(obj *ClusterRoleTemplateBinding) error + Remove(obj *ClusterRoleTemplateBinding) error + Updated(obj *ClusterRoleTemplateBinding) error +} + +type clusterRoleTemplateBindingLifecycleAdapter struct { + lifecycle ClusterRoleTemplateBindingLifecycle +} + +func (w *clusterRoleTemplateBindingLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*ClusterRoleTemplateBinding)) +} + +func (w *clusterRoleTemplateBindingLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*ClusterRoleTemplateBinding)) +} + +func (w *clusterRoleTemplateBindingLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*ClusterRoleTemplateBinding)) +} + +func NewClusterRoleTemplateBindingLifecycleAdapter(name string, client ClusterRoleTemplateBindingInterface, l ClusterRoleTemplateBindingLifecycle) ClusterRoleTemplateBindingHandlerFunc { + adapter := &clusterRoleTemplateBindingLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *ClusterRoleTemplateBinding) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/authorization.cattle.io/v1/zz_generated_cluster_role_template_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_controller.go similarity index 98% rename from apis/authorization.cattle.io/v1/zz_generated_cluster_role_template_controller.go rename to apis/management.cattle.io/v3/zz_generated_cluster_role_template_controller.go index af9a4215..bbc6aded 100644 --- a/apis/authorization.cattle.io/v1/zz_generated_cluster_role_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( ClusterRoleTemplateGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "authorization.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "ClusterRoleTemplate", } ClusterRoleTemplateResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_lifecycle_adapter.go new file mode 100644 index 00000000..3e85b211 --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type ClusterRoleTemplateLifecycle interface { + Initialize(obj *ClusterRoleTemplate) error + Remove(obj *ClusterRoleTemplate) error + Updated(obj *ClusterRoleTemplate) error +} + +type clusterRoleTemplateLifecycleAdapter struct { + lifecycle ClusterRoleTemplateLifecycle +} + +func (w *clusterRoleTemplateLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*ClusterRoleTemplate)) +} + +func (w *clusterRoleTemplateLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*ClusterRoleTemplate)) +} + +func (w *clusterRoleTemplateLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*ClusterRoleTemplate)) +} + +func NewClusterRoleTemplateLifecycleAdapter(name string, client ClusterRoleTemplateInterface, l ClusterRoleTemplateLifecycle) ClusterRoleTemplateHandlerFunc { + adapter := &clusterRoleTemplateLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *ClusterRoleTemplate) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go similarity index 71% rename from apis/cluster.cattle.io/v1/zz_generated_deepcopy.go rename to apis/management.cattle.io/v3/zz_generated_deepcopy.go index 30bf3130..311e0083 100644 --- a/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -1,7 +1,8 @@ -package v1 +package v3 import ( - core_v1 "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" + rbac_v1 "k8s.io/api/rbac/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -133,7 +134,7 @@ func (in *ClusterComponentStatus) DeepCopyInto(out *ClusterComponentStatus) { *out = *in if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make([]core_v1.ComponentCondition, len(*in)) + *out = make([]v1.ComponentCondition, len(*in)) copy(*out, *in) } return @@ -200,27 +201,37 @@ func (in *ClusterList) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterNode) DeepCopyInto(out *ClusterNode) { +func (in *ClusterRoleTemplate) DeepCopyInto(out *ClusterRoleTemplate) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.NodeSpec.DeepCopyInto(&out.NodeSpec) - in.Status.DeepCopyInto(&out.Status) + if in.Rules != nil { + in, out := &in.Rules, &out.Rules + *out = make([]rbac_v1.PolicyRule, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.ClusterRoleTemplateNames != nil { + in, out := &in.ClusterRoleTemplateNames, &out.ClusterRoleTemplateNames + *out = make([]string, len(*in)) + copy(*out, *in) + } return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterNode. -func (in *ClusterNode) DeepCopy() *ClusterNode { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplate. +func (in *ClusterRoleTemplate) DeepCopy() *ClusterRoleTemplate { if in == nil { return nil } - out := new(ClusterNode) + out := new(ClusterRoleTemplate) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ClusterNode) DeepCopyObject() runtime.Object { +func (in *ClusterRoleTemplate) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } else { @@ -229,13 +240,41 @@ func (in *ClusterNode) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterNodeList) DeepCopyInto(out *ClusterNodeList) { +func (in *ClusterRoleTemplateBinding) DeepCopyInto(out *ClusterRoleTemplateBinding) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Subject = in.Subject + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplateBinding. +func (in *ClusterRoleTemplateBinding) DeepCopy() *ClusterRoleTemplateBinding { + if in == nil { + return nil + } + out := new(ClusterRoleTemplateBinding) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ClusterRoleTemplateBinding) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClusterRoleTemplateBindingList) DeepCopyInto(out *ClusterRoleTemplateBindingList) { *out = *in out.TypeMeta = in.TypeMeta out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]ClusterNode, len(*in)) + *out = make([]ClusterRoleTemplateBinding, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -243,18 +282,18 @@ func (in *ClusterNodeList) DeepCopyInto(out *ClusterNodeList) { return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterNodeList. -func (in *ClusterNodeList) DeepCopy() *ClusterNodeList { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplateBindingList. +func (in *ClusterRoleTemplateBindingList) DeepCopy() *ClusterRoleTemplateBindingList { if in == nil { return nil } - out := new(ClusterNodeList) + out := new(ClusterRoleTemplateBindingList) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ClusterNodeList) DeepCopyObject() runtime.Object { +func (in *ClusterRoleTemplateBindingList) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } else { @@ -263,36 +302,39 @@ func (in *ClusterNodeList) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ClusterNodeStatus) DeepCopyInto(out *ClusterNodeStatus) { +func (in *ClusterRoleTemplateList) DeepCopyInto(out *ClusterRoleTemplateList) { *out = *in - in.NodeStatus.DeepCopyInto(&out.NodeStatus) - if in.Requested != nil { - in, out := &in.Requested, &out.Requested - *out = make(core_v1.ResourceList, len(*in)) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } - if in.Limits != nil { - in, out := &in.Limits, &out.Limits - *out = make(core_v1.ResourceList, len(*in)) - for key, val := range *in { - (*out)[key] = val.DeepCopy() + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ClusterRoleTemplate, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) } } return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterNodeStatus. -func (in *ClusterNodeStatus) DeepCopy() *ClusterNodeStatus { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplateList. +func (in *ClusterRoleTemplateList) DeepCopy() *ClusterRoleTemplateList { if in == nil { return nil } - out := new(ClusterNodeStatus) + out := new(ClusterRoleTemplateList) in.DeepCopyInto(out) return out } +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ClusterRoleTemplateList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { *out = *in @@ -353,14 +395,14 @@ func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) { } if in.Capacity != nil { in, out := &in.Capacity, &out.Capacity - *out = make(core_v1.ResourceList, len(*in)) + *out = make(v1.ResourceList, len(*in)) for key, val := range *in { (*out)[key] = val.DeepCopy() } } if in.Allocatable != nil { in, out := &in.Allocatable, &out.Allocatable - *out = make(core_v1.ResourceList, len(*in)) + *out = make(v1.ResourceList, len(*in)) for key, val := range *in { (*out)[key] = val.DeepCopy() } @@ -368,14 +410,14 @@ func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) { in.AppliedSpec.DeepCopyInto(&out.AppliedSpec) if in.Requested != nil { in, out := &in.Requested, &out.Requested - *out = make(core_v1.ResourceList, len(*in)) + *out = make(v1.ResourceList, len(*in)) for key, val := range *in { (*out)[key] = val.DeepCopy() } } if in.Limits != nil { in, out := &in.Limits, &out.Limits - *out = make(core_v1.ResourceList, len(*in)) + *out = make(v1.ResourceList, len(*in)) for key, val := range *in { (*out)[key] = val.DeepCopy() } @@ -546,6 +588,53 @@ func (in *Machine) DeepCopyObject() runtime.Object { } } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *MachineCommonParams) DeepCopyInto(out *MachineCommonParams) { + *out = *in + if in.EngineOpt != nil { + in, out := &in.EngineOpt, &out.EngineOpt + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.EngineInsecureRegistry != nil { + in, out := &in.EngineInsecureRegistry, &out.EngineInsecureRegistry + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.EngineRegistryMirror != nil { + in, out := &in.EngineRegistryMirror, &out.EngineRegistryMirror + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.EngineLabel != nil { + in, out := &in.EngineLabel, &out.EngineLabel + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.EngineEnv != nil { + in, out := &in.EngineEnv, &out.EngineEnv + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineCommonParams. +func (in *MachineCommonParams) DeepCopy() *MachineCommonParams { + if in == nil { + return nil + } + out := new(MachineCommonParams) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MachineCondition) DeepCopyInto(out *MachineCondition) { *out = *in @@ -678,53 +767,6 @@ func (in *MachineDriverStatus) DeepCopy() *MachineDriverStatus { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineGeneralParams) DeepCopyInto(out *MachineGeneralParams) { - *out = *in - if in.EngineOpt != nil { - in, out := &in.EngineOpt, &out.EngineOpt - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - if in.EngineInsecureRegistry != nil { - in, out := &in.EngineInsecureRegistry, &out.EngineInsecureRegistry - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.EngineRegistryMirror != nil { - in, out := &in.EngineRegistryMirror, &out.EngineRegistryMirror - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.EngineLabel != nil { - in, out := &in.EngineLabel, &out.EngineLabel - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - if in.EngineEnv != nil { - in, out := &in.EngineEnv, &out.EngineEnv - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineGeneralParams. -func (in *MachineGeneralParams) DeepCopy() *MachineGeneralParams { - if in == nil { - return nil - } - out := new(MachineGeneralParams) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MachineList) DeepCopyInto(out *MachineList) { *out = *in @@ -762,7 +804,8 @@ func (in *MachineList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MachineSpec) DeepCopyInto(out *MachineSpec) { *out = *in - in.MachineGeneralParams.DeepCopyInto(&out.MachineGeneralParams) + in.NodeSpec.DeepCopyInto(&out.NodeSpec) + in.MachineCommonParams.DeepCopyInto(&out.MachineCommonParams) out.AmazonEC2Config = in.AmazonEC2Config out.AzureConfig = in.AzureConfig out.DigitalOceanConfig = in.DigitalOceanConfig @@ -787,6 +830,21 @@ func (in *MachineStatus) DeepCopyInto(out *MachineStatus) { *out = make([]MachineCondition, len(*in)) copy(*out, *in) } + in.NodeStatus.DeepCopyInto(&out.NodeStatus) + if in.Requested != nil { + in, out := &in.Requested, &out.Requested + *out = make(v1.ResourceList, len(*in)) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } + if in.Limits != nil { + in, out := &in.Limits, &out.Limits + *out = make(v1.ResourceList, len(*in)) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } return } @@ -953,6 +1011,281 @@ func (in *NetworkConfig) DeepCopy() *NetworkConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PodSecurityPolicyTemplate) DeepCopyInto(out *PodSecurityPolicyTemplate) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSecurityPolicyTemplate. +func (in *PodSecurityPolicyTemplate) DeepCopy() *PodSecurityPolicyTemplate { + if in == nil { + return nil + } + out := new(PodSecurityPolicyTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *PodSecurityPolicyTemplate) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PodSecurityPolicyTemplateList) DeepCopyInto(out *PodSecurityPolicyTemplateList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PodSecurityPolicyTemplate, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSecurityPolicyTemplateList. +func (in *PodSecurityPolicyTemplateList) DeepCopy() *PodSecurityPolicyTemplateList { + if in == nil { + return nil + } + out := new(PodSecurityPolicyTemplateList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *PodSecurityPolicyTemplateList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Project) DeepCopyInto(out *Project) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Project. +func (in *Project) DeepCopy() *Project { + if in == nil { + return nil + } + out := new(Project) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Project) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProjectList) DeepCopyInto(out *ProjectList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Project, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectList. +func (in *ProjectList) DeepCopy() *ProjectList { + if in == nil { + return nil + } + out := new(ProjectList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ProjectList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProjectRoleTemplate) DeepCopyInto(out *ProjectRoleTemplate) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + if in.Rules != nil { + in, out := &in.Rules, &out.Rules + *out = make([]rbac_v1.PolicyRule, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.ProjectRoleTemplateNames != nil { + in, out := &in.ProjectRoleTemplateNames, &out.ProjectRoleTemplateNames + *out = make([]string, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplate. +func (in *ProjectRoleTemplate) DeepCopy() *ProjectRoleTemplate { + if in == nil { + return nil + } + out := new(ProjectRoleTemplate) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ProjectRoleTemplate) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProjectRoleTemplateBinding) DeepCopyInto(out *ProjectRoleTemplateBinding) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Subject = in.Subject + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplateBinding. +func (in *ProjectRoleTemplateBinding) DeepCopy() *ProjectRoleTemplateBinding { + if in == nil { + return nil + } + out := new(ProjectRoleTemplateBinding) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ProjectRoleTemplateBinding) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProjectRoleTemplateBindingList) DeepCopyInto(out *ProjectRoleTemplateBindingList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ProjectRoleTemplateBinding, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplateBindingList. +func (in *ProjectRoleTemplateBindingList) DeepCopy() *ProjectRoleTemplateBindingList { + if in == nil { + return nil + } + out := new(ProjectRoleTemplateBindingList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ProjectRoleTemplateBindingList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProjectRoleTemplateList) DeepCopyInto(out *ProjectRoleTemplateList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ProjectRoleTemplate, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplateList. +func (in *ProjectRoleTemplateList) DeepCopy() *ProjectRoleTemplateList { + if in == nil { + return nil + } + out := new(ProjectRoleTemplateList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *ProjectRoleTemplateList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } else { + return nil + } +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProjectSpec) DeepCopyInto(out *ProjectSpec) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectSpec. +func (in *ProjectSpec) DeepCopy() *ProjectSpec { + if in == nil { + return nil + } + out := new(ProjectSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RKEConfigNode) DeepCopyInto(out *RKEConfigNode) { *out = *in diff --git a/apis/authorization.cattle.io/v1/zz_generated_k8s_client.go b/apis/management.cattle.io/v3/zz_generated_k8s_client.go similarity index 69% rename from apis/authorization.cattle.io/v1/zz_generated_k8s_client.go rename to apis/management.cattle.io/v3/zz_generated_k8s_client.go index 2e58650a..f9a32144 100644 --- a/apis/authorization.cattle.io/v1/zz_generated_k8s_client.go +++ b/apis/management.cattle.io/v3/zz_generated_k8s_client.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -14,12 +14,16 @@ type Interface interface { RESTClient() rest.Interface controller.Starter + MachinesGetter + MachineDriversGetter + MachineTemplatesGetter ProjectsGetter ProjectRoleTemplatesGetter PodSecurityPolicyTemplatesGetter ClusterRoleTemplatesGetter ClusterRoleTemplateBindingsGetter ProjectRoleTemplateBindingsGetter + ClustersGetter } type Client struct { @@ -27,12 +31,16 @@ type Client struct { restClient rest.Interface starters []controller.Starter + machineControllers map[string]MachineController + machineDriverControllers map[string]MachineDriverController + machineTemplateControllers map[string]MachineTemplateController projectControllers map[string]ProjectController projectRoleTemplateControllers map[string]ProjectRoleTemplateController podSecurityPolicyTemplateControllers map[string]PodSecurityPolicyTemplateController clusterRoleTemplateControllers map[string]ClusterRoleTemplateController clusterRoleTemplateBindingControllers map[string]ClusterRoleTemplateBindingController projectRoleTemplateBindingControllers map[string]ProjectRoleTemplateBindingController + clusterControllers map[string]ClusterController } func NewForConfig(config rest.Config) (Interface, error) { @@ -49,12 +57,16 @@ func NewForConfig(config rest.Config) (Interface, error) { return &Client{ restClient: restClient, + machineControllers: map[string]MachineController{}, + machineDriverControllers: map[string]MachineDriverController{}, + machineTemplateControllers: map[string]MachineTemplateController{}, projectControllers: map[string]ProjectController{}, projectRoleTemplateControllers: map[string]ProjectRoleTemplateController{}, podSecurityPolicyTemplateControllers: map[string]PodSecurityPolicyTemplateController{}, clusterRoleTemplateControllers: map[string]ClusterRoleTemplateController{}, clusterRoleTemplateBindingControllers: map[string]ClusterRoleTemplateBindingController{}, projectRoleTemplateBindingControllers: map[string]ProjectRoleTemplateBindingController{}, + clusterControllers: map[string]ClusterController{}, }, nil } @@ -70,6 +82,45 @@ func (c *Client) Start(ctx context.Context, threadiness int) error { return controller.Start(ctx, threadiness, c.starters...) } +type MachinesGetter interface { + Machines(namespace string) MachineInterface +} + +func (c *Client) Machines(namespace string) MachineInterface { + objectClient := clientbase.NewObjectClient(namespace, c.restClient, &MachineResource, MachineGroupVersionKind, machineFactory{}) + return &machineClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} + +type MachineDriversGetter interface { + MachineDrivers(namespace string) MachineDriverInterface +} + +func (c *Client) MachineDrivers(namespace string) MachineDriverInterface { + objectClient := clientbase.NewObjectClient(namespace, c.restClient, &MachineDriverResource, MachineDriverGroupVersionKind, machineDriverFactory{}) + return &machineDriverClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} + +type MachineTemplatesGetter interface { + MachineTemplates(namespace string) MachineTemplateInterface +} + +func (c *Client) MachineTemplates(namespace string) MachineTemplateInterface { + objectClient := clientbase.NewObjectClient(namespace, c.restClient, &MachineTemplateResource, MachineTemplateGroupVersionKind, machineTemplateFactory{}) + return &machineTemplateClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} + type ProjectsGetter interface { Projects(namespace string) ProjectInterface } @@ -147,3 +198,16 @@ func (c *Client) ProjectRoleTemplateBindings(namespace string) ProjectRoleTempla objectClient: objectClient, } } + +type ClustersGetter interface { + Clusters(namespace string) ClusterInterface +} + +func (c *Client) Clusters(namespace string) ClusterInterface { + objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterResource, ClusterGroupVersionKind, clusterFactory{}) + return &clusterClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} diff --git a/apis/cluster.cattle.io/v1/zz_generated_machine_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_controller.go similarity index 98% rename from apis/cluster.cattle.io/v1/zz_generated_machine_controller.go rename to apis/management.cattle.io/v3/zz_generated_machine_controller.go index 49d1531c..2740bc72 100644 --- a/apis/cluster.cattle.io/v1/zz_generated_machine_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( MachineGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "cluster.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "Machine", } MachineResource = metav1.APIResource{ diff --git a/apis/cluster.cattle.io/v1/zz_generated_machine_driver_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go similarity index 98% rename from apis/cluster.cattle.io/v1/zz_generated_machine_driver_controller.go rename to apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go index fcdb51cf..2b66c24c 100644 --- a/apis/cluster.cattle.io/v1/zz_generated_machine_driver_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( MachineDriverGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "cluster.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "MachineDriver", } MachineDriverResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_machine_driver_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_machine_driver_lifecycle_adapter.go new file mode 100644 index 00000000..a60c9b1b --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_machine_driver_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type MachineDriverLifecycle interface { + Initialize(obj *MachineDriver) error + Remove(obj *MachineDriver) error + Updated(obj *MachineDriver) error +} + +type machineDriverLifecycleAdapter struct { + lifecycle MachineDriverLifecycle +} + +func (w *machineDriverLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*MachineDriver)) +} + +func (w *machineDriverLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*MachineDriver)) +} + +func (w *machineDriverLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*MachineDriver)) +} + +func NewMachineDriverLifecycleAdapter(name string, client MachineDriverInterface, l MachineDriverLifecycle) MachineDriverHandlerFunc { + adapter := &machineDriverLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *MachineDriver) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/management.cattle.io/v3/zz_generated_machine_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_machine_lifecycle_adapter.go new file mode 100644 index 00000000..f6af0b55 --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_machine_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type MachineLifecycle interface { + Initialize(obj *Machine) error + Remove(obj *Machine) error + Updated(obj *Machine) error +} + +type machineLifecycleAdapter struct { + lifecycle MachineLifecycle +} + +func (w *machineLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*Machine)) +} + +func (w *machineLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*Machine)) +} + +func (w *machineLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*Machine)) +} + +func NewMachineLifecycleAdapter(name string, client MachineInterface, l MachineLifecycle) MachineHandlerFunc { + adapter := &machineLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *Machine) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/cluster.cattle.io/v1/zz_generated_machine_template_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go similarity index 98% rename from apis/cluster.cattle.io/v1/zz_generated_machine_template_controller.go rename to apis/management.cattle.io/v3/zz_generated_machine_template_controller.go index 2088341d..fbce768a 100644 --- a/apis/cluster.cattle.io/v1/zz_generated_machine_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( MachineTemplateGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "cluster.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "MachineTemplate", } MachineTemplateResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_machine_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_machine_template_lifecycle_adapter.go new file mode 100644 index 00000000..052e80e5 --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_machine_template_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type MachineTemplateLifecycle interface { + Initialize(obj *MachineTemplate) error + Remove(obj *MachineTemplate) error + Updated(obj *MachineTemplate) error +} + +type machineTemplateLifecycleAdapter struct { + lifecycle MachineTemplateLifecycle +} + +func (w *machineTemplateLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*MachineTemplate)) +} + +func (w *machineTemplateLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*MachineTemplate)) +} + +func (w *machineTemplateLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*MachineTemplate)) +} + +func NewMachineTemplateLifecycleAdapter(name string, client MachineTemplateInterface, l MachineTemplateLifecycle) MachineTemplateHandlerFunc { + adapter := &machineTemplateLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *MachineTemplate) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/authorization.cattle.io/v1/zz_generated_pod_security_policy_template_controller.go b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go similarity index 98% rename from apis/authorization.cattle.io/v1/zz_generated_pod_security_policy_template_controller.go rename to apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go index 65c9391e..f7fd7b10 100644 --- a/apis/authorization.cattle.io/v1/zz_generated_pod_security_policy_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( PodSecurityPolicyTemplateGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "authorization.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "PodSecurityPolicyTemplate", } PodSecurityPolicyTemplateResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_lifecycle_adapter.go new file mode 100644 index 00000000..23aa5aee --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type PodSecurityPolicyTemplateLifecycle interface { + Initialize(obj *PodSecurityPolicyTemplate) error + Remove(obj *PodSecurityPolicyTemplate) error + Updated(obj *PodSecurityPolicyTemplate) error +} + +type podSecurityPolicyTemplateLifecycleAdapter struct { + lifecycle PodSecurityPolicyTemplateLifecycle +} + +func (w *podSecurityPolicyTemplateLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*PodSecurityPolicyTemplate)) +} + +func (w *podSecurityPolicyTemplateLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*PodSecurityPolicyTemplate)) +} + +func (w *podSecurityPolicyTemplateLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*PodSecurityPolicyTemplate)) +} + +func NewPodSecurityPolicyTemplateLifecycleAdapter(name string, client PodSecurityPolicyTemplateInterface, l PodSecurityPolicyTemplateLifecycle) PodSecurityPolicyTemplateHandlerFunc { + adapter := &podSecurityPolicyTemplateLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *PodSecurityPolicyTemplate) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/authorization.cattle.io/v1/zz_generated_project_controller.go b/apis/management.cattle.io/v3/zz_generated_project_controller.go similarity index 98% rename from apis/authorization.cattle.io/v1/zz_generated_project_controller.go rename to apis/management.cattle.io/v3/zz_generated_project_controller.go index 2ff22e65..1e49f2e9 100644 --- a/apis/authorization.cattle.io/v1/zz_generated_project_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( ProjectGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "authorization.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "Project", } ProjectResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_project_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_lifecycle_adapter.go new file mode 100644 index 00000000..4352c71b --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_project_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type ProjectLifecycle interface { + Initialize(obj *Project) error + Remove(obj *Project) error + Updated(obj *Project) error +} + +type projectLifecycleAdapter struct { + lifecycle ProjectLifecycle +} + +func (w *projectLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*Project)) +} + +func (w *projectLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*Project)) +} + +func (w *projectLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*Project)) +} + +func NewProjectLifecycleAdapter(name string, client ProjectInterface, l ProjectLifecycle) ProjectHandlerFunc { + adapter := &projectLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *Project) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/authorization.cattle.io/v1/zz_generated_project_role_template_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go similarity index 98% rename from apis/authorization.cattle.io/v1/zz_generated_project_role_template_binding_controller.go rename to apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go index 6b44a4cd..80ef8758 100644 --- a/apis/authorization.cattle.io/v1/zz_generated_project_role_template_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( ProjectRoleTemplateBindingGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "authorization.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "ProjectRoleTemplateBinding", } ProjectRoleTemplateBindingResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_lifecycle_adapter.go new file mode 100644 index 00000000..136da7e3 --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type ProjectRoleTemplateBindingLifecycle interface { + Initialize(obj *ProjectRoleTemplateBinding) error + Remove(obj *ProjectRoleTemplateBinding) error + Updated(obj *ProjectRoleTemplateBinding) error +} + +type projectRoleTemplateBindingLifecycleAdapter struct { + lifecycle ProjectRoleTemplateBindingLifecycle +} + +func (w *projectRoleTemplateBindingLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*ProjectRoleTemplateBinding)) +} + +func (w *projectRoleTemplateBindingLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*ProjectRoleTemplateBinding)) +} + +func (w *projectRoleTemplateBindingLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*ProjectRoleTemplateBinding)) +} + +func NewProjectRoleTemplateBindingLifecycleAdapter(name string, client ProjectRoleTemplateBindingInterface, l ProjectRoleTemplateBindingLifecycle) ProjectRoleTemplateBindingHandlerFunc { + adapter := &projectRoleTemplateBindingLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *ProjectRoleTemplateBinding) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/authorization.cattle.io/v1/zz_generated_project_role_template_controller.go b/apis/management.cattle.io/v3/zz_generated_project_role_template_controller.go similarity index 98% rename from apis/authorization.cattle.io/v1/zz_generated_project_role_template_controller.go rename to apis/management.cattle.io/v3/zz_generated_project_role_template_controller.go index f113a0b0..6ba46c0d 100644 --- a/apis/authorization.cattle.io/v1/zz_generated_project_role_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_role_template_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( ProjectRoleTemplateGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "authorization.cattle.io", + Version: "v3", + Group: "management.cattle.io", Kind: "ProjectRoleTemplate", } ProjectRoleTemplateResource = metav1.APIResource{ diff --git a/apis/management.cattle.io/v3/zz_generated_project_role_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_role_template_lifecycle_adapter.go new file mode 100644 index 00000000..44974958 --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_project_role_template_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type ProjectRoleTemplateLifecycle interface { + Initialize(obj *ProjectRoleTemplate) error + Remove(obj *ProjectRoleTemplate) error + Updated(obj *ProjectRoleTemplate) error +} + +type projectRoleTemplateLifecycleAdapter struct { + lifecycle ProjectRoleTemplateLifecycle +} + +func (w *projectRoleTemplateLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*ProjectRoleTemplate)) +} + +func (w *projectRoleTemplateLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*ProjectRoleTemplate)) +} + +func (w *projectRoleTemplateLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*ProjectRoleTemplate)) +} + +func NewProjectRoleTemplateLifecycleAdapter(name string, client ProjectRoleTemplateInterface, l ProjectRoleTemplateLifecycle) ProjectRoleTemplateHandlerFunc { + adapter := &projectRoleTemplateLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *ProjectRoleTemplate) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/workload.cattle.io/v1/zz_generated_deepcopy.go b/apis/project.cattle.io/v3/zz_generated_deepcopy.go similarity index 99% rename from apis/workload.cattle.io/v1/zz_generated_deepcopy.go rename to apis/project.cattle.io/v3/zz_generated_deepcopy.go index d5a5a6e0..29bde3c7 100644 --- a/apis/workload.cattle.io/v1/zz_generated_deepcopy.go +++ b/apis/project.cattle.io/v3/zz_generated_deepcopy.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/apis/workload.cattle.io/v1/zz_generated_k8s_client.go b/apis/project.cattle.io/v3/zz_generated_k8s_client.go similarity index 99% rename from apis/workload.cattle.io/v1/zz_generated_k8s_client.go rename to apis/project.cattle.io/v3/zz_generated_k8s_client.go index 713a5a7e..746e1a6c 100644 --- a/apis/workload.cattle.io/v1/zz_generated_k8s_client.go +++ b/apis/project.cattle.io/v3/zz_generated_k8s_client.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" diff --git a/apis/workload.cattle.io/v1/zz_generated_workload_controller.go b/apis/project.cattle.io/v3/zz_generated_workload_controller.go similarity index 98% rename from apis/workload.cattle.io/v1/zz_generated_workload_controller.go rename to apis/project.cattle.io/v3/zz_generated_workload_controller.go index 7192aea2..e15f381e 100644 --- a/apis/workload.cattle.io/v1/zz_generated_workload_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_workload_controller.go @@ -1,4 +1,4 @@ -package v1 +package v3 import ( "context" @@ -16,8 +16,8 @@ import ( var ( WorkloadGroupVersionKind = schema.GroupVersionKind{ - Version: "v1", - Group: "workload.cattle.io", + Version: "v3", + Group: "project.cattle.io", Kind: "Workload", } WorkloadResource = metav1.APIResource{ diff --git a/apis/project.cattle.io/v3/zz_generated_workload_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_workload_lifecycle_adapter.go new file mode 100644 index 00000000..80209705 --- /dev/null +++ b/apis/project.cattle.io/v3/zz_generated_workload_lifecycle_adapter.go @@ -0,0 +1,39 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type WorkloadLifecycle interface { + Initialize(obj *Workload) error + Remove(obj *Workload) error + Updated(obj *Workload) error +} + +type workloadLifecycleAdapter struct { + lifecycle WorkloadLifecycle +} + +func (w *workloadLifecycleAdapter) Initialize(obj runtime.Object) error { + return w.lifecycle.Initialize(obj.(*Workload)) +} + +func (w *workloadLifecycleAdapter) Finalize(obj runtime.Object) error { + return w.lifecycle.Remove(obj.(*Workload)) +} + +func (w *workloadLifecycleAdapter) Updated(obj runtime.Object) error { + return w.lifecycle.Updated(obj.(*Workload)) +} + +func NewWorkloadLifecycleAdapter(name string, client WorkloadInterface, l WorkloadLifecycle) WorkloadHandlerFunc { + adapter := &workloadLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient()) + return func(key string, obj *Workload) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/client/cluster/v1/zz_generated_attached_volume.go b/client/cluster/v1/zz_generated_attached_volume.go deleted file mode 100644 index 93599337..00000000 --- a/client/cluster/v1/zz_generated_attached_volume.go +++ /dev/null @@ -1,12 +0,0 @@ -package client - -const ( - AttachedVolumeType = "attachedVolume" - AttachedVolumeFieldDevicePath = "devicePath" - AttachedVolumeFieldName = "name" -) - -type AttachedVolume struct { - DevicePath string `json:"devicePath,omitempty"` - Name string `json:"name,omitempty"` -} diff --git a/client/cluster/v1/zz_generated_client.go b/client/cluster/v1/zz_generated_client.go deleted file mode 100644 index e5bae2fe..00000000 --- a/client/cluster/v1/zz_generated_client.go +++ /dev/null @@ -1,34 +0,0 @@ -package client - -import ( - "github.com/rancher/norman/clientbase" -) - -type Client struct { - clientbase.APIBaseClient - - Cluster ClusterOperations - ClusterNode ClusterNodeOperations - Machine MachineOperations - MachineDriver MachineDriverOperations - MachineTemplate MachineTemplateOperations -} - -func NewClient(opts *clientbase.ClientOpts) (*Client, error) { - baseClient, err := clientbase.NewAPIClient(opts) - if err != nil { - return nil, err - } - - client := &Client{ - APIBaseClient: baseClient, - } - - client.Cluster = newClusterClient(client) - client.ClusterNode = newClusterNodeClient(client) - client.Machine = newMachineClient(client) - client.MachineDriver = newMachineDriverClient(client) - client.MachineTemplate = newMachineTemplateClient(client) - - return client, nil -} diff --git a/client/cluster/v1/zz_generated_cluster_node.go b/client/cluster/v1/zz_generated_cluster_node.go deleted file mode 100644 index 7521753a..00000000 --- a/client/cluster/v1/zz_generated_cluster_node.go +++ /dev/null @@ -1,115 +0,0 @@ -package client - -import ( - "github.com/rancher/norman/types" -) - -const ( - ClusterNodeType = "clusterNode" - ClusterNodeFieldAnnotations = "annotations" - ClusterNodeFieldClusterName = "clusterName" - ClusterNodeFieldConfigSource = "configSource" - ClusterNodeFieldCreated = "created" - ClusterNodeFieldExternalID = "externalID" - ClusterNodeFieldLabels = "labels" - ClusterNodeFieldName = "name" - ClusterNodeFieldNodeName = "nodeName" - ClusterNodeFieldOwnerReferences = "ownerReferences" - ClusterNodeFieldPodCIDR = "podCIDR" - ClusterNodeFieldProviderID = "providerID" - ClusterNodeFieldRemoved = "removed" - ClusterNodeFieldResourcePath = "resourcePath" - ClusterNodeFieldState = "state" - ClusterNodeFieldStatus = "status" - ClusterNodeFieldTaints = "taints" - ClusterNodeFieldTransitioning = "transitioning" - ClusterNodeFieldTransitioningMessage = "transitioningMessage" - ClusterNodeFieldUnschedulable = "unschedulable" - ClusterNodeFieldUuid = "uuid" -) - -type ClusterNode struct { - types.Resource - Annotations map[string]string `json:"annotations,omitempty"` - ClusterName string `json:"clusterName,omitempty"` - ConfigSource *NodeConfigSource `json:"configSource,omitempty"` - Created string `json:"created,omitempty"` - ExternalID string `json:"externalID,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - Name string `json:"name,omitempty"` - NodeName string `json:"nodeName,omitempty"` - OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` - PodCIDR string `json:"podCIDR,omitempty"` - ProviderID string `json:"providerID,omitempty"` - Removed string `json:"removed,omitempty"` - ResourcePath string `json:"resourcePath,omitempty"` - State string `json:"state,omitempty"` - Status *ClusterNodeStatus `json:"status,omitempty"` - Taints []Taint `json:"taints,omitempty"` - Transitioning string `json:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty"` - Unschedulable *bool `json:"unschedulable,omitempty"` - Uuid string `json:"uuid,omitempty"` -} -type ClusterNodeCollection struct { - types.Collection - Data []ClusterNode `json:"data,omitempty"` - client *ClusterNodeClient -} - -type ClusterNodeClient struct { - apiClient *Client -} - -type ClusterNodeOperations interface { - List(opts *types.ListOpts) (*ClusterNodeCollection, error) - Create(opts *ClusterNode) (*ClusterNode, error) - Update(existing *ClusterNode, updates interface{}) (*ClusterNode, error) - ByID(id string) (*ClusterNode, error) - Delete(container *ClusterNode) error -} - -func newClusterNodeClient(apiClient *Client) *ClusterNodeClient { - return &ClusterNodeClient{ - apiClient: apiClient, - } -} - -func (c *ClusterNodeClient) Create(container *ClusterNode) (*ClusterNode, error) { - resp := &ClusterNode{} - err := c.apiClient.Ops.DoCreate(ClusterNodeType, container, resp) - return resp, err -} - -func (c *ClusterNodeClient) Update(existing *ClusterNode, updates interface{}) (*ClusterNode, error) { - resp := &ClusterNode{} - err := c.apiClient.Ops.DoUpdate(ClusterNodeType, &existing.Resource, updates, resp) - return resp, err -} - -func (c *ClusterNodeClient) List(opts *types.ListOpts) (*ClusterNodeCollection, error) { - resp := &ClusterNodeCollection{} - err := c.apiClient.Ops.DoList(ClusterNodeType, opts, resp) - resp.client = c - return resp, err -} - -func (cc *ClusterNodeCollection) Next() (*ClusterNodeCollection, error) { - if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { - resp := &ClusterNodeCollection{} - err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) - resp.client = cc.client - return resp, err - } - return nil, nil -} - -func (c *ClusterNodeClient) ByID(id string) (*ClusterNode, error) { - resp := &ClusterNode{} - err := c.apiClient.Ops.DoByID(ClusterNodeType, id, resp) - return resp, err -} - -func (c *ClusterNodeClient) Delete(container *ClusterNode) error { - return c.apiClient.Ops.DoResourceDelete(ClusterNodeType, &container.Resource) -} diff --git a/client/cluster/v1/zz_generated_cluster_node_status.go b/client/cluster/v1/zz_generated_cluster_node_status.go deleted file mode 100644 index e2327502..00000000 --- a/client/cluster/v1/zz_generated_cluster_node_status.go +++ /dev/null @@ -1,32 +0,0 @@ -package client - -const ( - ClusterNodeStatusType = "clusterNodeStatus" - ClusterNodeStatusFieldAddresses = "addresses" - ClusterNodeStatusFieldAllocatable = "allocatable" - ClusterNodeStatusFieldCapacity = "capacity" - ClusterNodeStatusFieldConditions = "conditions" - ClusterNodeStatusFieldDaemonEndpoints = "daemonEndpoints" - ClusterNodeStatusFieldImages = "images" - ClusterNodeStatusFieldLimits = "limits" - ClusterNodeStatusFieldNodeInfo = "nodeInfo" - ClusterNodeStatusFieldPhase = "phase" - ClusterNodeStatusFieldRequested = "requested" - ClusterNodeStatusFieldVolumesAttached = "volumesAttached" - ClusterNodeStatusFieldVolumesInUse = "volumesInUse" -) - -type ClusterNodeStatus struct { - Addresses []NodeAddress `json:"addresses,omitempty"` - Allocatable map[string]string `json:"allocatable,omitempty"` - Capacity map[string]string `json:"capacity,omitempty"` - Conditions []NodeCondition `json:"conditions,omitempty"` - DaemonEndpoints *NodeDaemonEndpoints `json:"daemonEndpoints,omitempty"` - Images []ContainerImage `json:"images,omitempty"` - Limits map[string]string `json:"limits,omitempty"` - NodeInfo *NodeSystemInfo `json:"nodeInfo,omitempty"` - Phase string `json:"phase,omitempty"` - Requested map[string]string `json:"requested,omitempty"` - VolumesAttached []AttachedVolume `json:"volumesAttached,omitempty"` - VolumesInUse []string `json:"volumesInUse,omitempty"` -} diff --git a/client/cluster/v1/zz_generated_machine.go b/client/cluster/v1/zz_generated_machine.go deleted file mode 100644 index 2dad93e3..00000000 --- a/client/cluster/v1/zz_generated_machine.go +++ /dev/null @@ -1,139 +0,0 @@ -package client - -import ( - "github.com/rancher/norman/types" -) - -const ( - MachineType = "machine" - MachineFieldAmazonEC2Config = "amazonEc2Config" - MachineFieldAnnotations = "annotations" - MachineFieldAuthCertificateAuthority = "authCertificateAuthority" - MachineFieldAuthKey = "authKey" - MachineFieldAzureConfig = "azureConfig" - MachineFieldClusterId = "clusterId" - MachineFieldCreated = "created" - MachineFieldDescription = "description" - MachineFieldDigitalOceanConfig = "digitalOceanConfig" - MachineFieldDockerVersion = "dockerVersion" - MachineFieldDriver = "driver" - MachineFieldEngineEnv = "engineEnv" - MachineFieldEngineInsecureRegistry = "engineInsecureRegistry" - MachineFieldEngineInstallURL = "engineInstallURL" - MachineFieldEngineLabel = "engineLabel" - MachineFieldEngineOpt = "engineOpt" - MachineFieldEngineRegistryMirror = "engineRegistryMirror" - MachineFieldEngineStorageDriver = "engineStorageDriver" - MachineFieldExternalID = "externalId" - MachineFieldHostname = "hostname" - MachineFieldId = "id" - MachineFieldLabels = "labels" - MachineFieldMachineTemplateId = "machineTemplateId" - MachineFieldName = "name" - MachineFieldOwnerReferences = "ownerReferences" - MachineFieldRemoved = "removed" - MachineFieldResourcePath = "resourcePath" - MachineFieldState = "state" - MachineFieldStatus = "status" - MachineFieldTransitioning = "transitioning" - MachineFieldTransitioningMessage = "transitioningMessage" - MachineFieldUuid = "uuid" -) - -type Machine struct { - types.Resource - AmazonEC2Config *AmazonEC2Config `json:"amazonEc2Config,omitempty"` - Annotations map[string]string `json:"annotations,omitempty"` - AuthCertificateAuthority string `json:"authCertificateAuthority,omitempty"` - AuthKey string `json:"authKey,omitempty"` - AzureConfig *AzureConfig `json:"azureConfig,omitempty"` - ClusterId string `json:"clusterId,omitempty"` - Created string `json:"created,omitempty"` - Description string `json:"description,omitempty"` - DigitalOceanConfig *DigitalOceanConfig `json:"digitalOceanConfig,omitempty"` - DockerVersion string `json:"dockerVersion,omitempty"` - Driver string `json:"driver,omitempty"` - EngineEnv map[string]string `json:"engineEnv,omitempty"` - EngineInsecureRegistry []string `json:"engineInsecureRegistry,omitempty"` - EngineInstallURL string `json:"engineInstallURL,omitempty"` - EngineLabel map[string]string `json:"engineLabel,omitempty"` - EngineOpt map[string]string `json:"engineOpt,omitempty"` - EngineRegistryMirror []string `json:"engineRegistryMirror,omitempty"` - EngineStorageDriver string `json:"engineStorageDriver,omitempty"` - ExternalID string `json:"externalId,omitempty"` - Hostname string `json:"hostname,omitempty"` - Id string `json:"id,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - MachineTemplateId string `json:"machineTemplateId,omitempty"` - Name string `json:"name,omitempty"` - OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` - Removed string `json:"removed,omitempty"` - ResourcePath string `json:"resourcePath,omitempty"` - State string `json:"state,omitempty"` - Status *MachineStatus `json:"status,omitempty"` - Transitioning string `json:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty"` - Uuid string `json:"uuid,omitempty"` -} -type MachineCollection struct { - types.Collection - Data []Machine `json:"data,omitempty"` - client *MachineClient -} - -type MachineClient struct { - apiClient *Client -} - -type MachineOperations interface { - List(opts *types.ListOpts) (*MachineCollection, error) - Create(opts *Machine) (*Machine, error) - Update(existing *Machine, updates interface{}) (*Machine, error) - ByID(id string) (*Machine, error) - Delete(container *Machine) error -} - -func newMachineClient(apiClient *Client) *MachineClient { - return &MachineClient{ - apiClient: apiClient, - } -} - -func (c *MachineClient) Create(container *Machine) (*Machine, error) { - resp := &Machine{} - err := c.apiClient.Ops.DoCreate(MachineType, container, resp) - return resp, err -} - -func (c *MachineClient) Update(existing *Machine, updates interface{}) (*Machine, error) { - resp := &Machine{} - err := c.apiClient.Ops.DoUpdate(MachineType, &existing.Resource, updates, resp) - return resp, err -} - -func (c *MachineClient) List(opts *types.ListOpts) (*MachineCollection, error) { - resp := &MachineCollection{} - err := c.apiClient.Ops.DoList(MachineType, opts, resp) - resp.client = c - return resp, err -} - -func (cc *MachineCollection) Next() (*MachineCollection, error) { - if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { - resp := &MachineCollection{} - err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) - resp.client = cc.client - return resp, err - } - return nil, nil -} - -func (c *MachineClient) ByID(id string) (*Machine, error) { - resp := &Machine{} - err := c.apiClient.Ops.DoByID(MachineType, id, resp) - return resp, err -} - -func (c *MachineClient) Delete(container *Machine) error { - return c.apiClient.Ops.DoResourceDelete(MachineType, &container.Resource) -} diff --git a/client/cluster/v1/zz_generated_machine_status.go b/client/cluster/v1/zz_generated_machine_status.go deleted file mode 100644 index 44ae56e1..00000000 --- a/client/cluster/v1/zz_generated_machine_status.go +++ /dev/null @@ -1,10 +0,0 @@ -package client - -const ( - MachineStatusType = "machineStatus" - MachineStatusFieldConditions = "conditions" -) - -type MachineStatus struct { - Conditions []MachineCondition `json:"conditions,omitempty"` -} diff --git a/client/workload/v1/zz_generated_attached_volume.go b/client/cluster/v3/zz_generated_attached_volume.go similarity index 100% rename from client/workload/v1/zz_generated_attached_volume.go rename to client/cluster/v3/zz_generated_attached_volume.go diff --git a/client/cluster/v3/zz_generated_client.go b/client/cluster/v3/zz_generated_client.go new file mode 100644 index 00000000..6ba42856 --- /dev/null +++ b/client/cluster/v3/zz_generated_client.go @@ -0,0 +1,26 @@ +package client + +import ( + "github.com/rancher/norman/clientbase" +) + +type Client struct { + clientbase.APIBaseClient + + Node NodeOperations +} + +func NewClient(opts *clientbase.ClientOpts) (*Client, error) { + baseClient, err := clientbase.NewAPIClient(opts) + if err != nil { + return nil, err + } + + client := &Client{ + APIBaseClient: baseClient, + } + + client.Node = newNodeClient(client) + + return client, nil +} diff --git a/client/cluster/v1/zz_generated_container_image.go b/client/cluster/v3/zz_generated_container_image.go similarity index 100% rename from client/cluster/v1/zz_generated_container_image.go rename to client/cluster/v3/zz_generated_container_image.go diff --git a/client/workload/v1/zz_generated_cpu_info.go b/client/cluster/v3/zz_generated_cpu_info.go similarity index 100% rename from client/workload/v1/zz_generated_cpu_info.go rename to client/cluster/v3/zz_generated_cpu_info.go diff --git a/client/cluster/v1/zz_generated_daemon_endpoint.go b/client/cluster/v3/zz_generated_daemon_endpoint.go similarity index 100% rename from client/cluster/v1/zz_generated_daemon_endpoint.go rename to client/cluster/v3/zz_generated_daemon_endpoint.go diff --git a/client/authorization/v1/zz_generated_initializer.go b/client/cluster/v3/zz_generated_initializer.go similarity index 100% rename from client/authorization/v1/zz_generated_initializer.go rename to client/cluster/v3/zz_generated_initializer.go diff --git a/client/authorization/v1/zz_generated_initializers.go b/client/cluster/v3/zz_generated_initializers.go similarity index 100% rename from client/authorization/v1/zz_generated_initializers.go rename to client/cluster/v3/zz_generated_initializers.go diff --git a/client/workload/v1/zz_generated_kubernetes_info.go b/client/cluster/v3/zz_generated_kubernetes_info.go similarity index 100% rename from client/workload/v1/zz_generated_kubernetes_info.go rename to client/cluster/v3/zz_generated_kubernetes_info.go diff --git a/client/authorization/v1/zz_generated_list_meta.go b/client/cluster/v3/zz_generated_list_meta.go similarity index 100% rename from client/authorization/v1/zz_generated_list_meta.go rename to client/cluster/v3/zz_generated_list_meta.go diff --git a/client/workload/v1/zz_generated_memory_info.go b/client/cluster/v3/zz_generated_memory_info.go similarity index 100% rename from client/workload/v1/zz_generated_memory_info.go rename to client/cluster/v3/zz_generated_memory_info.go diff --git a/client/workload/v1/zz_generated_node.go b/client/cluster/v3/zz_generated_node.go similarity index 94% rename from client/workload/v1/zz_generated_node.go rename to client/cluster/v3/zz_generated_node.go index c22f332d..686ac693 100644 --- a/client/workload/v1/zz_generated_node.go +++ b/client/cluster/v3/zz_generated_node.go @@ -11,7 +11,8 @@ const ( NodeFieldCapacity = "capacity" NodeFieldConfigSource = "configSource" NodeFieldCreated = "created" - NodeFieldExternalID = "externalID" + NodeFieldExternalId = "externalId" + NodeFieldFinalizers = "finalizers" NodeFieldHostname = "hostname" NodeFieldIPAddress = "ipAddress" NodeFieldInfo = "info" @@ -40,7 +41,8 @@ type Node struct { Capacity map[string]string `json:"capacity,omitempty"` ConfigSource *NodeConfigSource `json:"configSource,omitempty"` Created string `json:"created,omitempty"` - ExternalID string `json:"externalID,omitempty"` + ExternalId string `json:"externalId,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` Info *NodeInfo `json:"info,omitempty"` diff --git a/client/cluster/v1/zz_generated_node_address.go b/client/cluster/v3/zz_generated_node_address.go similarity index 100% rename from client/cluster/v1/zz_generated_node_address.go rename to client/cluster/v3/zz_generated_node_address.go diff --git a/client/cluster/v1/zz_generated_node_condition.go b/client/cluster/v3/zz_generated_node_condition.go similarity index 100% rename from client/cluster/v1/zz_generated_node_condition.go rename to client/cluster/v3/zz_generated_node_condition.go diff --git a/client/cluster/v1/zz_generated_node_config_source.go b/client/cluster/v3/zz_generated_node_config_source.go similarity index 100% rename from client/cluster/v1/zz_generated_node_config_source.go rename to client/cluster/v3/zz_generated_node_config_source.go diff --git a/client/cluster/v1/zz_generated_node_daemon_endpoints.go b/client/cluster/v3/zz_generated_node_daemon_endpoints.go similarity index 100% rename from client/cluster/v1/zz_generated_node_daemon_endpoints.go rename to client/cluster/v3/zz_generated_node_daemon_endpoints.go diff --git a/client/workload/v1/zz_generated_node_info.go b/client/cluster/v3/zz_generated_node_info.go similarity index 100% rename from client/workload/v1/zz_generated_node_info.go rename to client/cluster/v3/zz_generated_node_info.go diff --git a/client/workload/v1/zz_generated_node_spec.go b/client/cluster/v3/zz_generated_node_spec.go similarity index 85% rename from client/workload/v1/zz_generated_node_spec.go rename to client/cluster/v3/zz_generated_node_spec.go index c7e37e9d..c032b311 100644 --- a/client/workload/v1/zz_generated_node_spec.go +++ b/client/cluster/v3/zz_generated_node_spec.go @@ -3,7 +3,7 @@ package client const ( NodeSpecType = "nodeSpec" NodeSpecFieldConfigSource = "configSource" - NodeSpecFieldExternalID = "externalID" + NodeSpecFieldExternalId = "externalId" NodeSpecFieldPodCIDR = "podCIDR" NodeSpecFieldProviderID = "providerID" NodeSpecFieldTaints = "taints" @@ -12,7 +12,7 @@ const ( type NodeSpec struct { ConfigSource *NodeConfigSource `json:"configSource,omitempty"` - ExternalID string `json:"externalID,omitempty"` + ExternalId string `json:"externalId,omitempty"` PodCIDR string `json:"podCIDR,omitempty"` ProviderID string `json:"providerID,omitempty"` Taints []Taint `json:"taints,omitempty"` diff --git a/client/workload/v1/zz_generated_node_status.go b/client/cluster/v3/zz_generated_node_status.go similarity index 100% rename from client/workload/v1/zz_generated_node_status.go rename to client/cluster/v3/zz_generated_node_status.go diff --git a/client/cluster/v1/zz_generated_node_system_info.go b/client/cluster/v3/zz_generated_node_system_info.go similarity index 100% rename from client/cluster/v1/zz_generated_node_system_info.go rename to client/cluster/v3/zz_generated_node_system_info.go diff --git a/client/workload/v1/zz_generated_object_meta.go b/client/cluster/v3/zz_generated_object_meta.go similarity index 90% rename from client/workload/v1/zz_generated_object_meta.go rename to client/cluster/v3/zz_generated_object_meta.go index 86acd6ff..338b7da3 100644 --- a/client/workload/v1/zz_generated_object_meta.go +++ b/client/cluster/v3/zz_generated_object_meta.go @@ -4,6 +4,7 @@ const ( ObjectMetaType = "objectMeta" ObjectMetaFieldAnnotations = "annotations" ObjectMetaFieldCreated = "created" + ObjectMetaFieldFinalizers = "finalizers" ObjectMetaFieldLabels = "labels" ObjectMetaFieldName = "name" ObjectMetaFieldNamespace = "namespace" @@ -16,6 +17,7 @@ const ( type ObjectMeta struct { 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"` Namespace string `json:"namespace,omitempty"` diff --git a/client/cluster/v1/zz_generated_object_reference.go b/client/cluster/v3/zz_generated_object_reference.go similarity index 100% rename from client/cluster/v1/zz_generated_object_reference.go rename to client/cluster/v3/zz_generated_object_reference.go diff --git a/client/workload/v1/zz_generated_os_info.go b/client/cluster/v3/zz_generated_os_info.go similarity index 100% rename from client/workload/v1/zz_generated_os_info.go rename to client/cluster/v3/zz_generated_os_info.go diff --git a/client/authorization/v1/zz_generated_owner_reference.go b/client/cluster/v3/zz_generated_owner_reference.go similarity index 100% rename from client/authorization/v1/zz_generated_owner_reference.go rename to client/cluster/v3/zz_generated_owner_reference.go diff --git a/client/authorization/v1/zz_generated_status.go b/client/cluster/v3/zz_generated_status.go similarity index 100% rename from client/authorization/v1/zz_generated_status.go rename to client/cluster/v3/zz_generated_status.go diff --git a/client/authorization/v1/zz_generated_status_cause.go b/client/cluster/v3/zz_generated_status_cause.go similarity index 100% rename from client/authorization/v1/zz_generated_status_cause.go rename to client/cluster/v3/zz_generated_status_cause.go diff --git a/client/authorization/v1/zz_generated_status_details.go b/client/cluster/v3/zz_generated_status_details.go similarity index 100% rename from client/authorization/v1/zz_generated_status_details.go rename to client/cluster/v3/zz_generated_status_details.go diff --git a/client/cluster/v1/zz_generated_taint.go b/client/cluster/v3/zz_generated_taint.go similarity index 100% rename from client/cluster/v1/zz_generated_taint.go rename to client/cluster/v3/zz_generated_taint.go diff --git a/client/authorization/v1/zz_generated_allowed_host_path.go b/client/management/v3/zz_generated_allowed_host_path.go similarity index 100% rename from client/authorization/v1/zz_generated_allowed_host_path.go rename to client/management/v3/zz_generated_allowed_host_path.go diff --git a/client/cluster/v1/zz_generated_amazon_ec2config.go b/client/management/v3/zz_generated_amazon_ec2config.go similarity index 100% rename from client/cluster/v1/zz_generated_amazon_ec2config.go rename to client/management/v3/zz_generated_amazon_ec2config.go diff --git a/client/management/v3/zz_generated_attached_volume.go b/client/management/v3/zz_generated_attached_volume.go new file mode 100644 index 00000000..a13d1ac3 --- /dev/null +++ b/client/management/v3/zz_generated_attached_volume.go @@ -0,0 +1,10 @@ +package client + +const ( + AttachedVolumeType = "attachedVolume" + AttachedVolumeFieldName = "name" +) + +type AttachedVolume struct { + Name string `json:"name,omitempty"` +} diff --git a/client/cluster/v1/zz_generated_auth_config.go b/client/management/v3/zz_generated_auth_config.go similarity index 100% rename from client/cluster/v1/zz_generated_auth_config.go rename to client/management/v3/zz_generated_auth_config.go diff --git a/client/cluster/v1/zz_generated_azure_config.go b/client/management/v3/zz_generated_azure_config.go similarity index 100% rename from client/cluster/v1/zz_generated_azure_config.go rename to client/management/v3/zz_generated_azure_config.go diff --git a/client/cluster/v1/zz_generated_azure_kubernetes_service_config.go b/client/management/v3/zz_generated_azure_kubernetes_service_config.go similarity index 100% rename from client/cluster/v1/zz_generated_azure_kubernetes_service_config.go rename to client/management/v3/zz_generated_azure_kubernetes_service_config.go diff --git a/client/authorization/v1/zz_generated_client.go b/client/management/v3/zz_generated_client.go similarity index 70% rename from client/authorization/v1/zz_generated_client.go rename to client/management/v3/zz_generated_client.go index 1362c082..b393ac3e 100644 --- a/client/authorization/v1/zz_generated_client.go +++ b/client/management/v3/zz_generated_client.go @@ -7,12 +7,17 @@ import ( type Client struct { clientbase.APIBaseClient + Node NodeOperations + Machine MachineOperations + MachineDriver MachineDriverOperations + MachineTemplate MachineTemplateOperations Project ProjectOperations ProjectRoleTemplate ProjectRoleTemplateOperations PodSecurityPolicyTemplate PodSecurityPolicyTemplateOperations ClusterRoleTemplate ClusterRoleTemplateOperations ClusterRoleTemplateBinding ClusterRoleTemplateBindingOperations ProjectRoleTemplateBinding ProjectRoleTemplateBindingOperations + Cluster ClusterOperations } func NewClient(opts *clientbase.ClientOpts) (*Client, error) { @@ -25,12 +30,17 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) { APIBaseClient: baseClient, } + client.Node = newNodeClient(client) + client.Machine = newMachineClient(client) + client.MachineDriver = newMachineDriverClient(client) + client.MachineTemplate = newMachineTemplateClient(client) client.Project = newProjectClient(client) client.ProjectRoleTemplate = newProjectRoleTemplateClient(client) client.PodSecurityPolicyTemplate = newPodSecurityPolicyTemplateClient(client) client.ClusterRoleTemplate = newClusterRoleTemplateClient(client) client.ClusterRoleTemplateBinding = newClusterRoleTemplateBindingClient(client) client.ProjectRoleTemplateBinding = newProjectRoleTemplateBindingClient(client) + client.Cluster = newClusterClient(client) return client, nil } diff --git a/client/cluster/v1/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go similarity index 74% rename from client/cluster/v1/zz_generated_cluster.go rename to client/management/v3/zz_generated_cluster.go index fef6de1d..f2cfe1cf 100644 --- a/client/cluster/v1/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -6,20 +6,29 @@ import ( const ( ClusterType = "cluster" + ClusterFieldAPIEndpoint = "apiEndpoint" + ClusterFieldAllocatable = "allocatable" ClusterFieldAnnotations = "annotations" ClusterFieldAzureKubernetesServiceConfig = "azureKubernetesServiceConfig" + ClusterFieldCACert = "caCert" + ClusterFieldCapacity = "capacity" + ClusterFieldComponentStatuses = "componentStatuses" + ClusterFieldConditions = "conditions" ClusterFieldCreated = "created" ClusterFieldDescription = "description" + ClusterFieldFinalizers = "finalizers" ClusterFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" ClusterFieldId = "id" ClusterFieldLabels = "labels" + ClusterFieldLimits = "limits" ClusterFieldName = "name" ClusterFieldOwnerReferences = "ownerReferences" ClusterFieldRancherKubernetesEngineConfig = "rancherKubernetesEngineConfig" ClusterFieldRemoved = "removed" + ClusterFieldRequested = "requested" ClusterFieldResourcePath = "resourcePath" + ClusterFieldServiceAccountToken = "serviceAccountToken" ClusterFieldState = "state" - ClusterFieldStatus = "status" ClusterFieldTransitioning = "transitioning" ClusterFieldTransitioningMessage = "transitioningMessage" ClusterFieldUuid = "uuid" @@ -27,20 +36,29 @@ const ( type Cluster struct { types.Resource + APIEndpoint string `json:"apiEndpoint,omitempty"` + Allocatable map[string]string `json:"allocatable,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"` + CACert string `json:"caCert,omitempty"` + Capacity map[string]string `json:"capacity,omitempty"` + ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty"` + Conditions []ClusterCondition `json:"conditions,omitempty"` Created string `json:"created,omitempty"` Description string `json:"description,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"` Id string `json:"id,omitempty"` Labels map[string]string `json:"labels,omitempty"` + Limits map[string]string `json:"limits,omitempty"` Name string `json:"name,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"` Removed string `json:"removed,omitempty"` + Requested map[string]string `json:"requested,omitempty"` ResourcePath string `json:"resourcePath,omitempty"` + ServiceAccountToken string `json:"serviceAccountToken,omitempty"` State string `json:"state,omitempty"` - Status *ClusterStatus `json:"status,omitempty"` Transitioning string `json:"transitioning,omitempty"` TransitioningMessage string `json:"transitioningMessage,omitempty"` Uuid string `json:"uuid,omitempty"` diff --git a/client/cluster/v1/zz_generated_cluster_component_status.go b/client/management/v3/zz_generated_cluster_component_status.go similarity index 100% rename from client/cluster/v1/zz_generated_cluster_component_status.go rename to client/management/v3/zz_generated_cluster_component_status.go diff --git a/client/cluster/v1/zz_generated_cluster_condition.go b/client/management/v3/zz_generated_cluster_condition.go similarity index 100% rename from client/cluster/v1/zz_generated_cluster_condition.go rename to client/management/v3/zz_generated_cluster_condition.go diff --git a/client/authorization/v1/zz_generated_cluster_role_template.go b/client/management/v3/zz_generated_cluster_role_template.go similarity index 90% rename from client/authorization/v1/zz_generated_cluster_role_template.go rename to client/management/v3/zz_generated_cluster_role_template.go index 806ea974..0b95523a 100644 --- a/client/authorization/v1/zz_generated_cluster_role_template.go +++ b/client/management/v3/zz_generated_cluster_role_template.go @@ -10,15 +10,13 @@ const ( ClusterRoleTemplateFieldBuiltin = "builtin" ClusterRoleTemplateFieldClusterRoleTemplateIds = "clusterRoleTemplateIds" ClusterRoleTemplateFieldCreated = "created" + ClusterRoleTemplateFieldFinalizers = "finalizers" ClusterRoleTemplateFieldLabels = "labels" ClusterRoleTemplateFieldName = "name" ClusterRoleTemplateFieldOwnerReferences = "ownerReferences" ClusterRoleTemplateFieldRemoved = "removed" ClusterRoleTemplateFieldResourcePath = "resourcePath" ClusterRoleTemplateFieldRules = "rules" - ClusterRoleTemplateFieldState = "state" - ClusterRoleTemplateFieldTransitioning = "transitioning" - ClusterRoleTemplateFieldTransitioningMessage = "transitioningMessage" ClusterRoleTemplateFieldUuid = "uuid" ) @@ -28,15 +26,13 @@ type ClusterRoleTemplate struct { Builtin *bool `json:"builtin,omitempty"` ClusterRoleTemplateIds []string `json:"clusterRoleTemplateIds,omitempty"` Created string `json:"created,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` Removed string `json:"removed,omitempty"` ResourcePath string `json:"resourcePath,omitempty"` Rules []PolicyRule `json:"rules,omitempty"` - State string `json:"state,omitempty"` - Transitioning string `json:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty"` Uuid string `json:"uuid,omitempty"` } type ClusterRoleTemplateCollection struct { diff --git a/client/authorization/v1/zz_generated_cluster_role_template_binding.go b/client/management/v3/zz_generated_cluster_role_template_binding.go similarity index 90% rename from client/authorization/v1/zz_generated_cluster_role_template_binding.go rename to client/management/v3/zz_generated_cluster_role_template_binding.go index e08ffce5..e0a51632 100644 --- a/client/authorization/v1/zz_generated_cluster_role_template_binding.go +++ b/client/management/v3/zz_generated_cluster_role_template_binding.go @@ -10,15 +10,13 @@ const ( ClusterRoleTemplateBindingFieldClusterId = "clusterId" ClusterRoleTemplateBindingFieldClusterRoleTemplateId = "clusterRoleTemplateId" ClusterRoleTemplateBindingFieldCreated = "created" + ClusterRoleTemplateBindingFieldFinalizers = "finalizers" ClusterRoleTemplateBindingFieldLabels = "labels" ClusterRoleTemplateBindingFieldName = "name" ClusterRoleTemplateBindingFieldOwnerReferences = "ownerReferences" ClusterRoleTemplateBindingFieldRemoved = "removed" ClusterRoleTemplateBindingFieldResourcePath = "resourcePath" - ClusterRoleTemplateBindingFieldState = "state" ClusterRoleTemplateBindingFieldSubject = "subject" - ClusterRoleTemplateBindingFieldTransitioning = "transitioning" - ClusterRoleTemplateBindingFieldTransitioningMessage = "transitioningMessage" ClusterRoleTemplateBindingFieldUuid = "uuid" ) @@ -28,15 +26,13 @@ type ClusterRoleTemplateBinding struct { ClusterId string `json:"clusterId,omitempty"` ClusterRoleTemplateId string `json:"clusterRoleTemplateId,omitempty"` Created string `json:"created,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` Removed string `json:"removed,omitempty"` ResourcePath string `json:"resourcePath,omitempty"` - State string `json:"state,omitempty"` Subject *Subject `json:"subject,omitempty"` - Transitioning string `json:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty"` Uuid string `json:"uuid,omitempty"` } type ClusterRoleTemplateBindingCollection struct { diff --git a/client/cluster/v1/zz_generated_cluster_spec.go b/client/management/v3/zz_generated_cluster_spec.go similarity index 100% rename from client/cluster/v1/zz_generated_cluster_spec.go rename to client/management/v3/zz_generated_cluster_spec.go diff --git a/client/cluster/v1/zz_generated_cluster_status.go b/client/management/v3/zz_generated_cluster_status.go similarity index 90% rename from client/cluster/v1/zz_generated_cluster_status.go rename to client/management/v3/zz_generated_cluster_status.go index 2ee18c55..031f3077 100644 --- a/client/cluster/v1/zz_generated_cluster_status.go +++ b/client/management/v3/zz_generated_cluster_status.go @@ -4,7 +4,6 @@ const ( ClusterStatusType = "clusterStatus" ClusterStatusFieldAPIEndpoint = "apiEndpoint" ClusterStatusFieldAllocatable = "allocatable" - ClusterStatusFieldAppliedSpec = "appliedSpec" ClusterStatusFieldCACert = "caCert" ClusterStatusFieldCapacity = "capacity" ClusterStatusFieldComponentStatuses = "componentStatuses" @@ -17,7 +16,6 @@ const ( type ClusterStatus struct { APIEndpoint string `json:"apiEndpoint,omitempty"` Allocatable map[string]string `json:"allocatable,omitempty"` - AppliedSpec *ClusterSpec `json:"appliedSpec,omitempty"` CACert string `json:"caCert,omitempty"` Capacity map[string]string `json:"capacity,omitempty"` ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty"` diff --git a/client/cluster/v1/zz_generated_component_condition.go b/client/management/v3/zz_generated_component_condition.go similarity index 100% rename from client/cluster/v1/zz_generated_component_condition.go rename to client/management/v3/zz_generated_component_condition.go diff --git a/client/workload/v1/zz_generated_container_image.go b/client/management/v3/zz_generated_container_image.go similarity index 100% rename from client/workload/v1/zz_generated_container_image.go rename to client/management/v3/zz_generated_container_image.go diff --git a/client/management/v3/zz_generated_cpu_info.go b/client/management/v3/zz_generated_cpu_info.go new file mode 100644 index 00000000..7b83b19c --- /dev/null +++ b/client/management/v3/zz_generated_cpu_info.go @@ -0,0 +1,10 @@ +package client + +const ( + CPUInfoType = "cpuInfo" + CPUInfoFieldCount = "count" +) + +type CPUInfo struct { + Count *int64 `json:"count,omitempty"` +} diff --git a/client/workload/v1/zz_generated_daemon_endpoint.go b/client/management/v3/zz_generated_daemon_endpoint.go similarity index 100% rename from client/workload/v1/zz_generated_daemon_endpoint.go rename to client/management/v3/zz_generated_daemon_endpoint.go diff --git a/client/cluster/v1/zz_generated_digital_ocean_config.go b/client/management/v3/zz_generated_digital_ocean_config.go similarity index 100% rename from client/cluster/v1/zz_generated_digital_ocean_config.go rename to client/management/v3/zz_generated_digital_ocean_config.go diff --git a/client/cluster/v1/zz_generated_etcd_service.go b/client/management/v3/zz_generated_etcd_service.go similarity index 100% rename from client/cluster/v1/zz_generated_etcd_service.go rename to client/management/v3/zz_generated_etcd_service.go diff --git a/client/authorization/v1/zz_generated_fs_group_strategy_options.go b/client/management/v3/zz_generated_fs_group_strategy_options.go similarity index 100% rename from client/authorization/v1/zz_generated_fs_group_strategy_options.go rename to client/management/v3/zz_generated_fs_group_strategy_options.go diff --git a/client/cluster/v1/zz_generated_google_kubernetes_engine_config.go b/client/management/v3/zz_generated_google_kubernetes_engine_config.go similarity index 100% rename from client/cluster/v1/zz_generated_google_kubernetes_engine_config.go rename to client/management/v3/zz_generated_google_kubernetes_engine_config.go diff --git a/client/authorization/v1/zz_generated_host_port_range.go b/client/management/v3/zz_generated_host_port_range.go similarity index 100% rename from client/authorization/v1/zz_generated_host_port_range.go rename to client/management/v3/zz_generated_host_port_range.go diff --git a/client/authorization/v1/zz_generated_id_range.go b/client/management/v3/zz_generated_id_range.go similarity index 100% rename from client/authorization/v1/zz_generated_id_range.go rename to client/management/v3/zz_generated_id_range.go diff --git a/client/cluster/v1/zz_generated_initializer.go b/client/management/v3/zz_generated_initializer.go similarity index 100% rename from client/cluster/v1/zz_generated_initializer.go rename to client/management/v3/zz_generated_initializer.go diff --git a/client/cluster/v1/zz_generated_initializers.go b/client/management/v3/zz_generated_initializers.go similarity index 100% rename from client/cluster/v1/zz_generated_initializers.go rename to client/management/v3/zz_generated_initializers.go diff --git a/client/cluster/v1/zz_generated_kube_apiservice.go b/client/management/v3/zz_generated_kube_apiservice.go similarity index 100% rename from client/cluster/v1/zz_generated_kube_apiservice.go rename to client/management/v3/zz_generated_kube_apiservice.go diff --git a/client/cluster/v1/zz_generated_kube_controller_service.go b/client/management/v3/zz_generated_kube_controller_service.go similarity index 100% rename from client/cluster/v1/zz_generated_kube_controller_service.go rename to client/management/v3/zz_generated_kube_controller_service.go diff --git a/client/cluster/v1/zz_generated_kubelet_service.go b/client/management/v3/zz_generated_kubelet_service.go similarity index 100% rename from client/cluster/v1/zz_generated_kubelet_service.go rename to client/management/v3/zz_generated_kubelet_service.go diff --git a/client/cluster/v1/zz_generated_kubeproxy_service.go b/client/management/v3/zz_generated_kubeproxy_service.go similarity index 100% rename from client/cluster/v1/zz_generated_kubeproxy_service.go rename to client/management/v3/zz_generated_kubeproxy_service.go diff --git a/client/management/v3/zz_generated_kubernetes_info.go b/client/management/v3/zz_generated_kubernetes_info.go new file mode 100644 index 00000000..27876af1 --- /dev/null +++ b/client/management/v3/zz_generated_kubernetes_info.go @@ -0,0 +1,12 @@ +package client + +const ( + KubernetesInfoType = "kubernetesInfo" + KubernetesInfoFieldKubeProxyVersion = "kubeProxyVersion" + KubernetesInfoFieldKubeletVersion = "kubeletVersion" +) + +type KubernetesInfo struct { + KubeProxyVersion string `json:"kubeProxyVersion,omitempty"` + KubeletVersion string `json:"kubeletVersion,omitempty"` +} diff --git a/client/cluster/v1/zz_generated_list_meta.go b/client/management/v3/zz_generated_list_meta.go similarity index 100% rename from client/cluster/v1/zz_generated_list_meta.go rename to client/management/v3/zz_generated_list_meta.go diff --git a/client/management/v3/zz_generated_machine.go b/client/management/v3/zz_generated_machine.go new file mode 100644 index 00000000..b82f566e --- /dev/null +++ b/client/management/v3/zz_generated_machine.go @@ -0,0 +1,169 @@ +package client + +import ( + "github.com/rancher/norman/types" +) + +const ( + MachineType = "machine" + MachineFieldAllocatable = "allocatable" + MachineFieldAmazonEC2Config = "amazonEc2Config" + MachineFieldAnnotations = "annotations" + MachineFieldAuthCertificateAuthority = "authCertificateAuthority" + MachineFieldAuthKey = "authKey" + MachineFieldAzureConfig = "azureConfig" + MachineFieldCapacity = "capacity" + MachineFieldClusterId = "clusterId" + MachineFieldConditions = "conditions" + MachineFieldConfigSource = "configSource" + MachineFieldCreated = "created" + MachineFieldDescription = "description" + MachineFieldDigitalOceanConfig = "digitalOceanConfig" + MachineFieldDockerVersion = "dockerVersion" + MachineFieldDriver = "driver" + MachineFieldEngineEnv = "engineEnv" + MachineFieldEngineInsecureRegistry = "engineInsecureRegistry" + MachineFieldEngineInstallURL = "engineInstallURL" + MachineFieldEngineLabel = "engineLabel" + MachineFieldEngineOpt = "engineOpt" + MachineFieldEngineRegistryMirror = "engineRegistryMirror" + MachineFieldEngineStorageDriver = "engineStorageDriver" + MachineFieldExternalId = "externalId" + MachineFieldFinalizers = "finalizers" + MachineFieldHostname = "hostname" + MachineFieldIPAddress = "ipAddress" + MachineFieldId = "id" + MachineFieldInfo = "info" + MachineFieldLabels = "labels" + MachineFieldLimits = "limits" + MachineFieldMachineTemplateId = "machineTemplateId" + MachineFieldName = "name" + MachineFieldOwnerReferences = "ownerReferences" + MachineFieldPhase = "phase" + MachineFieldPodCIDR = "podCIDR" + MachineFieldProviderID = "providerID" + MachineFieldRemoved = "removed" + MachineFieldRequested = "requested" + MachineFieldResourcePath = "resourcePath" + MachineFieldState = "state" + MachineFieldTaints = "taints" + MachineFieldTransitioning = "transitioning" + MachineFieldTransitioningMessage = "transitioningMessage" + MachineFieldUnschedulable = "unschedulable" + MachineFieldUuid = "uuid" + MachineFieldVolumesAttached = "volumesAttached" + MachineFieldVolumesInUse = "volumesInUse" +) + +type Machine struct { + types.Resource + Allocatable map[string]string `json:"allocatable,omitempty"` + AmazonEC2Config *AmazonEC2Config `json:"amazonEc2Config,omitempty"` + Annotations map[string]string `json:"annotations,omitempty"` + AuthCertificateAuthority string `json:"authCertificateAuthority,omitempty"` + AuthKey string `json:"authKey,omitempty"` + AzureConfig *AzureConfig `json:"azureConfig,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"` + Description string `json:"description,omitempty"` + DigitalOceanConfig *DigitalOceanConfig `json:"digitalOceanConfig,omitempty"` + DockerVersion string `json:"dockerVersion,omitempty"` + Driver string `json:"driver,omitempty"` + EngineEnv map[string]string `json:"engineEnv,omitempty"` + EngineInsecureRegistry []string `json:"engineInsecureRegistry,omitempty"` + EngineInstallURL string `json:"engineInstallURL,omitempty"` + EngineLabel map[string]string `json:"engineLabel,omitempty"` + EngineOpt map[string]string `json:"engineOpt,omitempty"` + EngineRegistryMirror []string `json:"engineRegistryMirror,omitempty"` + EngineStorageDriver string `json:"engineStorageDriver,omitempty"` + ExternalId string `json:"externalId,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` + Hostname string `json:"hostname,omitempty"` + IPAddress string `json:"ipAddress,omitempty"` + Id string `json:"id,omitempty"` + Info *NodeInfo `json:"info,omitempty"` + Labels map[string]string `json:"labels,omitempty"` + Limits map[string]string `json:"limits,omitempty"` + MachineTemplateId string `json:"machineTemplateId,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"` + Removed string `json:"removed,omitempty"` + Requested map[string]string `json:"requested,omitempty"` + ResourcePath string `json:"resourcePath,omitempty"` + State string `json:"state,omitempty"` + Taints []Taint `json:"taints,omitempty"` + Transitioning string `json:"transitioning,omitempty"` + TransitioningMessage string `json:"transitioningMessage,omitempty"` + Unschedulable *bool `json:"unschedulable,omitempty"` + Uuid string `json:"uuid,omitempty"` + VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` + VolumesInUse []string `json:"volumesInUse,omitempty"` +} +type MachineCollection struct { + types.Collection + Data []Machine `json:"data,omitempty"` + client *MachineClient +} + +type MachineClient struct { + apiClient *Client +} + +type MachineOperations interface { + List(opts *types.ListOpts) (*MachineCollection, error) + Create(opts *Machine) (*Machine, error) + Update(existing *Machine, updates interface{}) (*Machine, error) + ByID(id string) (*Machine, error) + Delete(container *Machine) error +} + +func newMachineClient(apiClient *Client) *MachineClient { + return &MachineClient{ + apiClient: apiClient, + } +} + +func (c *MachineClient) Create(container *Machine) (*Machine, error) { + resp := &Machine{} + err := c.apiClient.Ops.DoCreate(MachineType, container, resp) + return resp, err +} + +func (c *MachineClient) Update(existing *Machine, updates interface{}) (*Machine, error) { + resp := &Machine{} + err := c.apiClient.Ops.DoUpdate(MachineType, &existing.Resource, updates, resp) + return resp, err +} + +func (c *MachineClient) List(opts *types.ListOpts) (*MachineCollection, error) { + resp := &MachineCollection{} + err := c.apiClient.Ops.DoList(MachineType, opts, resp) + resp.client = c + return resp, err +} + +func (cc *MachineCollection) Next() (*MachineCollection, error) { + if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { + resp := &MachineCollection{} + err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) + resp.client = cc.client + return resp, err + } + return nil, nil +} + +func (c *MachineClient) ByID(id string) (*Machine, error) { + resp := &Machine{} + err := c.apiClient.Ops.DoByID(MachineType, id, resp) + return resp, err +} + +func (c *MachineClient) Delete(container *Machine) error { + return c.apiClient.Ops.DoResourceDelete(MachineType, &container.Resource) +} diff --git a/client/cluster/v1/zz_generated_machine_condition.go b/client/management/v3/zz_generated_machine_condition.go similarity index 100% rename from client/cluster/v1/zz_generated_machine_condition.go rename to client/management/v3/zz_generated_machine_condition.go diff --git a/client/cluster/v1/zz_generated_machine_driver.go b/client/management/v3/zz_generated_machine_driver.go similarity index 97% rename from client/cluster/v1/zz_generated_machine_driver.go rename to client/management/v3/zz_generated_machine_driver.go index f7d3207b..f516f8cd 100644 --- a/client/cluster/v1/zz_generated_machine_driver.go +++ b/client/management/v3/zz_generated_machine_driver.go @@ -14,6 +14,7 @@ const ( MachineDriverFieldDefaultActive = "defaultActive" MachineDriverFieldDescription = "description" MachineDriverFieldExternalID = "externalId" + MachineDriverFieldFinalizers = "finalizers" MachineDriverFieldId = "id" MachineDriverFieldLabels = "labels" MachineDriverFieldName = "name" @@ -39,6 +40,7 @@ type MachineDriver struct { DefaultActive *bool `json:"defaultActive,omitempty"` Description string `json:"description,omitempty"` ExternalID string `json:"externalId,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Id string `json:"id,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` diff --git a/client/cluster/v1/zz_generated_machine_driver_condition.go b/client/management/v3/zz_generated_machine_driver_condition.go similarity index 100% rename from client/cluster/v1/zz_generated_machine_driver_condition.go rename to client/management/v3/zz_generated_machine_driver_condition.go diff --git a/client/cluster/v1/zz_generated_machine_driver_spec.go b/client/management/v3/zz_generated_machine_driver_spec.go similarity index 100% rename from client/cluster/v1/zz_generated_machine_driver_spec.go rename to client/management/v3/zz_generated_machine_driver_spec.go diff --git a/client/cluster/v1/zz_generated_machine_driver_status.go b/client/management/v3/zz_generated_machine_driver_status.go similarity index 100% rename from client/cluster/v1/zz_generated_machine_driver_status.go rename to client/management/v3/zz_generated_machine_driver_status.go diff --git a/client/cluster/v1/zz_generated_machine_spec.go b/client/management/v3/zz_generated_machine_spec.go similarity index 76% rename from client/cluster/v1/zz_generated_machine_spec.go rename to client/management/v3/zz_generated_machine_spec.go index ae5559cd..7c18ee6b 100644 --- a/client/cluster/v1/zz_generated_machine_spec.go +++ b/client/management/v3/zz_generated_machine_spec.go @@ -7,9 +7,9 @@ const ( MachineSpecFieldAuthKey = "authKey" MachineSpecFieldAzureConfig = "azureConfig" MachineSpecFieldClusterId = "clusterId" + MachineSpecFieldConfigSource = "configSource" MachineSpecFieldDescription = "description" MachineSpecFieldDigitalOceanConfig = "digitalOceanConfig" - MachineSpecFieldDisplayName = "displayName" MachineSpecFieldDockerVersion = "dockerVersion" MachineSpecFieldDriver = "driver" MachineSpecFieldEngineEnv = "engineEnv" @@ -19,9 +19,12 @@ const ( MachineSpecFieldEngineOpt = "engineOpt" MachineSpecFieldEngineRegistryMirror = "engineRegistryMirror" MachineSpecFieldEngineStorageDriver = "engineStorageDriver" - MachineSpecFieldExternalID = "externalId" - MachineSpecFieldHostname = "hostname" + MachineSpecFieldExternalId = "externalId" MachineSpecFieldMachineTemplateId = "machineTemplateId" + MachineSpecFieldPodCIDR = "podCIDR" + MachineSpecFieldProviderID = "providerID" + MachineSpecFieldTaints = "taints" + MachineSpecFieldUnschedulable = "unschedulable" ) type MachineSpec struct { @@ -30,9 +33,9 @@ type MachineSpec struct { AuthKey string `json:"authKey,omitempty"` AzureConfig *AzureConfig `json:"azureConfig,omitempty"` ClusterId string `json:"clusterId,omitempty"` + ConfigSource *NodeConfigSource `json:"configSource,omitempty"` Description string `json:"description,omitempty"` DigitalOceanConfig *DigitalOceanConfig `json:"digitalOceanConfig,omitempty"` - DisplayName string `json:"displayName,omitempty"` DockerVersion string `json:"dockerVersion,omitempty"` Driver string `json:"driver,omitempty"` EngineEnv map[string]string `json:"engineEnv,omitempty"` @@ -42,7 +45,10 @@ type MachineSpec struct { EngineOpt map[string]string `json:"engineOpt,omitempty"` EngineRegistryMirror []string `json:"engineRegistryMirror,omitempty"` EngineStorageDriver string `json:"engineStorageDriver,omitempty"` - ExternalID string `json:"externalId,omitempty"` - Hostname string `json:"hostname,omitempty"` + ExternalId string `json:"externalId,omitempty"` MachineTemplateId string `json:"machineTemplateId,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_machine_status.go b/client/management/v3/zz_generated_machine_status.go new file mode 100644 index 00000000..9c69f466 --- /dev/null +++ b/client/management/v3/zz_generated_machine_status.go @@ -0,0 +1,32 @@ +package client + +const ( + MachineStatusType = "machineStatus" + MachineStatusFieldAllocatable = "allocatable" + MachineStatusFieldCapacity = "capacity" + MachineStatusFieldConditions = "conditions" + MachineStatusFieldHostname = "hostname" + MachineStatusFieldIPAddress = "ipAddress" + MachineStatusFieldInfo = "info" + MachineStatusFieldLimits = "limits" + MachineStatusFieldNodeName = "nodeName" + MachineStatusFieldPhase = "phase" + MachineStatusFieldRequested = "requested" + 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"` + NodeName string `json:"nodeName,omitempty"` + Phase string `json:"phase,omitempty"` + Requested map[string]string `json:"requested,omitempty"` + VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` + VolumesInUse []string `json:"volumesInUse,omitempty"` +} diff --git a/client/cluster/v1/zz_generated_machine_template.go b/client/management/v3/zz_generated_machine_template.go similarity index 94% rename from client/cluster/v1/zz_generated_machine_template.go rename to client/management/v3/zz_generated_machine_template.go index 7233ce85..1f5e670c 100644 --- a/client/cluster/v1/zz_generated_machine_template.go +++ b/client/management/v3/zz_generated_machine_template.go @@ -10,6 +10,7 @@ const ( MachineTemplateFieldCreated = "created" MachineTemplateFieldDescription = "description" MachineTemplateFieldDriver = "driver" + MachineTemplateFieldFinalizers = "finalizers" MachineTemplateFieldFlavorPrefix = "flavorPrefix" MachineTemplateFieldId = "id" MachineTemplateFieldLabels = "labels" @@ -18,7 +19,7 @@ const ( MachineTemplateFieldPublicValues = "publicValues" MachineTemplateFieldRemoved = "removed" MachineTemplateFieldResourcePath = "resourcePath" - MachineTemplateFieldSecretId = "secretId" + MachineTemplateFieldSecretName = "secretName" MachineTemplateFieldSecretValues = "secretValues" MachineTemplateFieldState = "state" MachineTemplateFieldStatus = "status" @@ -33,6 +34,7 @@ type MachineTemplate struct { Created string `json:"created,omitempty"` Description string `json:"description,omitempty"` Driver string `json:"driver,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` FlavorPrefix string `json:"flavorPrefix,omitempty"` Id string `json:"id,omitempty"` Labels map[string]string `json:"labels,omitempty"` @@ -41,7 +43,7 @@ type MachineTemplate struct { PublicValues map[string]string `json:"publicValues,omitempty"` Removed string `json:"removed,omitempty"` ResourcePath string `json:"resourcePath,omitempty"` - SecretId string `json:"secretId,omitempty"` + SecretName string `json:"secretName,omitempty"` SecretValues map[string]string `json:"secretValues,omitempty"` State string `json:"state,omitempty"` Status *MachineTemplateStatus `json:"status,omitempty"` diff --git a/client/cluster/v1/zz_generated_machine_template_condition.go b/client/management/v3/zz_generated_machine_template_condition.go similarity index 100% rename from client/cluster/v1/zz_generated_machine_template_condition.go rename to client/management/v3/zz_generated_machine_template_condition.go diff --git a/client/cluster/v1/zz_generated_machine_template_spec.go b/client/management/v3/zz_generated_machine_template_spec.go similarity index 87% rename from client/cluster/v1/zz_generated_machine_template_spec.go rename to client/management/v3/zz_generated_machine_template_spec.go index 659a819a..1fe73cc5 100644 --- a/client/cluster/v1/zz_generated_machine_template_spec.go +++ b/client/management/v3/zz_generated_machine_template_spec.go @@ -7,7 +7,7 @@ const ( MachineTemplateSpecFieldDriver = "driver" MachineTemplateSpecFieldFlavorPrefix = "flavorPrefix" MachineTemplateSpecFieldPublicValues = "publicValues" - MachineTemplateSpecFieldSecretId = "secretId" + MachineTemplateSpecFieldSecretName = "secretName" MachineTemplateSpecFieldSecretValues = "secretValues" ) @@ -17,6 +17,6 @@ type MachineTemplateSpec struct { Driver string `json:"driver,omitempty"` FlavorPrefix string `json:"flavorPrefix,omitempty"` PublicValues map[string]string `json:"publicValues,omitempty"` - SecretId string `json:"secretId,omitempty"` + SecretName string `json:"secretName,omitempty"` SecretValues map[string]string `json:"secretValues,omitempty"` } diff --git a/client/cluster/v1/zz_generated_machine_template_status.go b/client/management/v3/zz_generated_machine_template_status.go similarity index 100% rename from client/cluster/v1/zz_generated_machine_template_status.go rename to client/management/v3/zz_generated_machine_template_status.go diff --git a/client/management/v3/zz_generated_memory_info.go b/client/management/v3/zz_generated_memory_info.go new file mode 100644 index 00000000..ae705e20 --- /dev/null +++ b/client/management/v3/zz_generated_memory_info.go @@ -0,0 +1,10 @@ +package client + +const ( + MemoryInfoType = "memoryInfo" + MemoryInfoFieldMemTotalKiB = "memTotalKiB" +) + +type MemoryInfo struct { + MemTotalKiB *int64 `json:"memTotalKiB,omitempty"` +} diff --git a/client/cluster/v1/zz_generated_network_config.go b/client/management/v3/zz_generated_network_config.go similarity index 100% rename from client/cluster/v1/zz_generated_network_config.go rename to client/management/v3/zz_generated_network_config.go diff --git a/client/management/v3/zz_generated_node.go b/client/management/v3/zz_generated_node.go new file mode 100644 index 00000000..686ac693 --- /dev/null +++ b/client/management/v3/zz_generated_node.go @@ -0,0 +1,127 @@ +package client + +import ( + "github.com/rancher/norman/types" +) + +const ( + NodeType = "node" + NodeFieldAllocatable = "allocatable" + NodeFieldAnnotations = "annotations" + NodeFieldCapacity = "capacity" + NodeFieldConfigSource = "configSource" + NodeFieldCreated = "created" + NodeFieldExternalId = "externalId" + NodeFieldFinalizers = "finalizers" + NodeFieldHostname = "hostname" + NodeFieldIPAddress = "ipAddress" + NodeFieldInfo = "info" + NodeFieldLabels = "labels" + NodeFieldName = "name" + NodeFieldOwnerReferences = "ownerReferences" + NodeFieldPhase = "phase" + NodeFieldPodCIDR = "podCIDR" + NodeFieldProviderID = "providerID" + NodeFieldRemoved = "removed" + NodeFieldResourcePath = "resourcePath" + NodeFieldState = "state" + NodeFieldTaints = "taints" + NodeFieldTransitioning = "transitioning" + NodeFieldTransitioningMessage = "transitioningMessage" + NodeFieldUnschedulable = "unschedulable" + NodeFieldUuid = "uuid" + NodeFieldVolumesAttached = "volumesAttached" + NodeFieldVolumesInUse = "volumesInUse" +) + +type Node struct { + types.Resource + 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"` + Finalizers []string `json:"finalizers,omitempty"` + Hostname string `json:"hostname,omitempty"` + IPAddress string `json:"ipAddress,omitempty"` + Info *NodeInfo `json:"info,omitempty"` + 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"` + Removed string `json:"removed,omitempty"` + ResourcePath string `json:"resourcePath,omitempty"` + State string `json:"state,omitempty"` + Taints []Taint `json:"taints,omitempty"` + Transitioning string `json:"transitioning,omitempty"` + TransitioningMessage string `json:"transitioningMessage,omitempty"` + Unschedulable *bool `json:"unschedulable,omitempty"` + Uuid string `json:"uuid,omitempty"` + VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` + VolumesInUse []string `json:"volumesInUse,omitempty"` +} +type NodeCollection struct { + types.Collection + Data []Node `json:"data,omitempty"` + client *NodeClient +} + +type NodeClient struct { + apiClient *Client +} + +type NodeOperations interface { + List(opts *types.ListOpts) (*NodeCollection, error) + Create(opts *Node) (*Node, error) + Update(existing *Node, updates interface{}) (*Node, error) + ByID(id string) (*Node, error) + Delete(container *Node) error +} + +func newNodeClient(apiClient *Client) *NodeClient { + return &NodeClient{ + apiClient: apiClient, + } +} + +func (c *NodeClient) Create(container *Node) (*Node, error) { + resp := &Node{} + err := c.apiClient.Ops.DoCreate(NodeType, container, resp) + return resp, err +} + +func (c *NodeClient) Update(existing *Node, updates interface{}) (*Node, error) { + resp := &Node{} + err := c.apiClient.Ops.DoUpdate(NodeType, &existing.Resource, updates, resp) + return resp, err +} + +func (c *NodeClient) List(opts *types.ListOpts) (*NodeCollection, error) { + resp := &NodeCollection{} + err := c.apiClient.Ops.DoList(NodeType, opts, resp) + resp.client = c + return resp, err +} + +func (cc *NodeCollection) Next() (*NodeCollection, error) { + if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { + resp := &NodeCollection{} + err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) + resp.client = cc.client + return resp, err + } + return nil, nil +} + +func (c *NodeClient) ByID(id string) (*Node, error) { + resp := &Node{} + err := c.apiClient.Ops.DoByID(NodeType, id, resp) + return resp, err +} + +func (c *NodeClient) Delete(container *Node) error { + return c.apiClient.Ops.DoResourceDelete(NodeType, &container.Resource) +} diff --git a/client/workload/v1/zz_generated_node_address.go b/client/management/v3/zz_generated_node_address.go similarity index 100% rename from client/workload/v1/zz_generated_node_address.go rename to client/management/v3/zz_generated_node_address.go diff --git a/client/workload/v1/zz_generated_node_condition.go b/client/management/v3/zz_generated_node_condition.go similarity index 100% rename from client/workload/v1/zz_generated_node_condition.go rename to client/management/v3/zz_generated_node_condition.go diff --git a/client/workload/v1/zz_generated_node_config_source.go b/client/management/v3/zz_generated_node_config_source.go similarity index 100% rename from client/workload/v1/zz_generated_node_config_source.go rename to client/management/v3/zz_generated_node_config_source.go diff --git a/client/workload/v1/zz_generated_node_daemon_endpoints.go b/client/management/v3/zz_generated_node_daemon_endpoints.go similarity index 100% rename from client/workload/v1/zz_generated_node_daemon_endpoints.go rename to client/management/v3/zz_generated_node_daemon_endpoints.go diff --git a/client/management/v3/zz_generated_node_info.go b/client/management/v3/zz_generated_node_info.go new file mode 100644 index 00000000..e272fb96 --- /dev/null +++ b/client/management/v3/zz_generated_node_info.go @@ -0,0 +1,16 @@ +package client + +const ( + NodeInfoType = "nodeInfo" + NodeInfoFieldCPU = "cpu" + NodeInfoFieldKubernetes = "kubernetes" + NodeInfoFieldMemory = "memory" + NodeInfoFieldOS = "os" +) + +type NodeInfo struct { + CPU *CPUInfo `json:"cpu,omitempty"` + Kubernetes *KubernetesInfo `json:"kubernetes,omitempty"` + Memory *MemoryInfo `json:"memory,omitempty"` + OS *OSInfo `json:"os,omitempty"` +} diff --git a/client/cluster/v1/zz_generated_node_spec.go b/client/management/v3/zz_generated_node_spec.go similarity index 85% rename from client/cluster/v1/zz_generated_node_spec.go rename to client/management/v3/zz_generated_node_spec.go index c7e37e9d..c032b311 100644 --- a/client/cluster/v1/zz_generated_node_spec.go +++ b/client/management/v3/zz_generated_node_spec.go @@ -3,7 +3,7 @@ package client const ( NodeSpecType = "nodeSpec" NodeSpecFieldConfigSource = "configSource" - NodeSpecFieldExternalID = "externalID" + NodeSpecFieldExternalId = "externalId" NodeSpecFieldPodCIDR = "podCIDR" NodeSpecFieldProviderID = "providerID" NodeSpecFieldTaints = "taints" @@ -12,7 +12,7 @@ const ( type NodeSpec struct { ConfigSource *NodeConfigSource `json:"configSource,omitempty"` - ExternalID string `json:"externalID,omitempty"` + ExternalId string `json:"externalId,omitempty"` PodCIDR string `json:"podCIDR,omitempty"` ProviderID string `json:"providerID,omitempty"` Taints []Taint `json:"taints,omitempty"` diff --git a/client/management/v3/zz_generated_node_status.go b/client/management/v3/zz_generated_node_status.go new file mode 100644 index 00000000..fd6bb54f --- /dev/null +++ b/client/management/v3/zz_generated_node_status.go @@ -0,0 +1,26 @@ +package client + +const ( + NodeStatusType = "nodeStatus" + NodeStatusFieldAllocatable = "allocatable" + NodeStatusFieldCapacity = "capacity" + NodeStatusFieldConditions = "conditions" + NodeStatusFieldHostname = "hostname" + NodeStatusFieldIPAddress = "ipAddress" + NodeStatusFieldInfo = "info" + NodeStatusFieldPhase = "phase" + NodeStatusFieldVolumesAttached = "volumesAttached" + NodeStatusFieldVolumesInUse = "volumesInUse" +) + +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/workload/v1/zz_generated_node_system_info.go b/client/management/v3/zz_generated_node_system_info.go similarity index 100% rename from client/workload/v1/zz_generated_node_system_info.go rename to client/management/v3/zz_generated_node_system_info.go diff --git a/client/authorization/v1/zz_generated_object_meta.go b/client/management/v3/zz_generated_object_meta.go similarity index 90% rename from client/authorization/v1/zz_generated_object_meta.go rename to client/management/v3/zz_generated_object_meta.go index 86acd6ff..338b7da3 100644 --- a/client/authorization/v1/zz_generated_object_meta.go +++ b/client/management/v3/zz_generated_object_meta.go @@ -4,6 +4,7 @@ const ( ObjectMetaType = "objectMeta" ObjectMetaFieldAnnotations = "annotations" ObjectMetaFieldCreated = "created" + ObjectMetaFieldFinalizers = "finalizers" ObjectMetaFieldLabels = "labels" ObjectMetaFieldName = "name" ObjectMetaFieldNamespace = "namespace" @@ -16,6 +17,7 @@ const ( type ObjectMeta struct { 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"` Namespace string `json:"namespace,omitempty"` diff --git a/client/workload/v1/zz_generated_object_reference.go b/client/management/v3/zz_generated_object_reference.go similarity index 100% rename from client/workload/v1/zz_generated_object_reference.go rename to client/management/v3/zz_generated_object_reference.go diff --git a/client/management/v3/zz_generated_os_info.go b/client/management/v3/zz_generated_os_info.go new file mode 100644 index 00000000..50e3d04c --- /dev/null +++ b/client/management/v3/zz_generated_os_info.go @@ -0,0 +1,14 @@ +package client + +const ( + OSInfoType = "osInfo" + OSInfoFieldDockerVersion = "dockerVersion" + OSInfoFieldKernelVersion = "kernelVersion" + OSInfoFieldOperatingSystem = "operatingSystem" +) + +type OSInfo struct { + DockerVersion string `json:"dockerVersion,omitempty"` + KernelVersion string `json:"kernelVersion,omitempty"` + OperatingSystem string `json:"operatingSystem,omitempty"` +} diff --git a/client/cluster/v1/zz_generated_owner_reference.go b/client/management/v3/zz_generated_owner_reference.go similarity index 100% rename from client/cluster/v1/zz_generated_owner_reference.go rename to client/management/v3/zz_generated_owner_reference.go diff --git a/client/authorization/v1/zz_generated_pod_security_policy_spec.go b/client/management/v3/zz_generated_pod_security_policy_spec.go similarity index 100% rename from client/authorization/v1/zz_generated_pod_security_policy_spec.go rename to client/management/v3/zz_generated_pod_security_policy_spec.go diff --git a/client/authorization/v1/zz_generated_pod_security_policy_template.go b/client/management/v3/zz_generated_pod_security_policy_template.go similarity index 92% rename from client/authorization/v1/zz_generated_pod_security_policy_template.go rename to client/management/v3/zz_generated_pod_security_policy_template.go index 24abb667..5f09280d 100644 --- a/client/authorization/v1/zz_generated_pod_security_policy_template.go +++ b/client/management/v3/zz_generated_pod_security_policy_template.go @@ -14,6 +14,7 @@ const ( PodSecurityPolicyTemplateFieldDefaultAddCapabilities = "defaultAddCapabilities" PodSecurityPolicyTemplateFieldDefaultAllowPrivilegeEscalation = "defaultAllowPrivilegeEscalation" PodSecurityPolicyTemplateFieldFSGroup = "fsGroup" + PodSecurityPolicyTemplateFieldFinalizers = "finalizers" PodSecurityPolicyTemplateFieldHostIPC = "hostIPC" PodSecurityPolicyTemplateFieldHostNetwork = "hostNetwork" PodSecurityPolicyTemplateFieldHostPID = "hostPID" @@ -28,10 +29,7 @@ const ( PodSecurityPolicyTemplateFieldResourcePath = "resourcePath" PodSecurityPolicyTemplateFieldRunAsUser = "runAsUser" PodSecurityPolicyTemplateFieldSELinux = "seLinux" - PodSecurityPolicyTemplateFieldState = "state" PodSecurityPolicyTemplateFieldSupplementalGroups = "supplementalGroups" - PodSecurityPolicyTemplateFieldTransitioning = "transitioning" - PodSecurityPolicyTemplateFieldTransitioningMessage = "transitioningMessage" PodSecurityPolicyTemplateFieldUuid = "uuid" PodSecurityPolicyTemplateFieldVolumes = "volumes" ) @@ -46,6 +44,7 @@ type PodSecurityPolicyTemplate struct { DefaultAddCapabilities []string `json:"defaultAddCapabilities,omitempty"` DefaultAllowPrivilegeEscalation *bool `json:"defaultAllowPrivilegeEscalation,omitempty"` FSGroup *FSGroupStrategyOptions `json:"fsGroup,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` HostIPC *bool `json:"hostIPC,omitempty"` HostNetwork *bool `json:"hostNetwork,omitempty"` HostPID *bool `json:"hostPID,omitempty"` @@ -60,10 +59,7 @@ type PodSecurityPolicyTemplate struct { ResourcePath string `json:"resourcePath,omitempty"` RunAsUser *RunAsUserStrategyOptions `json:"runAsUser,omitempty"` SELinux *SELinuxStrategyOptions `json:"seLinux,omitempty"` - State string `json:"state,omitempty"` SupplementalGroups *SupplementalGroupsStrategyOptions `json:"supplementalGroups,omitempty"` - Transitioning string `json:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty"` Uuid string `json:"uuid,omitempty"` Volumes []string `json:"volumes,omitempty"` } diff --git a/client/authorization/v1/zz_generated_policy_rule.go b/client/management/v3/zz_generated_policy_rule.go similarity index 100% rename from client/authorization/v1/zz_generated_policy_rule.go rename to client/management/v3/zz_generated_policy_rule.go diff --git a/client/authorization/v1/zz_generated_project.go b/client/management/v3/zz_generated_project.go similarity index 54% rename from client/authorization/v1/zz_generated_project.go rename to client/management/v3/zz_generated_project.go index acd36ae2..77f8a5d9 100644 --- a/client/authorization/v1/zz_generated_project.go +++ b/client/management/v3/zz_generated_project.go @@ -5,37 +5,33 @@ import ( ) const ( - ProjectType = "project" - ProjectFieldAnnotations = "annotations" - ProjectFieldClusterId = "clusterId" - ProjectFieldCreated = "created" - ProjectFieldId = "id" - ProjectFieldLabels = "labels" - ProjectFieldName = "name" - ProjectFieldOwnerReferences = "ownerReferences" - ProjectFieldRemoved = "removed" - ProjectFieldResourcePath = "resourcePath" - ProjectFieldState = "state" - ProjectFieldTransitioning = "transitioning" - ProjectFieldTransitioningMessage = "transitioningMessage" - ProjectFieldUuid = "uuid" + ProjectType = "project" + ProjectFieldAnnotations = "annotations" + ProjectFieldClusterId = "clusterId" + ProjectFieldCreated = "created" + ProjectFieldFinalizers = "finalizers" + ProjectFieldId = "id" + ProjectFieldLabels = "labels" + ProjectFieldName = "name" + ProjectFieldOwnerReferences = "ownerReferences" + ProjectFieldRemoved = "removed" + ProjectFieldResourcePath = "resourcePath" + ProjectFieldUuid = "uuid" ) type Project struct { types.Resource - Annotations map[string]string `json:"annotations,omitempty"` - ClusterId string `json:"clusterId,omitempty"` - Created string `json:"created,omitempty"` - Id string `json:"id,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - Name string `json:"name,omitempty"` - OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` - Removed string `json:"removed,omitempty"` - ResourcePath string `json:"resourcePath,omitempty"` - State string `json:"state,omitempty"` - Transitioning string `json:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty"` - Uuid string `json:"uuid,omitempty"` + Annotations map[string]string `json:"annotations,omitempty"` + ClusterId string `json:"clusterId,omitempty"` + Created string `json:"created,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` + Id string `json:"id,omitempty"` + Labels map[string]string `json:"labels,omitempty"` + Name string `json:"name,omitempty"` + OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` + Removed string `json:"removed,omitempty"` + ResourcePath string `json:"resourcePath,omitempty"` + Uuid string `json:"uuid,omitempty"` } type ProjectCollection struct { types.Collection diff --git a/client/authorization/v1/zz_generated_project_role_template.go b/client/management/v3/zz_generated_project_role_template.go similarity index 90% rename from client/authorization/v1/zz_generated_project_role_template.go rename to client/management/v3/zz_generated_project_role_template.go index 3c9f61ef..1562b5bc 100644 --- a/client/authorization/v1/zz_generated_project_role_template.go +++ b/client/management/v3/zz_generated_project_role_template.go @@ -9,6 +9,7 @@ const ( ProjectRoleTemplateFieldAnnotations = "annotations" ProjectRoleTemplateFieldBuiltin = "builtin" ProjectRoleTemplateFieldCreated = "created" + ProjectRoleTemplateFieldFinalizers = "finalizers" ProjectRoleTemplateFieldLabels = "labels" ProjectRoleTemplateFieldName = "name" ProjectRoleTemplateFieldOwnerReferences = "ownerReferences" @@ -16,9 +17,6 @@ const ( ProjectRoleTemplateFieldRemoved = "removed" ProjectRoleTemplateFieldResourcePath = "resourcePath" ProjectRoleTemplateFieldRules = "rules" - ProjectRoleTemplateFieldState = "state" - ProjectRoleTemplateFieldTransitioning = "transitioning" - ProjectRoleTemplateFieldTransitioningMessage = "transitioningMessage" ProjectRoleTemplateFieldUuid = "uuid" ) @@ -27,6 +25,7 @@ type ProjectRoleTemplate struct { Annotations map[string]string `json:"annotations,omitempty"` Builtin *bool `json:"builtin,omitempty"` Created string `json:"created,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` @@ -34,9 +33,6 @@ type ProjectRoleTemplate struct { Removed string `json:"removed,omitempty"` ResourcePath string `json:"resourcePath,omitempty"` Rules []PolicyRule `json:"rules,omitempty"` - State string `json:"state,omitempty"` - Transitioning string `json:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty"` Uuid string `json:"uuid,omitempty"` } type ProjectRoleTemplateCollection struct { diff --git a/client/authorization/v1/zz_generated_project_role_template_binding.go b/client/management/v3/zz_generated_project_role_template_binding.go similarity index 91% rename from client/authorization/v1/zz_generated_project_role_template_binding.go rename to client/management/v3/zz_generated_project_role_template_binding.go index 3b94ae7e..8ba7e08d 100644 --- a/client/authorization/v1/zz_generated_project_role_template_binding.go +++ b/client/management/v3/zz_generated_project_role_template_binding.go @@ -8,6 +8,7 @@ const ( ProjectRoleTemplateBindingType = "projectRoleTemplateBinding" ProjectRoleTemplateBindingFieldAnnotations = "annotations" ProjectRoleTemplateBindingFieldCreated = "created" + ProjectRoleTemplateBindingFieldFinalizers = "finalizers" ProjectRoleTemplateBindingFieldLabels = "labels" ProjectRoleTemplateBindingFieldName = "name" ProjectRoleTemplateBindingFieldOwnerReferences = "ownerReferences" @@ -15,12 +16,9 @@ const ( ProjectRoleTemplateBindingFieldProjectRoleTemplateId = "projectRoleTemplateId" ProjectRoleTemplateBindingFieldRemoved = "removed" ProjectRoleTemplateBindingFieldResourcePath = "resourcePath" - ProjectRoleTemplateBindingFieldState = "state" ProjectRoleTemplateBindingFieldSubjectKind = "subjectKind" ProjectRoleTemplateBindingFieldSubjectName = "subjectName" ProjectRoleTemplateBindingFieldSubjectNamespace = "subjectNamespace" - ProjectRoleTemplateBindingFieldTransitioning = "transitioning" - ProjectRoleTemplateBindingFieldTransitioningMessage = "transitioningMessage" ProjectRoleTemplateBindingFieldUuid = "uuid" ) @@ -28,6 +26,7 @@ type ProjectRoleTemplateBinding struct { types.Resource 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"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` @@ -35,12 +34,9 @@ type ProjectRoleTemplateBinding struct { ProjectRoleTemplateId string `json:"projectRoleTemplateId,omitempty"` Removed string `json:"removed,omitempty"` ResourcePath string `json:"resourcePath,omitempty"` - State string `json:"state,omitempty"` SubjectKind string `json:"subjectKind,omitempty"` SubjectName string `json:"subjectName,omitempty"` SubjectNamespace string `json:"subjectNamespace,omitempty"` - Transitioning string `json:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty"` Uuid string `json:"uuid,omitempty"` } type ProjectRoleTemplateBindingCollection struct { diff --git a/client/authorization/v1/zz_generated_project_spec.go b/client/management/v3/zz_generated_project_spec.go similarity index 100% rename from client/authorization/v1/zz_generated_project_spec.go rename to client/management/v3/zz_generated_project_spec.go diff --git a/client/cluster/v1/zz_generated_rancher_kubernetes_engine_config.go b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go similarity index 100% rename from client/cluster/v1/zz_generated_rancher_kubernetes_engine_config.go rename to client/management/v3/zz_generated_rancher_kubernetes_engine_config.go diff --git a/client/cluster/v1/zz_generated_rke_config_node.go b/client/management/v3/zz_generated_rke_config_node.go similarity index 100% rename from client/cluster/v1/zz_generated_rke_config_node.go rename to client/management/v3/zz_generated_rke_config_node.go diff --git a/client/cluster/v1/zz_generated_rke_config_services.go b/client/management/v3/zz_generated_rke_config_services.go similarity index 100% rename from client/cluster/v1/zz_generated_rke_config_services.go rename to client/management/v3/zz_generated_rke_config_services.go diff --git a/client/authorization/v1/zz_generated_run_as_user_strategy_options.go b/client/management/v3/zz_generated_run_as_user_strategy_options.go similarity index 100% rename from client/authorization/v1/zz_generated_run_as_user_strategy_options.go rename to client/management/v3/zz_generated_run_as_user_strategy_options.go diff --git a/client/cluster/v1/zz_generated_scheduler_service.go b/client/management/v3/zz_generated_scheduler_service.go similarity index 100% rename from client/cluster/v1/zz_generated_scheduler_service.go rename to client/management/v3/zz_generated_scheduler_service.go diff --git a/client/authorization/v1/zz_generated_se_linux_options.go b/client/management/v3/zz_generated_se_linux_options.go similarity index 100% rename from client/authorization/v1/zz_generated_se_linux_options.go rename to client/management/v3/zz_generated_se_linux_options.go diff --git a/client/authorization/v1/zz_generated_se_linux_strategy_options.go b/client/management/v3/zz_generated_se_linux_strategy_options.go similarity index 100% rename from client/authorization/v1/zz_generated_se_linux_strategy_options.go rename to client/management/v3/zz_generated_se_linux_strategy_options.go diff --git a/client/cluster/v1/zz_generated_status.go b/client/management/v3/zz_generated_status.go similarity index 100% rename from client/cluster/v1/zz_generated_status.go rename to client/management/v3/zz_generated_status.go diff --git a/client/cluster/v1/zz_generated_status_cause.go b/client/management/v3/zz_generated_status_cause.go similarity index 100% rename from client/cluster/v1/zz_generated_status_cause.go rename to client/management/v3/zz_generated_status_cause.go diff --git a/client/cluster/v1/zz_generated_status_details.go b/client/management/v3/zz_generated_status_details.go similarity index 100% rename from client/cluster/v1/zz_generated_status_details.go rename to client/management/v3/zz_generated_status_details.go diff --git a/client/authorization/v1/zz_generated_subject.go b/client/management/v3/zz_generated_subject.go similarity index 100% rename from client/authorization/v1/zz_generated_subject.go rename to client/management/v3/zz_generated_subject.go diff --git a/client/authorization/v1/zz_generated_supplemental_groups_strategy_options.go b/client/management/v3/zz_generated_supplemental_groups_strategy_options.go similarity index 100% rename from client/authorization/v1/zz_generated_supplemental_groups_strategy_options.go rename to client/management/v3/zz_generated_supplemental_groups_strategy_options.go diff --git a/client/workload/v1/zz_generated_taint.go b/client/management/v3/zz_generated_taint.go similarity index 100% rename from client/workload/v1/zz_generated_taint.go rename to client/management/v3/zz_generated_taint.go diff --git a/client/workload/v1/zz_generated_affinity.go b/client/project/v3/zz_generated_affinity.go similarity index 100% rename from client/workload/v1/zz_generated_affinity.go rename to client/project/v3/zz_generated_affinity.go diff --git a/client/workload/v1/zz_generated_aws_elastic_block_store_volume_source.go b/client/project/v3/zz_generated_aws_elastic_block_store_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_aws_elastic_block_store_volume_source.go rename to client/project/v3/zz_generated_aws_elastic_block_store_volume_source.go diff --git a/client/workload/v1/zz_generated_azure_disk_volume_source.go b/client/project/v3/zz_generated_azure_disk_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_azure_disk_volume_source.go rename to client/project/v3/zz_generated_azure_disk_volume_source.go diff --git a/client/workload/v1/zz_generated_azure_file_volume_source.go b/client/project/v3/zz_generated_azure_file_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_azure_file_volume_source.go rename to client/project/v3/zz_generated_azure_file_volume_source.go diff --git a/client/workload/v1/zz_generated_capabilities.go b/client/project/v3/zz_generated_capabilities.go similarity index 100% rename from client/workload/v1/zz_generated_capabilities.go rename to client/project/v3/zz_generated_capabilities.go diff --git a/client/workload/v1/zz_generated_ceph_fsvolume_source.go b/client/project/v3/zz_generated_ceph_fsvolume_source.go similarity index 100% rename from client/workload/v1/zz_generated_ceph_fsvolume_source.go rename to client/project/v3/zz_generated_ceph_fsvolume_source.go diff --git a/client/workload/v1/zz_generated_cinder_volume_source.go b/client/project/v3/zz_generated_cinder_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_cinder_volume_source.go rename to client/project/v3/zz_generated_cinder_volume_source.go diff --git a/client/workload/v1/zz_generated_client.go b/client/project/v3/zz_generated_client.go similarity index 94% rename from client/workload/v1/zz_generated_client.go rename to client/project/v3/zz_generated_client.go index 9129c0b5..95fa0904 100644 --- a/client/workload/v1/zz_generated_client.go +++ b/client/project/v3/zz_generated_client.go @@ -9,7 +9,6 @@ type Client struct { Namespace NamespaceOperations Pod PodOperations - Node NodeOperations Deployment DeploymentOperations PersistentVolumeClaim PersistentVolumeClaimOperations StatefulSet StatefulSetOperations @@ -31,7 +30,6 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) { client.Namespace = newNamespaceClient(client) client.Pod = newPodClient(client) - client.Node = newNodeClient(client) client.Deployment = newDeploymentClient(client) client.PersistentVolumeClaim = newPersistentVolumeClaimClient(client) client.StatefulSet = newStatefulSetClient(client) diff --git a/client/workload/v1/zz_generated_config_map_env_source.go b/client/project/v3/zz_generated_config_map_env_source.go similarity index 100% rename from client/workload/v1/zz_generated_config_map_env_source.go rename to client/project/v3/zz_generated_config_map_env_source.go diff --git a/client/workload/v1/zz_generated_config_map_key_selector.go b/client/project/v3/zz_generated_config_map_key_selector.go similarity index 100% rename from client/workload/v1/zz_generated_config_map_key_selector.go rename to client/project/v3/zz_generated_config_map_key_selector.go diff --git a/client/workload/v1/zz_generated_config_map_projection.go b/client/project/v3/zz_generated_config_map_projection.go similarity index 100% rename from client/workload/v1/zz_generated_config_map_projection.go rename to client/project/v3/zz_generated_config_map_projection.go diff --git a/client/workload/v1/zz_generated_config_map_volume_source.go b/client/project/v3/zz_generated_config_map_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_config_map_volume_source.go rename to client/project/v3/zz_generated_config_map_volume_source.go diff --git a/client/workload/v1/zz_generated_container.go b/client/project/v3/zz_generated_container.go similarity index 100% rename from client/workload/v1/zz_generated_container.go rename to client/project/v3/zz_generated_container.go diff --git a/client/workload/v1/zz_generated_container_port.go b/client/project/v3/zz_generated_container_port.go similarity index 100% rename from client/workload/v1/zz_generated_container_port.go rename to client/project/v3/zz_generated_container_port.go diff --git a/client/workload/v1/zz_generated_container_state.go b/client/project/v3/zz_generated_container_state.go similarity index 100% rename from client/workload/v1/zz_generated_container_state.go rename to client/project/v3/zz_generated_container_state.go diff --git a/client/workload/v1/zz_generated_container_state_running.go b/client/project/v3/zz_generated_container_state_running.go similarity index 100% rename from client/workload/v1/zz_generated_container_state_running.go rename to client/project/v3/zz_generated_container_state_running.go diff --git a/client/workload/v1/zz_generated_container_state_terminated.go b/client/project/v3/zz_generated_container_state_terminated.go similarity index 100% rename from client/workload/v1/zz_generated_container_state_terminated.go rename to client/project/v3/zz_generated_container_state_terminated.go diff --git a/client/workload/v1/zz_generated_container_state_waiting.go b/client/project/v3/zz_generated_container_state_waiting.go similarity index 100% rename from client/workload/v1/zz_generated_container_state_waiting.go rename to client/project/v3/zz_generated_container_state_waiting.go diff --git a/client/workload/v1/zz_generated_container_status.go b/client/project/v3/zz_generated_container_status.go similarity index 100% rename from client/workload/v1/zz_generated_container_status.go rename to client/project/v3/zz_generated_container_status.go diff --git a/client/workload/v1/zz_generated_daemon_set.go b/client/project/v3/zz_generated_daemon_set.go similarity index 98% rename from client/workload/v1/zz_generated_daemon_set.go rename to client/project/v3/zz_generated_daemon_set.go index 78907bd3..29c81047 100644 --- a/client/workload/v1/zz_generated_daemon_set.go +++ b/client/project/v3/zz_generated_daemon_set.go @@ -14,6 +14,7 @@ const ( DaemonSetFieldCreated = "created" DaemonSetFieldDNSPolicy = "dnsPolicy" DaemonSetFieldDeploymentStrategy = "deploymentStrategy" + DaemonSetFieldFinalizers = "finalizers" DaemonSetFieldFsgid = "fsgid" DaemonSetFieldGids = "gids" DaemonSetFieldHostAliases = "hostAliases" @@ -63,6 +64,7 @@ type DaemonSet struct { Created string `json:"created,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Fsgid *int64 `json:"fsgid,omitempty"` Gids []int64 `json:"gids,omitempty"` HostAliases map[string]HostAlias `json:"hostAliases,omitempty"` diff --git a/client/workload/v1/zz_generated_daemon_set_spec.go b/client/project/v3/zz_generated_daemon_set_spec.go similarity index 100% rename from client/workload/v1/zz_generated_daemon_set_spec.go rename to client/project/v3/zz_generated_daemon_set_spec.go diff --git a/client/workload/v1/zz_generated_daemon_set_status.go b/client/project/v3/zz_generated_daemon_set_status.go similarity index 100% rename from client/workload/v1/zz_generated_daemon_set_status.go rename to client/project/v3/zz_generated_daemon_set_status.go diff --git a/client/workload/v1/zz_generated_daemon_set_update_strategy.go b/client/project/v3/zz_generated_daemon_set_update_strategy.go similarity index 100% rename from client/workload/v1/zz_generated_daemon_set_update_strategy.go rename to client/project/v3/zz_generated_daemon_set_update_strategy.go diff --git a/client/workload/v1/zz_generated_deploy_config.go b/client/project/v3/zz_generated_deploy_config.go similarity index 100% rename from client/workload/v1/zz_generated_deploy_config.go rename to client/project/v3/zz_generated_deploy_config.go diff --git a/client/workload/v1/zz_generated_deploy_strategy.go b/client/project/v3/zz_generated_deploy_strategy.go similarity index 100% rename from client/workload/v1/zz_generated_deploy_strategy.go rename to client/project/v3/zz_generated_deploy_strategy.go diff --git a/client/workload/v1/zz_generated_deployment.go b/client/project/v3/zz_generated_deployment.go similarity index 98% rename from client/workload/v1/zz_generated_deployment.go rename to client/project/v3/zz_generated_deployment.go index 80b9eb3e..e5c8dc26 100644 --- a/client/workload/v1/zz_generated_deployment.go +++ b/client/project/v3/zz_generated_deployment.go @@ -14,6 +14,7 @@ const ( DeploymentFieldCreated = "created" DeploymentFieldDNSPolicy = "dnsPolicy" DeploymentFieldDeploymentStrategy = "deploymentStrategy" + DeploymentFieldFinalizers = "finalizers" DeploymentFieldFsgid = "fsgid" DeploymentFieldGids = "gids" DeploymentFieldHostAliases = "hostAliases" @@ -63,6 +64,7 @@ type Deployment struct { Created string `json:"created,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Fsgid *int64 `json:"fsgid,omitempty"` Gids []int64 `json:"gids,omitempty"` HostAliases map[string]HostAlias `json:"hostAliases,omitempty"` diff --git a/client/workload/v1/zz_generated_deployment_condition.go b/client/project/v3/zz_generated_deployment_condition.go similarity index 100% rename from client/workload/v1/zz_generated_deployment_condition.go rename to client/project/v3/zz_generated_deployment_condition.go diff --git a/client/workload/v1/zz_generated_deployment_global_config.go b/client/project/v3/zz_generated_deployment_global_config.go similarity index 100% rename from client/workload/v1/zz_generated_deployment_global_config.go rename to client/project/v3/zz_generated_deployment_global_config.go diff --git a/client/workload/v1/zz_generated_deployment_job_config.go b/client/project/v3/zz_generated_deployment_job_config.go similarity index 100% rename from client/workload/v1/zz_generated_deployment_job_config.go rename to client/project/v3/zz_generated_deployment_job_config.go diff --git a/client/workload/v1/zz_generated_deployment_ordered_config.go b/client/project/v3/zz_generated_deployment_ordered_config.go similarity index 100% rename from client/workload/v1/zz_generated_deployment_ordered_config.go rename to client/project/v3/zz_generated_deployment_ordered_config.go diff --git a/client/workload/v1/zz_generated_deployment_parallel_config.go b/client/project/v3/zz_generated_deployment_parallel_config.go similarity index 100% rename from client/workload/v1/zz_generated_deployment_parallel_config.go rename to client/project/v3/zz_generated_deployment_parallel_config.go diff --git a/client/workload/v1/zz_generated_deployment_spec.go b/client/project/v3/zz_generated_deployment_spec.go similarity index 100% rename from client/workload/v1/zz_generated_deployment_spec.go rename to client/project/v3/zz_generated_deployment_spec.go diff --git a/client/workload/v1/zz_generated_deployment_status.go b/client/project/v3/zz_generated_deployment_status.go similarity index 100% rename from client/workload/v1/zz_generated_deployment_status.go rename to client/project/v3/zz_generated_deployment_status.go diff --git a/client/workload/v1/zz_generated_deployment_strategy.go b/client/project/v3/zz_generated_deployment_strategy.go similarity index 100% rename from client/workload/v1/zz_generated_deployment_strategy.go rename to client/project/v3/zz_generated_deployment_strategy.go diff --git a/client/workload/v1/zz_generated_downward_apiprojection.go b/client/project/v3/zz_generated_downward_apiprojection.go similarity index 100% rename from client/workload/v1/zz_generated_downward_apiprojection.go rename to client/project/v3/zz_generated_downward_apiprojection.go diff --git a/client/workload/v1/zz_generated_downward_apivolume_file.go b/client/project/v3/zz_generated_downward_apivolume_file.go similarity index 100% rename from client/workload/v1/zz_generated_downward_apivolume_file.go rename to client/project/v3/zz_generated_downward_apivolume_file.go diff --git a/client/workload/v1/zz_generated_downward_apivolume_source.go b/client/project/v3/zz_generated_downward_apivolume_source.go similarity index 100% rename from client/workload/v1/zz_generated_downward_apivolume_source.go rename to client/project/v3/zz_generated_downward_apivolume_source.go diff --git a/client/workload/v1/zz_generated_empty_dir_volume_source.go b/client/project/v3/zz_generated_empty_dir_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_empty_dir_volume_source.go rename to client/project/v3/zz_generated_empty_dir_volume_source.go diff --git a/client/workload/v1/zz_generated_env_from_source.go b/client/project/v3/zz_generated_env_from_source.go similarity index 100% rename from client/workload/v1/zz_generated_env_from_source.go rename to client/project/v3/zz_generated_env_from_source.go diff --git a/client/workload/v1/zz_generated_env_var.go b/client/project/v3/zz_generated_env_var.go similarity index 100% rename from client/workload/v1/zz_generated_env_var.go rename to client/project/v3/zz_generated_env_var.go diff --git a/client/workload/v1/zz_generated_env_var_source.go b/client/project/v3/zz_generated_env_var_source.go similarity index 100% rename from client/workload/v1/zz_generated_env_var_source.go rename to client/project/v3/zz_generated_env_var_source.go diff --git a/client/workload/v1/zz_generated_environment_from.go b/client/project/v3/zz_generated_environment_from.go similarity index 100% rename from client/workload/v1/zz_generated_environment_from.go rename to client/project/v3/zz_generated_environment_from.go diff --git a/client/workload/v1/zz_generated_exec_action.go b/client/project/v3/zz_generated_exec_action.go similarity index 100% rename from client/workload/v1/zz_generated_exec_action.go rename to client/project/v3/zz_generated_exec_action.go diff --git a/client/workload/v1/zz_generated_fc_volume_source.go b/client/project/v3/zz_generated_fc_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_fc_volume_source.go rename to client/project/v3/zz_generated_fc_volume_source.go diff --git a/client/workload/v1/zz_generated_flex_volume_source.go b/client/project/v3/zz_generated_flex_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_flex_volume_source.go rename to client/project/v3/zz_generated_flex_volume_source.go diff --git a/client/workload/v1/zz_generated_flocker_volume_source.go b/client/project/v3/zz_generated_flocker_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_flocker_volume_source.go rename to client/project/v3/zz_generated_flocker_volume_source.go diff --git a/client/workload/v1/zz_generated_gce_persistent_disk_volume_source.go b/client/project/v3/zz_generated_gce_persistent_disk_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_gce_persistent_disk_volume_source.go rename to client/project/v3/zz_generated_gce_persistent_disk_volume_source.go diff --git a/client/workload/v1/zz_generated_git_repo_volume_source.go b/client/project/v3/zz_generated_git_repo_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_git_repo_volume_source.go rename to client/project/v3/zz_generated_git_repo_volume_source.go diff --git a/client/workload/v1/zz_generated_glusterfs_volume_source.go b/client/project/v3/zz_generated_glusterfs_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_glusterfs_volume_source.go rename to client/project/v3/zz_generated_glusterfs_volume_source.go diff --git a/client/workload/v1/zz_generated_handler.go b/client/project/v3/zz_generated_handler.go similarity index 100% rename from client/workload/v1/zz_generated_handler.go rename to client/project/v3/zz_generated_handler.go diff --git a/client/workload/v1/zz_generated_host_alias.go b/client/project/v3/zz_generated_host_alias.go similarity index 100% rename from client/workload/v1/zz_generated_host_alias.go rename to client/project/v3/zz_generated_host_alias.go diff --git a/client/workload/v1/zz_generated_host_path_volume_source.go b/client/project/v3/zz_generated_host_path_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_host_path_volume_source.go rename to client/project/v3/zz_generated_host_path_volume_source.go diff --git a/client/workload/v1/zz_generated_http_get_action.go b/client/project/v3/zz_generated_http_get_action.go similarity index 100% rename from client/workload/v1/zz_generated_http_get_action.go rename to client/project/v3/zz_generated_http_get_action.go diff --git a/client/workload/v1/zz_generated_http_header.go b/client/project/v3/zz_generated_http_header.go similarity index 100% rename from client/workload/v1/zz_generated_http_header.go rename to client/project/v3/zz_generated_http_header.go diff --git a/client/workload/v1/zz_generated_initializer.go b/client/project/v3/zz_generated_initializer.go similarity index 100% rename from client/workload/v1/zz_generated_initializer.go rename to client/project/v3/zz_generated_initializer.go diff --git a/client/workload/v1/zz_generated_initializers.go b/client/project/v3/zz_generated_initializers.go similarity index 100% rename from client/workload/v1/zz_generated_initializers.go rename to client/project/v3/zz_generated_initializers.go diff --git a/client/workload/v1/zz_generated_iscsi_volume_source.go b/client/project/v3/zz_generated_iscsi_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_iscsi_volume_source.go rename to client/project/v3/zz_generated_iscsi_volume_source.go diff --git a/client/workload/v1/zz_generated_key_to_path.go b/client/project/v3/zz_generated_key_to_path.go similarity index 100% rename from client/workload/v1/zz_generated_key_to_path.go rename to client/project/v3/zz_generated_key_to_path.go diff --git a/client/workload/v1/zz_generated_label_selector.go b/client/project/v3/zz_generated_label_selector.go similarity index 100% rename from client/workload/v1/zz_generated_label_selector.go rename to client/project/v3/zz_generated_label_selector.go diff --git a/client/workload/v1/zz_generated_label_selector_requirement.go b/client/project/v3/zz_generated_label_selector_requirement.go similarity index 100% rename from client/workload/v1/zz_generated_label_selector_requirement.go rename to client/project/v3/zz_generated_label_selector_requirement.go diff --git a/client/workload/v1/zz_generated_lifecycle.go b/client/project/v3/zz_generated_lifecycle.go similarity index 100% rename from client/workload/v1/zz_generated_lifecycle.go rename to client/project/v3/zz_generated_lifecycle.go diff --git a/client/workload/v1/zz_generated_list_meta.go b/client/project/v3/zz_generated_list_meta.go similarity index 100% rename from client/workload/v1/zz_generated_list_meta.go rename to client/project/v3/zz_generated_list_meta.go diff --git a/client/workload/v1/zz_generated_local_object_reference.go b/client/project/v3/zz_generated_local_object_reference.go similarity index 100% rename from client/workload/v1/zz_generated_local_object_reference.go rename to client/project/v3/zz_generated_local_object_reference.go diff --git a/client/workload/v1/zz_generated_namespace.go b/client/project/v3/zz_generated_namespace.go similarity index 97% rename from client/workload/v1/zz_generated_namespace.go rename to client/project/v3/zz_generated_namespace.go index 0bfb9aff..14371953 100644 --- a/client/workload/v1/zz_generated_namespace.go +++ b/client/project/v3/zz_generated_namespace.go @@ -10,9 +10,9 @@ const ( NamespaceFieldAnswers = "answers" NamespaceFieldCreated = "created" NamespaceFieldExternalID = "externalId" + NamespaceFieldFinalizers = "finalizers" NamespaceFieldLabels = "labels" NamespaceFieldName = "name" - NamespaceFieldNamespace = "namespace" NamespaceFieldOwnerReferences = "ownerReferences" NamespaceFieldProjectID = "projectId" NamespaceFieldPrune = "prune" @@ -33,9 +33,9 @@ type Namespace struct { Answers map[string]interface{} `json:"answers,omitempty"` Created string `json:"created,omitempty"` ExternalID string `json:"externalId,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Labels map[string]string `json:"labels,omitempty"` Name string `json:"name,omitempty"` - Namespace string `json:"namespace,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` ProjectID string `json:"projectId,omitempty"` Prune *bool `json:"prune,omitempty"` diff --git a/client/workload/v1/zz_generated_namespace_spec.go b/client/project/v3/zz_generated_namespace_spec.go similarity index 100% rename from client/workload/v1/zz_generated_namespace_spec.go rename to client/project/v3/zz_generated_namespace_spec.go diff --git a/client/workload/v1/zz_generated_namespace_status.go b/client/project/v3/zz_generated_namespace_status.go similarity index 100% rename from client/workload/v1/zz_generated_namespace_status.go rename to client/project/v3/zz_generated_namespace_status.go diff --git a/client/workload/v1/zz_generated_nfs_volume_source.go b/client/project/v3/zz_generated_nfs_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_nfs_volume_source.go rename to client/project/v3/zz_generated_nfs_volume_source.go diff --git a/client/workload/v1/zz_generated_node_affinity.go b/client/project/v3/zz_generated_node_affinity.go similarity index 100% rename from client/workload/v1/zz_generated_node_affinity.go rename to client/project/v3/zz_generated_node_affinity.go diff --git a/client/workload/v1/zz_generated_node_scheduling.go b/client/project/v3/zz_generated_node_scheduling.go similarity index 100% rename from client/workload/v1/zz_generated_node_scheduling.go rename to client/project/v3/zz_generated_node_scheduling.go diff --git a/client/workload/v1/zz_generated_node_selector.go b/client/project/v3/zz_generated_node_selector.go similarity index 100% rename from client/workload/v1/zz_generated_node_selector.go rename to client/project/v3/zz_generated_node_selector.go diff --git a/client/workload/v1/zz_generated_node_selector_requirement.go b/client/project/v3/zz_generated_node_selector_requirement.go similarity index 100% rename from client/workload/v1/zz_generated_node_selector_requirement.go rename to client/project/v3/zz_generated_node_selector_requirement.go diff --git a/client/workload/v1/zz_generated_node_selector_term.go b/client/project/v3/zz_generated_node_selector_term.go similarity index 100% rename from client/workload/v1/zz_generated_node_selector_term.go rename to client/project/v3/zz_generated_node_selector_term.go diff --git a/client/workload/v1/zz_generated_object_field_selector.go b/client/project/v3/zz_generated_object_field_selector.go similarity index 100% rename from client/workload/v1/zz_generated_object_field_selector.go rename to client/project/v3/zz_generated_object_field_selector.go diff --git a/client/cluster/v1/zz_generated_object_meta.go b/client/project/v3/zz_generated_object_meta.go similarity index 90% rename from client/cluster/v1/zz_generated_object_meta.go rename to client/project/v3/zz_generated_object_meta.go index 86acd6ff..338b7da3 100644 --- a/client/cluster/v1/zz_generated_object_meta.go +++ b/client/project/v3/zz_generated_object_meta.go @@ -4,6 +4,7 @@ const ( ObjectMetaType = "objectMeta" ObjectMetaFieldAnnotations = "annotations" ObjectMetaFieldCreated = "created" + ObjectMetaFieldFinalizers = "finalizers" ObjectMetaFieldLabels = "labels" ObjectMetaFieldName = "name" ObjectMetaFieldNamespace = "namespace" @@ -16,6 +17,7 @@ const ( type ObjectMeta struct { 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"` Namespace string `json:"namespace,omitempty"` diff --git a/client/workload/v1/zz_generated_owner_reference.go b/client/project/v3/zz_generated_owner_reference.go similarity index 100% rename from client/workload/v1/zz_generated_owner_reference.go rename to client/project/v3/zz_generated_owner_reference.go diff --git a/client/workload/v1/zz_generated_persistent_volume_claim.go b/client/project/v3/zz_generated_persistent_volume_claim.go similarity index 97% rename from client/workload/v1/zz_generated_persistent_volume_claim.go rename to client/project/v3/zz_generated_persistent_volume_claim.go index 7e16df77..91ada78f 100644 --- a/client/workload/v1/zz_generated_persistent_volume_claim.go +++ b/client/project/v3/zz_generated_persistent_volume_claim.go @@ -9,6 +9,7 @@ const ( PersistentVolumeClaimFieldAccessModes = "accessModes" PersistentVolumeClaimFieldAnnotations = "annotations" PersistentVolumeClaimFieldCreated = "created" + PersistentVolumeClaimFieldFinalizers = "finalizers" PersistentVolumeClaimFieldLabels = "labels" PersistentVolumeClaimFieldName = "name" PersistentVolumeClaimFieldOwnerReferences = "ownerReferences" @@ -30,6 +31,7 @@ type PersistentVolumeClaim struct { AccessModes []string `json:"accessModes,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"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"` diff --git a/client/workload/v1/zz_generated_persistent_volume_claim_condition.go b/client/project/v3/zz_generated_persistent_volume_claim_condition.go similarity index 100% rename from client/workload/v1/zz_generated_persistent_volume_claim_condition.go rename to client/project/v3/zz_generated_persistent_volume_claim_condition.go diff --git a/client/workload/v1/zz_generated_persistent_volume_claim_spec.go b/client/project/v3/zz_generated_persistent_volume_claim_spec.go similarity index 100% rename from client/workload/v1/zz_generated_persistent_volume_claim_spec.go rename to client/project/v3/zz_generated_persistent_volume_claim_spec.go diff --git a/client/workload/v1/zz_generated_persistent_volume_claim_status.go b/client/project/v3/zz_generated_persistent_volume_claim_status.go similarity index 100% rename from client/workload/v1/zz_generated_persistent_volume_claim_status.go rename to client/project/v3/zz_generated_persistent_volume_claim_status.go diff --git a/client/workload/v1/zz_generated_persistent_volume_claim_volume_source.go b/client/project/v3/zz_generated_persistent_volume_claim_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_persistent_volume_claim_volume_source.go rename to client/project/v3/zz_generated_persistent_volume_claim_volume_source.go diff --git a/client/workload/v1/zz_generated_photon_persistent_disk_volume_source.go b/client/project/v3/zz_generated_photon_persistent_disk_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_photon_persistent_disk_volume_source.go rename to client/project/v3/zz_generated_photon_persistent_disk_volume_source.go diff --git a/client/workload/v1/zz_generated_pod.go b/client/project/v3/zz_generated_pod.go similarity index 98% rename from client/workload/v1/zz_generated_pod.go rename to client/project/v3/zz_generated_pod.go index 153ff02c..fb5064a8 100644 --- a/client/workload/v1/zz_generated_pod.go +++ b/client/project/v3/zz_generated_pod.go @@ -12,6 +12,7 @@ const ( PodFieldContainers = "containers" PodFieldCreated = "created" PodFieldDNSPolicy = "dnsPolicy" + PodFieldFinalizers = "finalizers" PodFieldFsgid = "fsgid" PodFieldGids = "gids" PodFieldHostAliases = "hostAliases" @@ -55,6 +56,7 @@ type Pod struct { Containers map[string]Container `json:"containers,omitempty"` Created string `json:"created,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Fsgid *int64 `json:"fsgid,omitempty"` Gids []int64 `json:"gids,omitempty"` HostAliases map[string]HostAlias `json:"hostAliases,omitempty"` diff --git a/client/workload/v1/zz_generated_pod_affinity.go b/client/project/v3/zz_generated_pod_affinity.go similarity index 100% rename from client/workload/v1/zz_generated_pod_affinity.go rename to client/project/v3/zz_generated_pod_affinity.go diff --git a/client/workload/v1/zz_generated_pod_affinity_term.go b/client/project/v3/zz_generated_pod_affinity_term.go similarity index 100% rename from client/workload/v1/zz_generated_pod_affinity_term.go rename to client/project/v3/zz_generated_pod_affinity_term.go diff --git a/client/workload/v1/zz_generated_pod_anti_affinity.go b/client/project/v3/zz_generated_pod_anti_affinity.go similarity index 100% rename from client/workload/v1/zz_generated_pod_anti_affinity.go rename to client/project/v3/zz_generated_pod_anti_affinity.go diff --git a/client/workload/v1/zz_generated_pod_condition.go b/client/project/v3/zz_generated_pod_condition.go similarity index 100% rename from client/workload/v1/zz_generated_pod_condition.go rename to client/project/v3/zz_generated_pod_condition.go diff --git a/client/workload/v1/zz_generated_pod_security_context.go b/client/project/v3/zz_generated_pod_security_context.go similarity index 100% rename from client/workload/v1/zz_generated_pod_security_context.go rename to client/project/v3/zz_generated_pod_security_context.go diff --git a/client/workload/v1/zz_generated_pod_spec.go b/client/project/v3/zz_generated_pod_spec.go similarity index 100% rename from client/workload/v1/zz_generated_pod_spec.go rename to client/project/v3/zz_generated_pod_spec.go diff --git a/client/workload/v1/zz_generated_pod_status.go b/client/project/v3/zz_generated_pod_status.go similarity index 100% rename from client/workload/v1/zz_generated_pod_status.go rename to client/project/v3/zz_generated_pod_status.go diff --git a/client/workload/v1/zz_generated_pod_template_spec.go b/client/project/v3/zz_generated_pod_template_spec.go similarity index 100% rename from client/workload/v1/zz_generated_pod_template_spec.go rename to client/project/v3/zz_generated_pod_template_spec.go diff --git a/client/workload/v1/zz_generated_portworx_volume_source.go b/client/project/v3/zz_generated_portworx_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_portworx_volume_source.go rename to client/project/v3/zz_generated_portworx_volume_source.go diff --git a/client/workload/v1/zz_generated_preferred_scheduling_term.go b/client/project/v3/zz_generated_preferred_scheduling_term.go similarity index 100% rename from client/workload/v1/zz_generated_preferred_scheduling_term.go rename to client/project/v3/zz_generated_preferred_scheduling_term.go diff --git a/client/workload/v1/zz_generated_probe.go b/client/project/v3/zz_generated_probe.go similarity index 100% rename from client/workload/v1/zz_generated_probe.go rename to client/project/v3/zz_generated_probe.go diff --git a/client/workload/v1/zz_generated_projected_volume_source.go b/client/project/v3/zz_generated_projected_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_projected_volume_source.go rename to client/project/v3/zz_generated_projected_volume_source.go diff --git a/client/workload/v1/zz_generated_quobyte_volume_source.go b/client/project/v3/zz_generated_quobyte_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_quobyte_volume_source.go rename to client/project/v3/zz_generated_quobyte_volume_source.go diff --git a/client/workload/v1/zz_generated_rbd_volume_source.go b/client/project/v3/zz_generated_rbd_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_rbd_volume_source.go rename to client/project/v3/zz_generated_rbd_volume_source.go diff --git a/client/workload/v1/zz_generated_replica_set.go b/client/project/v3/zz_generated_replica_set.go similarity index 98% rename from client/workload/v1/zz_generated_replica_set.go rename to client/project/v3/zz_generated_replica_set.go index 8009afad..68fe38da 100644 --- a/client/workload/v1/zz_generated_replica_set.go +++ b/client/project/v3/zz_generated_replica_set.go @@ -14,6 +14,7 @@ const ( ReplicaSetFieldCreated = "created" ReplicaSetFieldDNSPolicy = "dnsPolicy" ReplicaSetFieldDeploymentStrategy = "deploymentStrategy" + ReplicaSetFieldFinalizers = "finalizers" ReplicaSetFieldFsgid = "fsgid" ReplicaSetFieldGids = "gids" ReplicaSetFieldHostAliases = "hostAliases" @@ -61,6 +62,7 @@ type ReplicaSet struct { Created string `json:"created,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Fsgid *int64 `json:"fsgid,omitempty"` Gids []int64 `json:"gids,omitempty"` HostAliases map[string]HostAlias `json:"hostAliases,omitempty"` diff --git a/client/workload/v1/zz_generated_replica_set_condition.go b/client/project/v3/zz_generated_replica_set_condition.go similarity index 100% rename from client/workload/v1/zz_generated_replica_set_condition.go rename to client/project/v3/zz_generated_replica_set_condition.go diff --git a/client/workload/v1/zz_generated_replica_set_spec.go b/client/project/v3/zz_generated_replica_set_spec.go similarity index 100% rename from client/workload/v1/zz_generated_replica_set_spec.go rename to client/project/v3/zz_generated_replica_set_spec.go diff --git a/client/workload/v1/zz_generated_replica_set_status.go b/client/project/v3/zz_generated_replica_set_status.go similarity index 100% rename from client/workload/v1/zz_generated_replica_set_status.go rename to client/project/v3/zz_generated_replica_set_status.go diff --git a/client/workload/v1/zz_generated_replication_controller.go b/client/project/v3/zz_generated_replication_controller.go similarity index 98% rename from client/workload/v1/zz_generated_replication_controller.go rename to client/project/v3/zz_generated_replication_controller.go index 8740a6d6..dd0bf577 100644 --- a/client/workload/v1/zz_generated_replication_controller.go +++ b/client/project/v3/zz_generated_replication_controller.go @@ -14,6 +14,7 @@ const ( ReplicationControllerFieldCreated = "created" ReplicationControllerFieldDNSPolicy = "dnsPolicy" ReplicationControllerFieldDeploymentStrategy = "deploymentStrategy" + ReplicationControllerFieldFinalizers = "finalizers" ReplicationControllerFieldFsgid = "fsgid" ReplicationControllerFieldGids = "gids" ReplicationControllerFieldHostAliases = "hostAliases" @@ -61,6 +62,7 @@ type ReplicationController struct { Created string `json:"created,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Fsgid *int64 `json:"fsgid,omitempty"` Gids []int64 `json:"gids,omitempty"` HostAliases map[string]HostAlias `json:"hostAliases,omitempty"` diff --git a/client/workload/v1/zz_generated_replication_controller_condition.go b/client/project/v3/zz_generated_replication_controller_condition.go similarity index 100% rename from client/workload/v1/zz_generated_replication_controller_condition.go rename to client/project/v3/zz_generated_replication_controller_condition.go diff --git a/client/workload/v1/zz_generated_replication_controller_spec.go b/client/project/v3/zz_generated_replication_controller_spec.go similarity index 100% rename from client/workload/v1/zz_generated_replication_controller_spec.go rename to client/project/v3/zz_generated_replication_controller_spec.go diff --git a/client/workload/v1/zz_generated_replication_controller_status.go b/client/project/v3/zz_generated_replication_controller_status.go similarity index 100% rename from client/workload/v1/zz_generated_replication_controller_status.go rename to client/project/v3/zz_generated_replication_controller_status.go diff --git a/client/workload/v1/zz_generated_resource_field_selector.go b/client/project/v3/zz_generated_resource_field_selector.go similarity index 100% rename from client/workload/v1/zz_generated_resource_field_selector.go rename to client/project/v3/zz_generated_resource_field_selector.go diff --git a/client/workload/v1/zz_generated_resource_request.go b/client/project/v3/zz_generated_resource_request.go similarity index 100% rename from client/workload/v1/zz_generated_resource_request.go rename to client/project/v3/zz_generated_resource_request.go diff --git a/client/workload/v1/zz_generated_resource_requirements.go b/client/project/v3/zz_generated_resource_requirements.go similarity index 100% rename from client/workload/v1/zz_generated_resource_requirements.go rename to client/project/v3/zz_generated_resource_requirements.go diff --git a/client/workload/v1/zz_generated_resources.go b/client/project/v3/zz_generated_resources.go similarity index 100% rename from client/workload/v1/zz_generated_resources.go rename to client/project/v3/zz_generated_resources.go diff --git a/client/workload/v1/zz_generated_rolling_update_daemon_set.go b/client/project/v3/zz_generated_rolling_update_daemon_set.go similarity index 100% rename from client/workload/v1/zz_generated_rolling_update_daemon_set.go rename to client/project/v3/zz_generated_rolling_update_daemon_set.go diff --git a/client/workload/v1/zz_generated_rolling_update_deployment.go b/client/project/v3/zz_generated_rolling_update_deployment.go similarity index 100% rename from client/workload/v1/zz_generated_rolling_update_deployment.go rename to client/project/v3/zz_generated_rolling_update_deployment.go diff --git a/client/workload/v1/zz_generated_rolling_update_stateful_set_strategy.go b/client/project/v3/zz_generated_rolling_update_stateful_set_strategy.go similarity index 100% rename from client/workload/v1/zz_generated_rolling_update_stateful_set_strategy.go rename to client/project/v3/zz_generated_rolling_update_stateful_set_strategy.go diff --git a/client/workload/v1/zz_generated_scale_iovolume_source.go b/client/project/v3/zz_generated_scale_iovolume_source.go similarity index 100% rename from client/workload/v1/zz_generated_scale_iovolume_source.go rename to client/project/v3/zz_generated_scale_iovolume_source.go diff --git a/client/workload/v1/zz_generated_scheduling.go b/client/project/v3/zz_generated_scheduling.go similarity index 100% rename from client/workload/v1/zz_generated_scheduling.go rename to client/project/v3/zz_generated_scheduling.go diff --git a/client/workload/v1/zz_generated_se_linux_options.go b/client/project/v3/zz_generated_se_linux_options.go similarity index 100% rename from client/workload/v1/zz_generated_se_linux_options.go rename to client/project/v3/zz_generated_se_linux_options.go diff --git a/client/workload/v1/zz_generated_secret_env_source.go b/client/project/v3/zz_generated_secret_env_source.go similarity index 100% rename from client/workload/v1/zz_generated_secret_env_source.go rename to client/project/v3/zz_generated_secret_env_source.go diff --git a/client/workload/v1/zz_generated_secret_key_selector.go b/client/project/v3/zz_generated_secret_key_selector.go similarity index 100% rename from client/workload/v1/zz_generated_secret_key_selector.go rename to client/project/v3/zz_generated_secret_key_selector.go diff --git a/client/workload/v1/zz_generated_secret_projection.go b/client/project/v3/zz_generated_secret_projection.go similarity index 100% rename from client/workload/v1/zz_generated_secret_projection.go rename to client/project/v3/zz_generated_secret_projection.go diff --git a/client/workload/v1/zz_generated_secret_volume_source.go b/client/project/v3/zz_generated_secret_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_secret_volume_source.go rename to client/project/v3/zz_generated_secret_volume_source.go diff --git a/client/workload/v1/zz_generated_security_context.go b/client/project/v3/zz_generated_security_context.go similarity index 100% rename from client/workload/v1/zz_generated_security_context.go rename to client/project/v3/zz_generated_security_context.go diff --git a/client/workload/v1/zz_generated_stateful_set.go b/client/project/v3/zz_generated_stateful_set.go similarity index 98% rename from client/workload/v1/zz_generated_stateful_set.go rename to client/project/v3/zz_generated_stateful_set.go index 737af889..5f0e1360 100644 --- a/client/workload/v1/zz_generated_stateful_set.go +++ b/client/project/v3/zz_generated_stateful_set.go @@ -14,6 +14,7 @@ const ( StatefulSetFieldCreated = "created" StatefulSetFieldDNSPolicy = "dnsPolicy" StatefulSetFieldDeploymentStrategy = "deploymentStrategy" + StatefulSetFieldFinalizers = "finalizers" StatefulSetFieldFsgid = "fsgid" StatefulSetFieldGids = "gids" StatefulSetFieldHostAliases = "hostAliases" @@ -66,6 +67,7 @@ type StatefulSet struct { Created string `json:"created,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Fsgid *int64 `json:"fsgid,omitempty"` Gids []int64 `json:"gids,omitempty"` HostAliases map[string]HostAlias `json:"hostAliases,omitempty"` diff --git a/client/workload/v1/zz_generated_stateful_set_spec.go b/client/project/v3/zz_generated_stateful_set_spec.go similarity index 100% rename from client/workload/v1/zz_generated_stateful_set_spec.go rename to client/project/v3/zz_generated_stateful_set_spec.go diff --git a/client/workload/v1/zz_generated_stateful_set_status.go b/client/project/v3/zz_generated_stateful_set_status.go similarity index 100% rename from client/workload/v1/zz_generated_stateful_set_status.go rename to client/project/v3/zz_generated_stateful_set_status.go diff --git a/client/workload/v1/zz_generated_stateful_set_update_strategy.go b/client/project/v3/zz_generated_stateful_set_update_strategy.go similarity index 100% rename from client/workload/v1/zz_generated_stateful_set_update_strategy.go rename to client/project/v3/zz_generated_stateful_set_update_strategy.go diff --git a/client/workload/v1/zz_generated_status.go b/client/project/v3/zz_generated_status.go similarity index 100% rename from client/workload/v1/zz_generated_status.go rename to client/project/v3/zz_generated_status.go diff --git a/client/workload/v1/zz_generated_status_cause.go b/client/project/v3/zz_generated_status_cause.go similarity index 100% rename from client/workload/v1/zz_generated_status_cause.go rename to client/project/v3/zz_generated_status_cause.go diff --git a/client/workload/v1/zz_generated_status_details.go b/client/project/v3/zz_generated_status_details.go similarity index 100% rename from client/workload/v1/zz_generated_status_details.go rename to client/project/v3/zz_generated_status_details.go diff --git a/client/workload/v1/zz_generated_storage_osvolume_source.go b/client/project/v3/zz_generated_storage_osvolume_source.go similarity index 100% rename from client/workload/v1/zz_generated_storage_osvolume_source.go rename to client/project/v3/zz_generated_storage_osvolume_source.go diff --git a/client/workload/v1/zz_generated_tcp_socket_action.go b/client/project/v3/zz_generated_tcp_socket_action.go similarity index 100% rename from client/workload/v1/zz_generated_tcp_socket_action.go rename to client/project/v3/zz_generated_tcp_socket_action.go diff --git a/client/workload/v1/zz_generated_toleration.go b/client/project/v3/zz_generated_toleration.go similarity index 100% rename from client/workload/v1/zz_generated_toleration.go rename to client/project/v3/zz_generated_toleration.go diff --git a/client/workload/v1/zz_generated_volume.go b/client/project/v3/zz_generated_volume.go similarity index 100% rename from client/workload/v1/zz_generated_volume.go rename to client/project/v3/zz_generated_volume.go diff --git a/client/workload/v1/zz_generated_volume_mount.go b/client/project/v3/zz_generated_volume_mount.go similarity index 100% rename from client/workload/v1/zz_generated_volume_mount.go rename to client/project/v3/zz_generated_volume_mount.go diff --git a/client/workload/v1/zz_generated_volume_projection.go b/client/project/v3/zz_generated_volume_projection.go similarity index 100% rename from client/workload/v1/zz_generated_volume_projection.go rename to client/project/v3/zz_generated_volume_projection.go diff --git a/client/workload/v1/zz_generated_vsphere_virtual_disk_volume_source.go b/client/project/v3/zz_generated_vsphere_virtual_disk_volume_source.go similarity index 100% rename from client/workload/v1/zz_generated_vsphere_virtual_disk_volume_source.go rename to client/project/v3/zz_generated_vsphere_virtual_disk_volume_source.go diff --git a/client/workload/v1/zz_generated_weighted_pod_affinity_term.go b/client/project/v3/zz_generated_weighted_pod_affinity_term.go similarity index 100% rename from client/workload/v1/zz_generated_weighted_pod_affinity_term.go rename to client/project/v3/zz_generated_weighted_pod_affinity_term.go diff --git a/client/workload/v1/zz_generated_workload.go b/client/project/v3/zz_generated_workload.go similarity index 98% rename from client/workload/v1/zz_generated_workload.go rename to client/project/v3/zz_generated_workload.go index 4c2aba24..18916661 100644 --- a/client/workload/v1/zz_generated_workload.go +++ b/client/project/v3/zz_generated_workload.go @@ -14,6 +14,7 @@ const ( WorkloadFieldCreated = "created" WorkloadFieldDNSPolicy = "dnsPolicy" WorkloadFieldDeploymentStrategy = "deploymentStrategy" + WorkloadFieldFinalizers = "finalizers" WorkloadFieldFsgid = "fsgid" WorkloadFieldGids = "gids" WorkloadFieldHostAliases = "hostAliases" @@ -61,6 +62,7 @@ type Workload struct { Created string `json:"created,omitempty"` DNSPolicy string `json:"dnsPolicy,omitempty"` DeploymentStrategy *DeployStrategy `json:"deploymentStrategy,omitempty"` + Finalizers []string `json:"finalizers,omitempty"` Fsgid *int64 `json:"fsgid,omitempty"` Gids []int64 `json:"gids,omitempty"` HostAliases map[string]HostAlias `json:"hostAliases,omitempty"` diff --git a/client/workload/v1/zz_generated_workload_spec.go b/client/project/v3/zz_generated_workload_spec.go similarity index 100% rename from client/workload/v1/zz_generated_workload_spec.go rename to client/project/v3/zz_generated_workload_spec.go diff --git a/client/workload/v1/zz_generated_workload_status.go b/client/project/v3/zz_generated_workload_status.go similarity index 100% rename from client/workload/v1/zz_generated_workload_status.go rename to client/project/v3/zz_generated_workload_status.go