From 57640dab663ad14b0dc526104e7335951e924e74 Mon Sep 17 00:00:00 2001 From: Daishan Peng Date: Tue, 17 Apr 2018 17:11:55 -0700 Subject: [PATCH] generated changes --- .../v3/zz_generated_deepcopy.go | 107 +++++++- .../v3/zz_generated_k8s_client.go | 16 ++ .../v3/zz_generated_scheme.go | 2 + ...z_generated_template_content_controller.go | 251 +++++++++++++++++ ...ated_template_content_lifecycle_adapter.go | 51 ++++ .../zz_generated_app_revision_controller.go | 252 ++++++++++++++++++ ...enerated_app_revision_lifecycle_adapter.go | 51 ++++ .../v3/zz_generated_deepcopy.go | 153 ++++++++--- .../v3/zz_generated_k8s_client.go | 16 ++ .../v3/zz_generated_scheme.go | 2 + client/management/v3/zz_generated_client.go | 2 + client/management/v3/zz_generated_file.go | 12 - client/management/v3/zz_generated_question.go | 64 +++-- .../v3/zz_generated_sub_question.go | 38 +++ .../v3/zz_generated_template_content.go | 93 +++++++ .../v3/zz_generated_template_version.go | 6 +- .../v3/zz_generated_template_version_spec.go | 6 +- client/project/v3/zz_generated_app.go | 12 +- .../project/v3/zz_generated_app_revision.go | 101 +++++++ .../v3/zz_generated_app_revision_spec.go | 8 + .../v3/zz_generated_app_revision_status.go | 16 ++ client/project/v3/zz_generated_app_spec.go | 30 +-- client/project/v3/zz_generated_app_status.go | 16 +- client/project/v3/zz_generated_client.go | 2 + .../project/v3/zz_generated_release_info.go | 18 -- compose/zz_generated_compose.go | 2 + 26 files changed, 1196 insertions(+), 131 deletions(-) create mode 100644 apis/management.cattle.io/v3/zz_generated_template_content_controller.go create mode 100644 apis/management.cattle.io/v3/zz_generated_template_content_lifecycle_adapter.go create mode 100644 apis/project.cattle.io/v3/zz_generated_app_revision_controller.go create mode 100644 apis/project.cattle.io/v3/zz_generated_app_revision_lifecycle_adapter.go delete mode 100644 client/management/v3/zz_generated_file.go create mode 100644 client/management/v3/zz_generated_sub_question.go create mode 100644 client/management/v3/zz_generated_template_content.go create mode 100644 client/project/v3/zz_generated_app_revision.go create mode 100644 client/project/v3/zz_generated_app_revision_spec.go create mode 100644 client/project/v3/zz_generated_app_revision_status.go delete mode 100644 client/project/v3/zz_generated_release_info.go diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 9fd314fb..f5c37d5e 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -848,6 +848,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*StepStatus).DeepCopyInto(out.(*StepStatus)) return nil }, InType: reflect.TypeOf(&StepStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*SubQuestion).DeepCopyInto(out.(*SubQuestion)) + return nil + }, InType: reflect.TypeOf(&SubQuestion{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*SyslogConfig).DeepCopyInto(out.(*SyslogConfig)) return nil @@ -876,6 +880,14 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*Template).DeepCopyInto(out.(*Template)) return nil }, InType: reflect.TypeOf(&Template{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*TemplateContent).DeepCopyInto(out.(*TemplateContent)) + return nil + }, InType: reflect.TypeOf(&TemplateContent{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*TemplateContentList).DeepCopyInto(out.(*TemplateContentList)) + return nil + }, InType: reflect.TypeOf(&TemplateContentList{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*TemplateList).DeepCopyInto(out.(*TemplateList)) return nil @@ -5641,6 +5653,13 @@ func (in *Question) DeepCopyInto(out *Question) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.Subquestions != nil { + in, out := &in.Subquestions, &out.Subquestions + *out = make([]SubQuestion, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } return } @@ -6458,6 +6477,27 @@ func (in *StepStatus) DeepCopy() *StepStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *SubQuestion) DeepCopyInto(out *SubQuestion) { + *out = *in + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make([]string, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SubQuestion. +func (in *SubQuestion) DeepCopy() *SubQuestion { + if in == nil { + return nil + } + out := new(SubQuestion) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SyslogConfig) DeepCopyInto(out *SyslogConfig) { *out = *in @@ -6597,6 +6637,67 @@ func (in *Template) DeepCopyObject() runtime.Object { } } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TemplateContent) DeepCopyInto(out *TemplateContent) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TemplateContent. +func (in *TemplateContent) DeepCopy() *TemplateContent { + if in == nil { + return nil + } + out := new(TemplateContent) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *TemplateContent) 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 *TemplateContentList) DeepCopyInto(out *TemplateContentList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]TemplateContent, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TemplateContentList. +func (in *TemplateContentList) DeepCopy() *TemplateContentList { + if in == nil { + return nil + } + out := new(TemplateContentList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *TemplateContentList) 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 *TemplateList) DeepCopyInto(out *TemplateList) { *out = *in @@ -6759,8 +6860,10 @@ func (in *TemplateVersionSpec) DeepCopyInto(out *TemplateVersionSpec) { } if in.Files != nil { in, out := &in.Files, &out.Files - *out = make([]File, len(*in)) - copy(*out, *in) + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } } if in.Questions != nil { in, out := &in.Questions, &out.Questions diff --git a/apis/management.cattle.io/v3/zz_generated_k8s_client.go b/apis/management.cattle.io/v3/zz_generated_k8s_client.go index 359fa60c..be177c7f 100644 --- a/apis/management.cattle.io/v3/zz_generated_k8s_client.go +++ b/apis/management.cattle.io/v3/zz_generated_k8s_client.go @@ -33,6 +33,7 @@ type Interface interface { CatalogsGetter TemplatesGetter TemplateVersionsGetter + TemplateContentsGetter GroupsGetter GroupMembersGetter PrincipalsGetter @@ -82,6 +83,7 @@ type Client struct { catalogControllers map[string]CatalogController templateControllers map[string]TemplateController templateVersionControllers map[string]TemplateVersionController + templateContentControllers map[string]TemplateContentController groupControllers map[string]GroupController groupMemberControllers map[string]GroupMemberController principalControllers map[string]PrincipalController @@ -140,6 +142,7 @@ func NewForConfig(config rest.Config) (Interface, error) { catalogControllers: map[string]CatalogController{}, templateControllers: map[string]TemplateController{}, templateVersionControllers: map[string]TemplateVersionController{}, + templateContentControllers: map[string]TemplateContentController{}, groupControllers: map[string]GroupController{}, groupMemberControllers: map[string]GroupMemberController{}, principalControllers: map[string]PrincipalController{}, @@ -413,6 +416,19 @@ func (c *Client) TemplateVersions(namespace string) TemplateVersionInterface { } } +type TemplateContentsGetter interface { + TemplateContents(namespace string) TemplateContentInterface +} + +func (c *Client) TemplateContents(namespace string) TemplateContentInterface { + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &TemplateContentResource, TemplateContentGroupVersionKind, templateContentFactory{}) + return &templateContentClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} + type GroupsGetter interface { Groups(namespace string) GroupInterface } diff --git a/apis/management.cattle.io/v3/zz_generated_scheme.go b/apis/management.cattle.io/v3/zz_generated_scheme.go index 06b614eb..ab90db86 100644 --- a/apis/management.cattle.io/v3/zz_generated_scheme.go +++ b/apis/management.cattle.io/v3/zz_generated_scheme.go @@ -69,6 +69,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { &TemplateList{}, &TemplateVersion{}, &TemplateVersionList{}, + &TemplateContent{}, + &TemplateContentList{}, &Group{}, &GroupList{}, &GroupMember{}, diff --git a/apis/management.cattle.io/v3/zz_generated_template_content_controller.go b/apis/management.cattle.io/v3/zz_generated_template_content_controller.go new file mode 100644 index 00000000..6fba6068 --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_template_content_controller.go @@ -0,0 +1,251 @@ +package v3 + +import ( + "context" + + "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" + "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 ( + TemplateContentGroupVersionKind = schema.GroupVersionKind{ + Version: Version, + Group: GroupName, + Kind: "TemplateContent", + } + TemplateContentResource = metav1.APIResource{ + Name: "templatecontents", + SingularName: "templatecontent", + Namespaced: false, + Kind: TemplateContentGroupVersionKind.Kind, + } +) + +type TemplateContentList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []TemplateContent +} + +type TemplateContentHandlerFunc func(key string, obj *TemplateContent) error + +type TemplateContentLister interface { + List(namespace string, selector labels.Selector) (ret []*TemplateContent, err error) + Get(namespace, name string) (*TemplateContent, error) +} + +type TemplateContentController interface { + Informer() cache.SharedIndexInformer + Lister() TemplateContentLister + AddHandler(name string, handler TemplateContentHandlerFunc) + AddClusterScopedHandler(name, clusterName string, handler TemplateContentHandlerFunc) + Enqueue(namespace, name string) + Sync(ctx context.Context) error + Start(ctx context.Context, threadiness int) error +} + +type TemplateContentInterface interface { + ObjectClient() *objectclient.ObjectClient + Create(*TemplateContent) (*TemplateContent, error) + GetNamespaced(namespace, name string, opts metav1.GetOptions) (*TemplateContent, error) + Get(name string, opts metav1.GetOptions) (*TemplateContent, error) + Update(*TemplateContent) (*TemplateContent, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*TemplateContentList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) + DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error + Controller() TemplateContentController + AddHandler(name string, sync TemplateContentHandlerFunc) + AddLifecycle(name string, lifecycle TemplateContentLifecycle) + AddClusterScopedHandler(name, clusterName string, sync TemplateContentHandlerFunc) + AddClusterScopedLifecycle(name, clusterName string, lifecycle TemplateContentLifecycle) +} + +type templateContentLister struct { + controller *templateContentController +} + +func (l *templateContentLister) List(namespace string, selector labels.Selector) (ret []*TemplateContent, err error) { + err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) { + ret = append(ret, obj.(*TemplateContent)) + }) + return +} + +func (l *templateContentLister) Get(namespace, name string) (*TemplateContent, error) { + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(schema.GroupResource{ + Group: TemplateContentGroupVersionKind.Group, + Resource: "templateContent", + }, name) + } + return obj.(*TemplateContent), nil +} + +type templateContentController struct { + controller.GenericController +} + +func (c *templateContentController) Lister() TemplateContentLister { + return &templateContentLister{ + controller: c, + } +} + +func (c *templateContentController) AddHandler(name string, handler TemplateContentHandlerFunc) { + c.GenericController.AddHandler(name, func(key string) error { + obj, exists, err := c.Informer().GetStore().GetByKey(key) + if err != nil { + return err + } + if !exists { + return handler(key, nil) + } + return handler(key, obj.(*TemplateContent)) + }) +} + +func (c *templateContentController) AddClusterScopedHandler(name, cluster string, handler TemplateContentHandlerFunc) { + c.GenericController.AddHandler(name, func(key string) error { + obj, exists, err := c.Informer().GetStore().GetByKey(key) + if err != nil { + return err + } + if !exists { + return handler(key, nil) + } + + if !controller.ObjectInCluster(cluster, obj) { + return nil + } + + return handler(key, obj.(*TemplateContent)) + }) +} + +type templateContentFactory struct { +} + +func (c templateContentFactory) Object() runtime.Object { + return &TemplateContent{} +} + +func (c templateContentFactory) List() runtime.Object { + return &TemplateContentList{} +} + +func (s *templateContentClient) Controller() TemplateContentController { + s.client.Lock() + defer s.client.Unlock() + + c, ok := s.client.templateContentControllers[s.ns] + if ok { + return c + } + + genericController := controller.NewGenericController(TemplateContentGroupVersionKind.Kind+"Controller", + s.objectClient) + + c = &templateContentController{ + GenericController: genericController, + } + + s.client.templateContentControllers[s.ns] = c + s.client.starters = append(s.client.starters, c) + + return c +} + +type templateContentClient struct { + client *Client + ns string + objectClient *objectclient.ObjectClient + controller TemplateContentController +} + +func (s *templateContentClient) ObjectClient() *objectclient.ObjectClient { + return s.objectClient +} + +func (s *templateContentClient) Create(o *TemplateContent) (*TemplateContent, error) { + obj, err := s.objectClient.Create(o) + return obj.(*TemplateContent), err +} + +func (s *templateContentClient) Get(name string, opts metav1.GetOptions) (*TemplateContent, error) { + obj, err := s.objectClient.Get(name, opts) + return obj.(*TemplateContent), err +} + +func (s *templateContentClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*TemplateContent, error) { + obj, err := s.objectClient.GetNamespaced(namespace, name, opts) + return obj.(*TemplateContent), err +} + +func (s *templateContentClient) Update(o *TemplateContent) (*TemplateContent, error) { + obj, err := s.objectClient.Update(o.Name, o) + return obj.(*TemplateContent), err +} + +func (s *templateContentClient) Delete(name string, options *metav1.DeleteOptions) error { + return s.objectClient.Delete(name, options) +} + +func (s *templateContentClient) DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespaced(namespace, name, options) +} + +func (s *templateContentClient) List(opts metav1.ListOptions) (*TemplateContentList, error) { + obj, err := s.objectClient.List(opts) + return obj.(*TemplateContentList), err +} + +func (s *templateContentClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { + return s.objectClient.Watch(opts) +} + +// Patch applies the patch and returns the patched deployment. +func (s *templateContentClient) Patch(o *TemplateContent, data []byte, subresources ...string) (*TemplateContent, error) { + obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) + return obj.(*TemplateContent), err +} + +func (s *templateContentClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error { + return s.objectClient.DeleteCollection(deleteOpts, listOpts) +} + +func (s *templateContentClient) AddHandler(name string, sync TemplateContentHandlerFunc) { + s.Controller().AddHandler(name, sync) +} + +func (s *templateContentClient) AddLifecycle(name string, lifecycle TemplateContentLifecycle) { + sync := NewTemplateContentLifecycleAdapter(name, false, s, lifecycle) + s.AddHandler(name, sync) +} + +func (s *templateContentClient) AddClusterScopedHandler(name, clusterName string, sync TemplateContentHandlerFunc) { + s.Controller().AddClusterScopedHandler(name, clusterName, sync) +} + +func (s *templateContentClient) AddClusterScopedLifecycle(name, clusterName string, lifecycle TemplateContentLifecycle) { + sync := NewTemplateContentLifecycleAdapter(name+"_"+clusterName, true, s, lifecycle) + s.AddClusterScopedHandler(name, clusterName, sync) +} diff --git a/apis/management.cattle.io/v3/zz_generated_template_content_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_template_content_lifecycle_adapter.go new file mode 100644 index 00000000..83cf95bd --- /dev/null +++ b/apis/management.cattle.io/v3/zz_generated_template_content_lifecycle_adapter.go @@ -0,0 +1,51 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type TemplateContentLifecycle interface { + Create(obj *TemplateContent) (*TemplateContent, error) + Remove(obj *TemplateContent) (*TemplateContent, error) + Updated(obj *TemplateContent) (*TemplateContent, error) +} + +type templateContentLifecycleAdapter struct { + lifecycle TemplateContentLifecycle +} + +func (w *templateContentLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Create(obj.(*TemplateContent)) + if o == nil { + return nil, err + } + return o, err +} + +func (w *templateContentLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Remove(obj.(*TemplateContent)) + if o == nil { + return nil, err + } + return o, err +} + +func (w *templateContentLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Updated(obj.(*TemplateContent)) + if o == nil { + return nil, err + } + return o, err +} + +func NewTemplateContentLifecycleAdapter(name string, clusterScoped bool, client TemplateContentInterface, l TemplateContentLifecycle) TemplateContentHandlerFunc { + adapter := &templateContentLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) + return func(key string, obj *TemplateContent) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go b/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go new file mode 100644 index 00000000..daf24aa6 --- /dev/null +++ b/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go @@ -0,0 +1,252 @@ +package v3 + +import ( + "context" + + "github.com/rancher/norman/controller" + "github.com/rancher/norman/objectclient" + "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 ( + AppRevisionGroupVersionKind = schema.GroupVersionKind{ + Version: Version, + Group: GroupName, + Kind: "AppRevision", + } + AppRevisionResource = metav1.APIResource{ + Name: "apprevisions", + SingularName: "apprevision", + Namespaced: true, + + Kind: AppRevisionGroupVersionKind.Kind, + } +) + +type AppRevisionList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []AppRevision +} + +type AppRevisionHandlerFunc func(key string, obj *AppRevision) error + +type AppRevisionLister interface { + List(namespace string, selector labels.Selector) (ret []*AppRevision, err error) + Get(namespace, name string) (*AppRevision, error) +} + +type AppRevisionController interface { + Informer() cache.SharedIndexInformer + Lister() AppRevisionLister + AddHandler(name string, handler AppRevisionHandlerFunc) + AddClusterScopedHandler(name, clusterName string, handler AppRevisionHandlerFunc) + Enqueue(namespace, name string) + Sync(ctx context.Context) error + Start(ctx context.Context, threadiness int) error +} + +type AppRevisionInterface interface { + ObjectClient() *objectclient.ObjectClient + Create(*AppRevision) (*AppRevision, error) + GetNamespaced(namespace, name string, opts metav1.GetOptions) (*AppRevision, error) + Get(name string, opts metav1.GetOptions) (*AppRevision, error) + Update(*AppRevision) (*AppRevision, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*AppRevisionList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) + DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error + Controller() AppRevisionController + AddHandler(name string, sync AppRevisionHandlerFunc) + AddLifecycle(name string, lifecycle AppRevisionLifecycle) + AddClusterScopedHandler(name, clusterName string, sync AppRevisionHandlerFunc) + AddClusterScopedLifecycle(name, clusterName string, lifecycle AppRevisionLifecycle) +} + +type appRevisionLister struct { + controller *appRevisionController +} + +func (l *appRevisionLister) List(namespace string, selector labels.Selector) (ret []*AppRevision, err error) { + err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) { + ret = append(ret, obj.(*AppRevision)) + }) + return +} + +func (l *appRevisionLister) Get(namespace, name string) (*AppRevision, error) { + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(schema.GroupResource{ + Group: AppRevisionGroupVersionKind.Group, + Resource: "appRevision", + }, name) + } + return obj.(*AppRevision), nil +} + +type appRevisionController struct { + controller.GenericController +} + +func (c *appRevisionController) Lister() AppRevisionLister { + return &appRevisionLister{ + controller: c, + } +} + +func (c *appRevisionController) AddHandler(name string, handler AppRevisionHandlerFunc) { + c.GenericController.AddHandler(name, func(key string) error { + obj, exists, err := c.Informer().GetStore().GetByKey(key) + if err != nil { + return err + } + if !exists { + return handler(key, nil) + } + return handler(key, obj.(*AppRevision)) + }) +} + +func (c *appRevisionController) AddClusterScopedHandler(name, cluster string, handler AppRevisionHandlerFunc) { + c.GenericController.AddHandler(name, func(key string) error { + obj, exists, err := c.Informer().GetStore().GetByKey(key) + if err != nil { + return err + } + if !exists { + return handler(key, nil) + } + + if !controller.ObjectInCluster(cluster, obj) { + return nil + } + + return handler(key, obj.(*AppRevision)) + }) +} + +type appRevisionFactory struct { +} + +func (c appRevisionFactory) Object() runtime.Object { + return &AppRevision{} +} + +func (c appRevisionFactory) List() runtime.Object { + return &AppRevisionList{} +} + +func (s *appRevisionClient) Controller() AppRevisionController { + s.client.Lock() + defer s.client.Unlock() + + c, ok := s.client.appRevisionControllers[s.ns] + if ok { + return c + } + + genericController := controller.NewGenericController(AppRevisionGroupVersionKind.Kind+"Controller", + s.objectClient) + + c = &appRevisionController{ + GenericController: genericController, + } + + s.client.appRevisionControllers[s.ns] = c + s.client.starters = append(s.client.starters, c) + + return c +} + +type appRevisionClient struct { + client *Client + ns string + objectClient *objectclient.ObjectClient + controller AppRevisionController +} + +func (s *appRevisionClient) ObjectClient() *objectclient.ObjectClient { + return s.objectClient +} + +func (s *appRevisionClient) Create(o *AppRevision) (*AppRevision, error) { + obj, err := s.objectClient.Create(o) + return obj.(*AppRevision), err +} + +func (s *appRevisionClient) Get(name string, opts metav1.GetOptions) (*AppRevision, error) { + obj, err := s.objectClient.Get(name, opts) + return obj.(*AppRevision), err +} + +func (s *appRevisionClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*AppRevision, error) { + obj, err := s.objectClient.GetNamespaced(namespace, name, opts) + return obj.(*AppRevision), err +} + +func (s *appRevisionClient) Update(o *AppRevision) (*AppRevision, error) { + obj, err := s.objectClient.Update(o.Name, o) + return obj.(*AppRevision), err +} + +func (s *appRevisionClient) Delete(name string, options *metav1.DeleteOptions) error { + return s.objectClient.Delete(name, options) +} + +func (s *appRevisionClient) DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error { + return s.objectClient.DeleteNamespaced(namespace, name, options) +} + +func (s *appRevisionClient) List(opts metav1.ListOptions) (*AppRevisionList, error) { + obj, err := s.objectClient.List(opts) + return obj.(*AppRevisionList), err +} + +func (s *appRevisionClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { + return s.objectClient.Watch(opts) +} + +// Patch applies the patch and returns the patched deployment. +func (s *appRevisionClient) Patch(o *AppRevision, data []byte, subresources ...string) (*AppRevision, error) { + obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) + return obj.(*AppRevision), err +} + +func (s *appRevisionClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error { + return s.objectClient.DeleteCollection(deleteOpts, listOpts) +} + +func (s *appRevisionClient) AddHandler(name string, sync AppRevisionHandlerFunc) { + s.Controller().AddHandler(name, sync) +} + +func (s *appRevisionClient) AddLifecycle(name string, lifecycle AppRevisionLifecycle) { + sync := NewAppRevisionLifecycleAdapter(name, false, s, lifecycle) + s.AddHandler(name, sync) +} + +func (s *appRevisionClient) AddClusterScopedHandler(name, clusterName string, sync AppRevisionHandlerFunc) { + s.Controller().AddClusterScopedHandler(name, clusterName, sync) +} + +func (s *appRevisionClient) AddClusterScopedLifecycle(name, clusterName string, lifecycle AppRevisionLifecycle) { + sync := NewAppRevisionLifecycleAdapter(name+"_"+clusterName, true, s, lifecycle) + s.AddClusterScopedHandler(name, clusterName, sync) +} diff --git a/apis/project.cattle.io/v3/zz_generated_app_revision_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_app_revision_lifecycle_adapter.go new file mode 100644 index 00000000..525ba649 --- /dev/null +++ b/apis/project.cattle.io/v3/zz_generated_app_revision_lifecycle_adapter.go @@ -0,0 +1,51 @@ +package v3 + +import ( + "github.com/rancher/norman/lifecycle" + "k8s.io/apimachinery/pkg/runtime" +) + +type AppRevisionLifecycle interface { + Create(obj *AppRevision) (*AppRevision, error) + Remove(obj *AppRevision) (*AppRevision, error) + Updated(obj *AppRevision) (*AppRevision, error) +} + +type appRevisionLifecycleAdapter struct { + lifecycle AppRevisionLifecycle +} + +func (w *appRevisionLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Create(obj.(*AppRevision)) + if o == nil { + return nil, err + } + return o, err +} + +func (w *appRevisionLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Remove(obj.(*AppRevision)) + if o == nil { + return nil, err + } + return o, err +} + +func (w *appRevisionLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) { + o, err := w.lifecycle.Updated(obj.(*AppRevision)) + if o == nil { + return nil, err + } + return o, err +} + +func NewAppRevisionLifecycleAdapter(name string, clusterScoped bool, client AppRevisionInterface, l AppRevisionLifecycle) AppRevisionHandlerFunc { + adapter := &appRevisionLifecycleAdapter{lifecycle: l} + syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) + return func(key string, obj *AppRevision) error { + if obj == nil { + return syncFn(key, nil) + } + return syncFn(key, obj) + } +} diff --git a/apis/project.cattle.io/v3/zz_generated_deepcopy.go b/apis/project.cattle.io/v3/zz_generated_deepcopy.go index 448bb192..3f09fcc6 100644 --- a/apis/project.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/project.cattle.io/v3/zz_generated_deepcopy.go @@ -29,6 +29,22 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*AppList).DeepCopyInto(out.(*AppList)) return nil }, InType: reflect.TypeOf(&AppList{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*AppRevision).DeepCopyInto(out.(*AppRevision)) + return nil + }, InType: reflect.TypeOf(&AppRevision{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*AppRevisionList).DeepCopyInto(out.(*AppRevisionList)) + return nil + }, InType: reflect.TypeOf(&AppRevisionList{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*AppRevisionSpec).DeepCopyInto(out.(*AppRevisionSpec)) + return nil + }, InType: reflect.TypeOf(&AppRevisionSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*AppRevisionStatus).DeepCopyInto(out.(*AppRevisionStatus)) + return nil + }, InType: reflect.TypeOf(&AppRevisionStatus{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*AppSpec).DeepCopyInto(out.(*AppSpec)) return nil @@ -133,10 +149,6 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*RegistryCredential).DeepCopyInto(out.(*RegistryCredential)) return nil }, InType: reflect.TypeOf(&RegistryCredential{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ReleaseInfo).DeepCopyInto(out.(*ReleaseInfo)) - return nil - }, InType: reflect.TypeOf(&ReleaseInfo{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*SSHAuth).DeepCopyInto(out.(*SSHAuth)) return nil @@ -245,15 +257,111 @@ func (in *AppList) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *AppSpec) DeepCopyInto(out *AppSpec) { +func (in *AppRevision) DeepCopyInto(out *AppRevision) { *out = *in - if in.Templates != nil { - in, out := &in.Templates, &out.Templates + out.Namespaced = in.Namespaced + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + in.Status.DeepCopyInto(&out.Status) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRevision. +func (in *AppRevision) DeepCopy() *AppRevision { + if in == nil { + return nil + } + out := new(AppRevision) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *AppRevision) 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 *AppRevisionList) DeepCopyInto(out *AppRevisionList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]AppRevision, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRevisionList. +func (in *AppRevisionList) DeepCopy() *AppRevisionList { + if in == nil { + return nil + } + out := new(AppRevisionList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *AppRevisionList) 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 *AppRevisionSpec) DeepCopyInto(out *AppRevisionSpec) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppRevisionSpec. +func (in *AppRevisionSpec) DeepCopy() *AppRevisionSpec { + if in == nil { + return nil + } + out := new(AppRevisionSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AppRevisionStatus) DeepCopyInto(out *AppRevisionStatus) { + *out = *in + if in.Answers != nil { + in, out := &in.Answers, &out.Answers *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 AppRevisionStatus. +func (in *AppRevisionStatus) DeepCopy() *AppRevisionStatus { + if in == nil { + return nil + } + out := new(AppRevisionStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AppSpec) DeepCopyInto(out *AppSpec) { + *out = *in if in.Answers != nil { in, out := &in.Answers, &out.Answers *out = make(map[string]string, len(*in)) @@ -277,21 +385,6 @@ func (in *AppSpec) DeepCopy() *AppSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AppStatus) DeepCopyInto(out *AppStatus) { *out = *in - if in.StdOutput != nil { - in, out := &in.StdOutput, &out.StdOutput - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.StdError != nil { - in, out := &in.StdError, &out.StdError - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.Releases != nil { - in, out := &in.Releases, &out.Releases - *out = make([]ReleaseInfo, len(*in)) - copy(*out, *in) - } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions *out = make([]AppCondition, len(*in)) @@ -1000,22 +1093,6 @@ func (in *RegistryCredential) DeepCopy() *RegistryCredential { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ReleaseInfo) DeepCopyInto(out *ReleaseInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReleaseInfo. -func (in *ReleaseInfo) DeepCopy() *ReleaseInfo { - if in == nil { - return nil - } - out := new(ReleaseInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SSHAuth) DeepCopyInto(out *SSHAuth) { *out = *in diff --git a/apis/project.cattle.io/v3/zz_generated_k8s_client.go b/apis/project.cattle.io/v3/zz_generated_k8s_client.go index f3faca6d..0a7be137 100644 --- a/apis/project.cattle.io/v3/zz_generated_k8s_client.go +++ b/apis/project.cattle.io/v3/zz_generated_k8s_client.go @@ -27,6 +27,7 @@ type Interface interface { NamespacedSSHAuthsGetter WorkloadsGetter AppsGetter + AppRevisionsGetter NamespaceComposeConfigsGetter } @@ -47,6 +48,7 @@ type Client struct { namespacedSshAuthControllers map[string]NamespacedSSHAuthController workloadControllers map[string]WorkloadController appControllers map[string]AppController + appRevisionControllers map[string]AppRevisionController namespaceComposeConfigControllers map[string]NamespaceComposeConfigController } @@ -76,6 +78,7 @@ func NewForConfig(config rest.Config) (Interface, error) { namespacedSshAuthControllers: map[string]NamespacedSSHAuthController{}, workloadControllers: map[string]WorkloadController{}, appControllers: map[string]AppController{}, + appRevisionControllers: map[string]AppRevisionController{}, namespaceComposeConfigControllers: map[string]NamespaceComposeConfigController{}, }, nil } @@ -248,6 +251,19 @@ func (c *Client) Apps(namespace string) AppInterface { } } +type AppRevisionsGetter interface { + AppRevisions(namespace string) AppRevisionInterface +} + +func (c *Client) AppRevisions(namespace string) AppRevisionInterface { + objectClient := objectclient.NewObjectClient(namespace, c.restClient, &AppRevisionResource, AppRevisionGroupVersionKind, appRevisionFactory{}) + return &appRevisionClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} + type NamespaceComposeConfigsGetter interface { NamespaceComposeConfigs(namespace string) NamespaceComposeConfigInterface } diff --git a/apis/project.cattle.io/v3/zz_generated_scheme.go b/apis/project.cattle.io/v3/zz_generated_scheme.go index cb1f7342..00fd6e0f 100644 --- a/apis/project.cattle.io/v3/zz_generated_scheme.go +++ b/apis/project.cattle.io/v3/zz_generated_scheme.go @@ -57,6 +57,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { &WorkloadList{}, &App{}, &AppList{}, + &AppRevision{}, + &AppRevisionList{}, &NamespaceComposeConfig{}, &NamespaceComposeConfigList{}, ) diff --git a/client/management/v3/zz_generated_client.go b/client/management/v3/zz_generated_client.go index d1a08c34..7a334335 100644 --- a/client/management/v3/zz_generated_client.go +++ b/client/management/v3/zz_generated_client.go @@ -25,6 +25,7 @@ type Client struct { Catalog CatalogOperations Template TemplateOperations TemplateVersion TemplateVersionOperations + TemplateContent TemplateContentOperations Group GroupOperations GroupMember GroupMemberOperations Principal PrincipalOperations @@ -79,6 +80,7 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) { client.Catalog = newCatalogClient(client) client.Template = newTemplateClient(client) client.TemplateVersion = newTemplateVersionClient(client) + client.TemplateContent = newTemplateContentClient(client) client.Group = newGroupClient(client) client.GroupMember = newGroupMemberClient(client) client.Principal = newPrincipalClient(client) diff --git a/client/management/v3/zz_generated_file.go b/client/management/v3/zz_generated_file.go deleted file mode 100644 index 18d80cc7..00000000 --- a/client/management/v3/zz_generated_file.go +++ /dev/null @@ -1,12 +0,0 @@ -package client - -const ( - FileType = "file" - FileFieldContents = "contents" - FileFieldName = "name" -) - -type File struct { - Contents string `json:"contents,omitempty" yaml:"contents,omitempty"` - Name string `json:"name,omitempty" yaml:"name,omitempty"` -} diff --git a/client/management/v3/zz_generated_question.go b/client/management/v3/zz_generated_question.go index 9175c085..05fffaf0 100644 --- a/client/management/v3/zz_generated_question.go +++ b/client/management/v3/zz_generated_question.go @@ -1,36 +1,42 @@ package client const ( - QuestionType = "question" - QuestionFieldDefault = "default" - QuestionFieldDescription = "description" - QuestionFieldGroup = "group" - QuestionFieldInvalidChars = "invalidChars" - QuestionFieldLabel = "label" - QuestionFieldMax = "max" - QuestionFieldMaxLength = "maxLength" - QuestionFieldMin = "min" - QuestionFieldMinLength = "minLength" - QuestionFieldOptions = "options" - QuestionFieldRequired = "required" - QuestionFieldType = "type" - QuestionFieldValidChars = "validChars" - QuestionFieldVariable = "variable" + QuestionType = "question" + QuestionFieldDefault = "default" + QuestionFieldDescription = "description" + QuestionFieldGroup = "group" + QuestionFieldInvalidChars = "invalidChars" + QuestionFieldLabel = "label" + QuestionFieldMax = "max" + QuestionFieldMaxLength = "maxLength" + QuestionFieldMin = "min" + QuestionFieldMinLength = "minLength" + QuestionFieldOptions = "options" + QuestionFieldRequired = "required" + QuestionFieldShowIf = "showIf" + QuestionFieldShowSubquestionIf = "showSubquestionIf" + QuestionFieldSubquestions = "subquestions" + QuestionFieldType = "type" + QuestionFieldValidChars = "validChars" + QuestionFieldVariable = "variable" ) type Question struct { - Default string `json:"default,omitempty" yaml:"default,omitempty"` - Description string `json:"description,omitempty" yaml:"description,omitempty"` - Group string `json:"group,omitempty" yaml:"group,omitempty"` - InvalidChars string `json:"invalidChars,omitempty" yaml:"invalidChars,omitempty"` - Label string `json:"label,omitempty" yaml:"label,omitempty"` - Max int64 `json:"max,omitempty" yaml:"max,omitempty"` - MaxLength int64 `json:"maxLength,omitempty" yaml:"maxLength,omitempty"` - Min int64 `json:"min,omitempty" yaml:"min,omitempty"` - MinLength int64 `json:"minLength,omitempty" yaml:"minLength,omitempty"` - Options []string `json:"options,omitempty" yaml:"options,omitempty"` - Required bool `json:"required,omitempty" yaml:"required,omitempty"` - Type string `json:"type,omitempty" yaml:"type,omitempty"` - ValidChars string `json:"validChars,omitempty" yaml:"validChars,omitempty"` - Variable string `json:"variable,omitempty" yaml:"variable,omitempty"` + Default string `json:"default,omitempty" yaml:"default,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + Group string `json:"group,omitempty" yaml:"group,omitempty"` + InvalidChars string `json:"invalidChars,omitempty" yaml:"invalidChars,omitempty"` + Label string `json:"label,omitempty" yaml:"label,omitempty"` + Max int64 `json:"max,omitempty" yaml:"max,omitempty"` + MaxLength int64 `json:"maxLength,omitempty" yaml:"maxLength,omitempty"` + Min int64 `json:"min,omitempty" yaml:"min,omitempty"` + MinLength int64 `json:"minLength,omitempty" yaml:"minLength,omitempty"` + Options []string `json:"options,omitempty" yaml:"options,omitempty"` + Required bool `json:"required,omitempty" yaml:"required,omitempty"` + ShowIf string `json:"showIf,omitempty" yaml:"showIf,omitempty"` + ShowSubquestionIf string `json:"showSubquestionIf,omitempty" yaml:"showSubquestionIf,omitempty"` + Subquestions []SubQuestion `json:"subquestions,omitempty" yaml:"subquestions,omitempty"` + Type string `json:"type,omitempty" yaml:"type,omitempty"` + ValidChars string `json:"validChars,omitempty" yaml:"validChars,omitempty"` + Variable string `json:"variable,omitempty" yaml:"variable,omitempty"` } diff --git a/client/management/v3/zz_generated_sub_question.go b/client/management/v3/zz_generated_sub_question.go new file mode 100644 index 00000000..8490aef2 --- /dev/null +++ b/client/management/v3/zz_generated_sub_question.go @@ -0,0 +1,38 @@ +package client + +const ( + SubQuestionType = "subQuestion" + SubQuestionFieldDefault = "default" + SubQuestionFieldDescription = "description" + SubQuestionFieldGroup = "group" + SubQuestionFieldInvalidChars = "invalidChars" + SubQuestionFieldLabel = "label" + SubQuestionFieldMax = "max" + SubQuestionFieldMaxLength = "maxLength" + SubQuestionFieldMin = "min" + SubQuestionFieldMinLength = "minLength" + SubQuestionFieldOptions = "options" + SubQuestionFieldRequired = "required" + SubQuestionFieldShowIf = "showIf" + SubQuestionFieldType = "type" + SubQuestionFieldValidChars = "validChars" + SubQuestionFieldVariable = "variable" +) + +type SubQuestion struct { + Default string `json:"default,omitempty" yaml:"default,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + Group string `json:"group,omitempty" yaml:"group,omitempty"` + InvalidChars string `json:"invalidChars,omitempty" yaml:"invalidChars,omitempty"` + Label string `json:"label,omitempty" yaml:"label,omitempty"` + Max int64 `json:"max,omitempty" yaml:"max,omitempty"` + MaxLength int64 `json:"maxLength,omitempty" yaml:"maxLength,omitempty"` + Min int64 `json:"min,omitempty" yaml:"min,omitempty"` + MinLength int64 `json:"minLength,omitempty" yaml:"minLength,omitempty"` + Options []string `json:"options,omitempty" yaml:"options,omitempty"` + Required bool `json:"required,omitempty" yaml:"required,omitempty"` + ShowIf string `json:"showIf,omitempty" yaml:"showIf,omitempty"` + Type string `json:"type,omitempty" yaml:"type,omitempty"` + ValidChars string `json:"validChars,omitempty" yaml:"validChars,omitempty"` + Variable string `json:"variable,omitempty" yaml:"variable,omitempty"` +} diff --git a/client/management/v3/zz_generated_template_content.go b/client/management/v3/zz_generated_template_content.go new file mode 100644 index 00000000..0645e608 --- /dev/null +++ b/client/management/v3/zz_generated_template_content.go @@ -0,0 +1,93 @@ +package client + +import ( + "github.com/rancher/norman/types" +) + +const ( + TemplateContentType = "templateContent" + TemplateContentFieldAnnotations = "annotations" + TemplateContentFieldCreated = "created" + TemplateContentFieldCreatorID = "creatorId" + TemplateContentFieldData = "data" + TemplateContentFieldLabels = "labels" + TemplateContentFieldName = "name" + TemplateContentFieldOwnerReferences = "ownerReferences" + TemplateContentFieldRemoved = "removed" + TemplateContentFieldUuid = "uuid" +) + +type TemplateContent struct { + types.Resource + Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` + Created string `json:"created,omitempty" yaml:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + Data string `json:"data,omitempty" yaml:"data,omitempty"` + Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` + Name string `json:"name,omitempty" yaml:"name,omitempty"` + OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` + Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` + Uuid string `json:"uuid,omitempty" yaml:"uuid,omitempty"` +} +type TemplateContentCollection struct { + types.Collection + Data []TemplateContent `json:"data,omitempty"` + client *TemplateContentClient +} + +type TemplateContentClient struct { + apiClient *Client +} + +type TemplateContentOperations interface { + List(opts *types.ListOpts) (*TemplateContentCollection, error) + Create(opts *TemplateContent) (*TemplateContent, error) + Update(existing *TemplateContent, updates interface{}) (*TemplateContent, error) + ByID(id string) (*TemplateContent, error) + Delete(container *TemplateContent) error +} + +func newTemplateContentClient(apiClient *Client) *TemplateContentClient { + return &TemplateContentClient{ + apiClient: apiClient, + } +} + +func (c *TemplateContentClient) Create(container *TemplateContent) (*TemplateContent, error) { + resp := &TemplateContent{} + err := c.apiClient.Ops.DoCreate(TemplateContentType, container, resp) + return resp, err +} + +func (c *TemplateContentClient) Update(existing *TemplateContent, updates interface{}) (*TemplateContent, error) { + resp := &TemplateContent{} + err := c.apiClient.Ops.DoUpdate(TemplateContentType, &existing.Resource, updates, resp) + return resp, err +} + +func (c *TemplateContentClient) List(opts *types.ListOpts) (*TemplateContentCollection, error) { + resp := &TemplateContentCollection{} + err := c.apiClient.Ops.DoList(TemplateContentType, opts, resp) + resp.client = c + return resp, err +} + +func (cc *TemplateContentCollection) Next() (*TemplateContentCollection, error) { + if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { + resp := &TemplateContentCollection{} + err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) + resp.client = cc.client + return resp, err + } + return nil, nil +} + +func (c *TemplateContentClient) ByID(id string) (*TemplateContent, error) { + resp := &TemplateContent{} + err := c.apiClient.Ops.DoByID(TemplateContentType, id, resp) + return resp, err +} + +func (c *TemplateContentClient) Delete(container *TemplateContent) error { + return c.apiClient.Ops.DoResourceDelete(TemplateContentType, &container.Resource) +} diff --git a/client/management/v3/zz_generated_template_version.go b/client/management/v3/zz_generated_template_version.go index 43af0f14..e59f4bde 100644 --- a/client/management/v3/zz_generated_template_version.go +++ b/client/management/v3/zz_generated_template_version.go @@ -7,8 +7,10 @@ import ( const ( TemplateVersionType = "templateVersion" TemplateVersionFieldAnnotations = "annotations" + TemplateVersionFieldAppReadme = "appReadme" TemplateVersionFieldCreated = "created" TemplateVersionFieldCreatorID = "creatorId" + TemplateVersionFieldDigest = "digest" TemplateVersionFieldExternalID = "externalId" TemplateVersionFieldFiles = "files" TemplateVersionFieldLabels = "labels" @@ -33,10 +35,12 @@ const ( type TemplateVersion struct { types.Resource Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` + AppReadme string `json:"appReadme,omitempty" yaml:"appReadme,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + Digest string `json:"digest,omitempty" yaml:"digest,omitempty"` ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"` - Files []File `json:"files,omitempty" yaml:"files,omitempty"` + Files map[string]string `json:"files,omitempty" yaml:"files,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` MaximumRancherVersion string `json:"maximumRancherVersion,omitempty" yaml:"maximumRancherVersion,omitempty"` MinimumRancherVersion string `json:"minimumRancherVersion,omitempty" yaml:"minimumRancherVersion,omitempty"` diff --git a/client/management/v3/zz_generated_template_version_spec.go b/client/management/v3/zz_generated_template_version_spec.go index d7ca84ea..d149a477 100644 --- a/client/management/v3/zz_generated_template_version_spec.go +++ b/client/management/v3/zz_generated_template_version_spec.go @@ -2,6 +2,8 @@ package client const ( TemplateVersionSpecType = "templateVersionSpec" + TemplateVersionSpecFieldAppReadme = "appReadme" + TemplateVersionSpecFieldDigest = "digest" TemplateVersionSpecFieldExternalID = "externalId" TemplateVersionSpecFieldFiles = "files" TemplateVersionSpecFieldMaximumRancherVersion = "maximumRancherVersion" @@ -15,8 +17,10 @@ const ( ) type TemplateVersionSpec struct { + AppReadme string `json:"appReadme,omitempty" yaml:"appReadme,omitempty"` + Digest string `json:"digest,omitempty" yaml:"digest,omitempty"` ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"` - Files []File `json:"files,omitempty" yaml:"files,omitempty"` + Files map[string]string `json:"files,omitempty" yaml:"files,omitempty"` MaximumRancherVersion string `json:"maximumRancherVersion,omitempty" yaml:"maximumRancherVersion,omitempty"` MinimumRancherVersion string `json:"minimumRancherVersion,omitempty" yaml:"minimumRancherVersion,omitempty"` Questions []Question `json:"questions,omitempty" yaml:"questions,omitempty"` diff --git a/client/project/v3/zz_generated_app.go b/client/project/v3/zz_generated_app.go index f89b55b9..6b73f2c1 100644 --- a/client/project/v3/zz_generated_app.go +++ b/client/project/v3/zz_generated_app.go @@ -7,22 +7,22 @@ import ( const ( AppType = "app" AppFieldAnnotations = "annotations" - AppFieldAnswerValues = "answerValues" AppFieldAnswers = "answers" + AppFieldAppRevisionId = "appRevisionId" AppFieldCreated = "created" AppFieldCreatorID = "creatorId" AppFieldDescription = "description" AppFieldExternalID = "externalId" - AppFieldInstallNamespace = "installNamespace" AppFieldLabels = "labels" AppFieldName = "name" AppFieldNamespaceId = "namespaceId" AppFieldOwnerReferences = "ownerReferences" AppFieldProjectId = "projectId" + AppFieldPrune = "prune" AppFieldRemoved = "removed" AppFieldState = "state" AppFieldStatus = "status" - AppFieldTemplates = "templates" + AppFieldTargetNamespace = "targetNamespace" AppFieldTransitioning = "transitioning" AppFieldTransitioningMessage = "transitioningMessage" AppFieldUuid = "uuid" @@ -31,22 +31,22 @@ const ( type App struct { types.Resource Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` - AnswerValues string `json:"answerValues,omitempty" yaml:"answerValues,omitempty"` Answers map[string]string `json:"answers,omitempty" yaml:"answers,omitempty"` + AppRevisionId string `json:"appRevisionId,omitempty" yaml:"appRevisionId,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` Description string `json:"description,omitempty" yaml:"description,omitempty"` ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"` - InstallNamespace string `json:"installNamespace,omitempty" yaml:"installNamespace,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` NamespaceId string `json:"namespaceId,omitempty" yaml:"namespaceId,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` + Prune bool `json:"prune,omitempty" yaml:"prune,omitempty"` Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` State string `json:"state,omitempty" yaml:"state,omitempty"` Status *AppStatus `json:"status,omitempty" yaml:"status,omitempty"` - Templates map[string]string `json:"templates,omitempty" yaml:"templates,omitempty"` + TargetNamespace string `json:"targetNamespace,omitempty" yaml:"targetNamespace,omitempty"` Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` Uuid string `json:"uuid,omitempty" yaml:"uuid,omitempty"` diff --git a/client/project/v3/zz_generated_app_revision.go b/client/project/v3/zz_generated_app_revision.go new file mode 100644 index 00000000..92dde4c8 --- /dev/null +++ b/client/project/v3/zz_generated_app_revision.go @@ -0,0 +1,101 @@ +package client + +import ( + "github.com/rancher/norman/types" +) + +const ( + AppRevisionType = "appRevision" + AppRevisionFieldAnnotations = "annotations" + AppRevisionFieldCreated = "created" + AppRevisionFieldCreatorID = "creatorId" + AppRevisionFieldLabels = "labels" + AppRevisionFieldName = "name" + AppRevisionFieldNamespaceId = "namespaceId" + AppRevisionFieldOwnerReferences = "ownerReferences" + AppRevisionFieldRemoved = "removed" + AppRevisionFieldState = "state" + AppRevisionFieldStatus = "status" + AppRevisionFieldTransitioning = "transitioning" + AppRevisionFieldTransitioningMessage = "transitioningMessage" + AppRevisionFieldUuid = "uuid" +) + +type AppRevision struct { + types.Resource + Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` + Created string `json:"created,omitempty" yaml:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` + Name string `json:"name,omitempty" yaml:"name,omitempty"` + NamespaceId string `json:"namespaceId,omitempty" yaml:"namespaceId,omitempty"` + OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` + Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` + State string `json:"state,omitempty" yaml:"state,omitempty"` + Status *AppRevisionStatus `json:"status,omitempty" yaml:"status,omitempty"` + Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` + TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` + Uuid string `json:"uuid,omitempty" yaml:"uuid,omitempty"` +} +type AppRevisionCollection struct { + types.Collection + Data []AppRevision `json:"data,omitempty"` + client *AppRevisionClient +} + +type AppRevisionClient struct { + apiClient *Client +} + +type AppRevisionOperations interface { + List(opts *types.ListOpts) (*AppRevisionCollection, error) + Create(opts *AppRevision) (*AppRevision, error) + Update(existing *AppRevision, updates interface{}) (*AppRevision, error) + ByID(id string) (*AppRevision, error) + Delete(container *AppRevision) error +} + +func newAppRevisionClient(apiClient *Client) *AppRevisionClient { + return &AppRevisionClient{ + apiClient: apiClient, + } +} + +func (c *AppRevisionClient) Create(container *AppRevision) (*AppRevision, error) { + resp := &AppRevision{} + err := c.apiClient.Ops.DoCreate(AppRevisionType, container, resp) + return resp, err +} + +func (c *AppRevisionClient) Update(existing *AppRevision, updates interface{}) (*AppRevision, error) { + resp := &AppRevision{} + err := c.apiClient.Ops.DoUpdate(AppRevisionType, &existing.Resource, updates, resp) + return resp, err +} + +func (c *AppRevisionClient) List(opts *types.ListOpts) (*AppRevisionCollection, error) { + resp := &AppRevisionCollection{} + err := c.apiClient.Ops.DoList(AppRevisionType, opts, resp) + resp.client = c + return resp, err +} + +func (cc *AppRevisionCollection) Next() (*AppRevisionCollection, error) { + if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { + resp := &AppRevisionCollection{} + err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) + resp.client = cc.client + return resp, err + } + return nil, nil +} + +func (c *AppRevisionClient) ByID(id string) (*AppRevision, error) { + resp := &AppRevision{} + err := c.apiClient.Ops.DoByID(AppRevisionType, id, resp) + return resp, err +} + +func (c *AppRevisionClient) Delete(container *AppRevision) error { + return c.apiClient.Ops.DoResourceDelete(AppRevisionType, &container.Resource) +} diff --git a/client/project/v3/zz_generated_app_revision_spec.go b/client/project/v3/zz_generated_app_revision_spec.go new file mode 100644 index 00000000..b3d515b1 --- /dev/null +++ b/client/project/v3/zz_generated_app_revision_spec.go @@ -0,0 +1,8 @@ +package client + +const ( + AppRevisionSpecType = "appRevisionSpec" +) + +type AppRevisionSpec struct { +} diff --git a/client/project/v3/zz_generated_app_revision_status.go b/client/project/v3/zz_generated_app_revision_status.go new file mode 100644 index 00000000..c3e820e0 --- /dev/null +++ b/client/project/v3/zz_generated_app_revision_status.go @@ -0,0 +1,16 @@ +package client + +const ( + AppRevisionStatusType = "appRevisionStatus" + AppRevisionStatusFieldAnswers = "answers" + AppRevisionStatusFieldDigest = "digest" + AppRevisionStatusFieldExternalID = "externalId" + AppRevisionStatusFieldProjectId = "projectId" +) + +type AppRevisionStatus struct { + Answers map[string]string `json:"answers,omitempty" yaml:"answers,omitempty"` + Digest string `json:"digest,omitempty" yaml:"digest,omitempty"` + ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"` + ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` +} diff --git a/client/project/v3/zz_generated_app_spec.go b/client/project/v3/zz_generated_app_spec.go index 7735fbed..29dafe7f 100644 --- a/client/project/v3/zz_generated_app_spec.go +++ b/client/project/v3/zz_generated_app_spec.go @@ -1,22 +1,22 @@ package client const ( - AppSpecType = "appSpec" - AppSpecFieldAnswerValues = "answerValues" - AppSpecFieldAnswers = "answers" - AppSpecFieldDescription = "description" - AppSpecFieldExternalID = "externalId" - AppSpecFieldInstallNamespace = "installNamespace" - AppSpecFieldProjectId = "projectId" - AppSpecFieldTemplates = "templates" + AppSpecType = "appSpec" + AppSpecFieldAnswers = "answers" + AppSpecFieldAppRevisionId = "appRevisionId" + AppSpecFieldDescription = "description" + AppSpecFieldExternalID = "externalId" + AppSpecFieldProjectId = "projectId" + AppSpecFieldPrune = "prune" + AppSpecFieldTargetNamespace = "targetNamespace" ) type AppSpec struct { - AnswerValues string `json:"answerValues,omitempty" yaml:"answerValues,omitempty"` - Answers map[string]string `json:"answers,omitempty" yaml:"answers,omitempty"` - Description string `json:"description,omitempty" yaml:"description,omitempty"` - ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"` - InstallNamespace string `json:"installNamespace,omitempty" yaml:"installNamespace,omitempty"` - ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` - Templates map[string]string `json:"templates,omitempty" yaml:"templates,omitempty"` + Answers map[string]string `json:"answers,omitempty" yaml:"answers,omitempty"` + AppRevisionId string `json:"appRevisionId,omitempty" yaml:"appRevisionId,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"` + ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` + Prune bool `json:"prune,omitempty" yaml:"prune,omitempty"` + TargetNamespace string `json:"targetNamespace,omitempty" yaml:"targetNamespace,omitempty"` } diff --git a/client/project/v3/zz_generated_app_status.go b/client/project/v3/zz_generated_app_status.go index fa8fefc0..66738ab7 100644 --- a/client/project/v3/zz_generated_app_status.go +++ b/client/project/v3/zz_generated_app_status.go @@ -1,16 +1,14 @@ package client const ( - AppStatusType = "appStatus" - AppStatusFieldConditions = "conditions" - AppStatusFieldReleases = "releases" - AppStatusFieldStdError = "stdError" - AppStatusFieldStdOutput = "stdOutput" + AppStatusType = "appStatus" + AppStatusFieldConditions = "conditions" + AppStatusFieldLastAppliedTemplates = "lastAppliedTemplate" + AppStatusFieldNotes = "notes" ) type AppStatus struct { - Conditions []AppCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` - Releases []ReleaseInfo `json:"releases,omitempty" yaml:"releases,omitempty"` - StdError []string `json:"stdError,omitempty" yaml:"stdError,omitempty"` - StdOutput []string `json:"stdOutput,omitempty" yaml:"stdOutput,omitempty"` + Conditions []AppCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` + LastAppliedTemplates string `json:"lastAppliedTemplate,omitempty" yaml:"lastAppliedTemplate,omitempty"` + Notes string `json:"notes,omitempty" yaml:"notes,omitempty"` } diff --git a/client/project/v3/zz_generated_client.go b/client/project/v3/zz_generated_client.go index 24fae9a6..bc20dd36 100644 --- a/client/project/v3/zz_generated_client.go +++ b/client/project/v3/zz_generated_client.go @@ -34,6 +34,7 @@ type Client struct { CronJob CronJobOperations Workload WorkloadOperations App AppOperations + AppRevision AppRevisionOperations NamespaceComposeConfig NamespaceComposeConfigOperations } @@ -74,6 +75,7 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) { client.CronJob = newCronJobClient(client) client.Workload = newWorkloadClient(client) client.App = newAppClient(client) + client.AppRevision = newAppRevisionClient(client) client.NamespaceComposeConfig = newNamespaceComposeConfigClient(client) return client, nil diff --git a/client/project/v3/zz_generated_release_info.go b/client/project/v3/zz_generated_release_info.go deleted file mode 100644 index ab6e3bc9..00000000 --- a/client/project/v3/zz_generated_release_info.go +++ /dev/null @@ -1,18 +0,0 @@ -package client - -const ( - ReleaseInfoType = "releaseInfo" - ReleaseInfoFieldCreateTimestamp = "createTimestamp" - ReleaseInfoFieldModifiedAt = "modifiedAt" - ReleaseInfoFieldName = "name" - ReleaseInfoFieldTemplateVersionID = "templateVersionId" - ReleaseInfoFieldVersion = "version" -) - -type ReleaseInfo struct { - CreateTimestamp string `json:"createTimestamp,omitempty" yaml:"createTimestamp,omitempty"` - ModifiedAt string `json:"modifiedAt,omitempty" yaml:"modifiedAt,omitempty"` - Name string `json:"name,omitempty" yaml:"name,omitempty"` - TemplateVersionID string `json:"templateVersionId,omitempty" yaml:"templateVersionId,omitempty"` - Version string `json:"version,omitempty" yaml:"version,omitempty"` -} diff --git a/compose/zz_generated_compose.go b/compose/zz_generated_compose.go index 91922eff..071c27ba 100644 --- a/compose/zz_generated_compose.go +++ b/compose/zz_generated_compose.go @@ -28,6 +28,7 @@ type Config struct { Catalogs map[string]managementClient.Catalog `json:"catalogs,omitempty" yaml:"catalogs,omitempty"` Templates map[string]managementClient.Template `json:"templates,omitempty" yaml:"templates,omitempty"` TemplateVersions map[string]managementClient.TemplateVersion `json:"templateVersions,omitempty" yaml:"templateVersions,omitempty"` + TemplateContents map[string]managementClient.TemplateContent `json:"templateContents,omitempty" yaml:"templateContents,omitempty"` Groups map[string]managementClient.Group `json:"groups,omitempty" yaml:"groups,omitempty"` GroupMembers map[string]managementClient.GroupMember `json:"groupMembers,omitempty" yaml:"groupMembers,omitempty"` Users map[string]managementClient.User `json:"users,omitempty" yaml:"users,omitempty"` @@ -83,5 +84,6 @@ type Config struct { CronJobs map[string]projectClient.CronJob `json:"cronJobs,omitempty" yaml:"cronJobs,omitempty"` Workloads map[string]projectClient.Workload `json:"workloads,omitempty" yaml:"workloads,omitempty"` Apps map[string]projectClient.App `json:"apps,omitempty" yaml:"apps,omitempty"` + AppRevisions map[string]projectClient.AppRevision `json:"appRevisions,omitempty" yaml:"appRevisions,omitempty"` NamespaceComposeConfigs map[string]projectClient.NamespaceComposeConfig `json:"namespaceComposeConfigs,omitempty" yaml:"namespaceComposeConfigs,omitempty"` }