diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index a76c61cb..b638ac02 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -171,6 +171,37 @@ func (in *AlertSystemImages) DeepCopy() *AlertSystemImages { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AmazonElasticContainerServiceConfig) DeepCopyInto(out *AmazonElasticContainerServiceConfig) { + *out = *in + if in.Subnets != nil { + in, out := &in.Subnets, &out.Subnets + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.SecurityGroups != nil { + in, out := &in.SecurityGroups, &out.SecurityGroups + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.AssociateWorkerNodePublicIP != nil { + in, out := &in.AssociateWorkerNodePublicIP, &out.AssociateWorkerNodePublicIP + *out = new(bool) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AmazonElasticContainerServiceConfig. +func (in *AmazonElasticContainerServiceConfig) DeepCopy() *AmazonElasticContainerServiceConfig { + if in == nil { + return nil + } + out := new(AmazonElasticContainerServiceConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AuthConfig) DeepCopyInto(out *AuthConfig) { *out = *in @@ -362,6 +393,29 @@ func (in *AzureCloudProvider) DeepCopy() *AzureCloudProvider { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AzureKubernetesServiceConfig) DeepCopyInto(out *AzureKubernetesServiceConfig) { + *out = *in + if in.Tag != nil { + in, out := &in.Tag, &out.Tag + *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 AzureKubernetesServiceConfig. +func (in *AzureKubernetesServiceConfig) DeepCopy() *AzureKubernetesServiceConfig { + if in == nil { + return nil + } + out := new(AzureKubernetesServiceConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BaseService) DeepCopyInto(out *BaseService) { *out = *in @@ -1176,11 +1230,13 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { } if in.GoogleKubernetesEngineConfig != nil { in, out := &in.GoogleKubernetesEngineConfig, &out.GoogleKubernetesEngineConfig - *out = (*in).DeepCopy() + *out = new(GoogleKubernetesEngineConfig) + (*in).DeepCopyInto(*out) } if in.AzureKubernetesServiceConfig != nil { in, out := &in.AzureKubernetesServiceConfig, &out.AzureKubernetesServiceConfig - *out = (*in).DeepCopy() + *out = new(AzureKubernetesServiceConfig) + (*in).DeepCopyInto(*out) } if in.RancherKubernetesEngineConfig != nil { in, out := &in.RancherKubernetesEngineConfig, &out.RancherKubernetesEngineConfig @@ -1189,11 +1245,8 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { } if in.AmazonElasticContainerServiceConfig != nil { in, out := &in.AmazonElasticContainerServiceConfig, &out.AmazonElasticContainerServiceConfig - *out = (*in).DeepCopy() - } - if in.GenericEngineConfig != nil { - in, out := &in.GenericEngineConfig, &out.GenericEngineConfig - *out = (*in).DeepCopy() + *out = new(AmazonElasticContainerServiceConfig) + (*in).DeepCopyInto(*out) } if in.EnableNetworkPolicy != nil { in, out := &in.EnableNetworkPolicy, &out.EnableNetworkPolicy @@ -2068,6 +2121,59 @@ func (in *GlobalVsphereOpts) DeepCopy() *GlobalVsphereOpts { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *GoogleKubernetesEngineConfig) DeepCopyInto(out *GoogleKubernetesEngineConfig) { + *out = *in + if in.Labels != nil { + in, out := &in.Labels, &out.Labels + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.EnableHTTPLoadBalancing != nil { + in, out := &in.EnableHTTPLoadBalancing, &out.EnableHTTPLoadBalancing + *out = new(bool) + **out = **in + } + if in.EnableHorizontalPodAutoscaling != nil { + in, out := &in.EnableHorizontalPodAutoscaling, &out.EnableHorizontalPodAutoscaling + *out = new(bool) + **out = **in + } + if in.EnableNetworkPolicyConfig != nil { + in, out := &in.EnableNetworkPolicyConfig, &out.EnableNetworkPolicyConfig + *out = new(bool) + **out = **in + } + if in.Locations != nil { + in, out := &in.Locations, &out.Locations + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.EnableStackdriverLogging != nil { + in, out := &in.EnableStackdriverLogging, &out.EnableStackdriverLogging + *out = new(bool) + **out = **in + } + if in.EnableStackdriverMonitoring != nil { + in, out := &in.EnableStackdriverMonitoring, &out.EnableStackdriverMonitoring + *out = new(bool) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GoogleKubernetesEngineConfig. +func (in *GoogleKubernetesEngineConfig) DeepCopy() *GoogleKubernetesEngineConfig { + if in == nil { + return nil + } + out := new(GoogleKubernetesEngineConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Group) DeepCopyInto(out *Group) { *out = *in @@ -2349,109 +2455,6 @@ func (in *KeyCloakConfig) DeepCopyObject() runtime.Object { return nil } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KontainerDriver) DeepCopyInto(out *KontainerDriver) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KontainerDriver. -func (in *KontainerDriver) DeepCopy() *KontainerDriver { - if in == nil { - return nil - } - out := new(KontainerDriver) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *KontainerDriver) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KontainerDriverList) DeepCopyInto(out *KontainerDriverList) { - *out = *in - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]KontainerDriver, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KontainerDriverList. -func (in *KontainerDriverList) DeepCopy() *KontainerDriverList { - if in == nil { - return nil - } - out := new(KontainerDriverList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *KontainerDriverList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KontainerDriverSpec) DeepCopyInto(out *KontainerDriverSpec) { - *out = *in - if in.WhitelistDomains != nil { - in, out := &in.WhitelistDomains, &out.WhitelistDomains - *out = make([]string, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KontainerDriverSpec. -func (in *KontainerDriverSpec) DeepCopy() *KontainerDriverSpec { - if in == nil { - return nil - } - out := new(KontainerDriverSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KontainerDriverStatus) DeepCopyInto(out *KontainerDriverStatus) { - *out = *in - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]Condition, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KontainerDriverStatus. -func (in *KontainerDriverStatus) DeepCopy() *KontainerDriverStatus { - if in == nil { - return nil - } - out := new(KontainerDriverStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KubeAPIService) DeepCopyInto(out *KubeAPIService) { *out = *in @@ -2914,16 +2917,6 @@ func (in *LoggingSystemImages) DeepCopy() *LoggingSystemImages { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in MapStringInterface) DeepCopyInto(out *MapStringInterface) { - { - in := &in - clone := in.DeepCopy() - *out = *clone - return - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MetadataOpenstackOpts) DeepCopyInto(out *MetadataOpenstackOpts) { *out = *in 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 ff9ea3f9..cba0b4be 100644 --- a/apis/management.cattle.io/v3/zz_generated_k8s_client.go +++ b/apis/management.cattle.io/v3/zz_generated_k8s_client.go @@ -59,7 +59,6 @@ type Interface interface { ComposeConfigsGetter ProjectCatalogsGetter ClusterCatalogsGetter - KontainerDriversGetter } type Clients struct { @@ -102,7 +101,6 @@ type Clients struct { ComposeConfig ComposeConfigClient ProjectCatalog ProjectCatalogClient ClusterCatalog ClusterCatalogClient - KontainerDriver KontainerDriverClient } type Client struct { @@ -149,7 +147,6 @@ type Client struct { composeConfigControllers map[string]ComposeConfigController projectCatalogControllers map[string]ProjectCatalogController clusterCatalogControllers map[string]ClusterCatalogController - kontainerDriverControllers map[string]KontainerDriverController } func Factory(ctx context.Context, config rest.Config) (context.Context, controller.Starter, error) { @@ -301,9 +298,6 @@ func NewClientsFromInterface(iface Interface) *Clients { ClusterCatalog: &clusterCatalogClient2{ iface: iface.ClusterCatalogs(""), }, - KontainerDriver: &kontainerDriverClient2{ - iface: iface.KontainerDrivers(""), - }, } } @@ -359,7 +353,6 @@ func NewForConfig(config rest.Config) (Interface, error) { composeConfigControllers: map[string]ComposeConfigController{}, projectCatalogControllers: map[string]ProjectCatalogController{}, clusterCatalogControllers: map[string]ClusterCatalogController{}, - kontainerDriverControllers: map[string]KontainerDriverController{}, }, nil } @@ -881,16 +874,3 @@ func (c *Client) ClusterCatalogs(namespace string) ClusterCatalogInterface { objectClient: objectClient, } } - -type KontainerDriversGetter interface { - KontainerDrivers(namespace string) KontainerDriverInterface -} - -func (c *Client) KontainerDrivers(namespace string) KontainerDriverInterface { - objectClient := objectclient.NewObjectClient(namespace, c.restClient, &KontainerDriverResource, KontainerDriverGroupVersionKind, kontainerDriverFactory{}) - return &kontainerDriverClient{ - ns: namespace, - client: c, - objectClient: objectClient, - } -} diff --git a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go b/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go deleted file mode 100644 index 28ffb67e..00000000 --- a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go +++ /dev/null @@ -1,426 +0,0 @@ -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 ( - KontainerDriverGroupVersionKind = schema.GroupVersionKind{ - Version: Version, - Group: GroupName, - Kind: "KontainerDriver", - } - KontainerDriverResource = metav1.APIResource{ - Name: "kontainerdrivers", - SingularName: "kontainerdriver", - Namespaced: false, - Kind: KontainerDriverGroupVersionKind.Kind, - } -) - -type KontainerDriverList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []KontainerDriver -} - -type KontainerDriverHandlerFunc func(key string, obj *KontainerDriver) (runtime.Object, error) - -type KontainerDriverChangeHandlerFunc func(obj *KontainerDriver) (runtime.Object, error) - -type KontainerDriverLister interface { - List(namespace string, selector labels.Selector) (ret []*KontainerDriver, err error) - Get(namespace, name string) (*KontainerDriver, error) -} - -type KontainerDriverController interface { - Generic() controller.GenericController - Informer() cache.SharedIndexInformer - Lister() KontainerDriverLister - AddHandler(ctx context.Context, name string, handler KontainerDriverHandlerFunc) - AddClusterScopedHandler(ctx context.Context, name, clusterName string, handler KontainerDriverHandlerFunc) - Enqueue(namespace, name string) - Sync(ctx context.Context) error - Start(ctx context.Context, threadiness int) error -} - -type KontainerDriverInterface interface { - ObjectClient() *objectclient.ObjectClient - Create(*KontainerDriver) (*KontainerDriver, error) - GetNamespaced(namespace, name string, opts metav1.GetOptions) (*KontainerDriver, error) - Get(name string, opts metav1.GetOptions) (*KontainerDriver, error) - Update(*KontainerDriver) (*KontainerDriver, error) - Delete(name string, options *metav1.DeleteOptions) error - DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error - List(opts metav1.ListOptions) (*KontainerDriverList, error) - Watch(opts metav1.ListOptions) (watch.Interface, error) - DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error - Controller() KontainerDriverController - AddHandler(ctx context.Context, name string, sync KontainerDriverHandlerFunc) - AddLifecycle(ctx context.Context, name string, lifecycle KontainerDriverLifecycle) - AddClusterScopedHandler(ctx context.Context, name, clusterName string, sync KontainerDriverHandlerFunc) - AddClusterScopedLifecycle(ctx context.Context, name, clusterName string, lifecycle KontainerDriverLifecycle) -} - -type kontainerDriverLister struct { - controller *kontainerDriverController -} - -func (l *kontainerDriverLister) List(namespace string, selector labels.Selector) (ret []*KontainerDriver, err error) { - err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) { - ret = append(ret, obj.(*KontainerDriver)) - }) - return -} - -func (l *kontainerDriverLister) Get(namespace, name string) (*KontainerDriver, 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: KontainerDriverGroupVersionKind.Group, - Resource: "kontainerDriver", - }, key) - } - return obj.(*KontainerDriver), nil -} - -type kontainerDriverController struct { - controller.GenericController -} - -func (c *kontainerDriverController) Generic() controller.GenericController { - return c.GenericController -} - -func (c *kontainerDriverController) Lister() KontainerDriverLister { - return &kontainerDriverLister{ - controller: c, - } -} - -func (c *kontainerDriverController) AddHandler(ctx context.Context, name string, handler KontainerDriverHandlerFunc) { - c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { - if obj == nil { - return handler(key, nil) - } else if v, ok := obj.(*KontainerDriver); ok { - return handler(key, v) - } else { - return nil, nil - } - }) -} - -func (c *kontainerDriverController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler KontainerDriverHandlerFunc) { - c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { - if obj == nil { - return handler(key, nil) - } else if v, ok := obj.(*KontainerDriver); ok && controller.ObjectInCluster(cluster, obj) { - return handler(key, v) - } else { - return nil, nil - } - }) -} - -type kontainerDriverFactory struct { -} - -func (c kontainerDriverFactory) Object() runtime.Object { - return &KontainerDriver{} -} - -func (c kontainerDriverFactory) List() runtime.Object { - return &KontainerDriverList{} -} - -func (s *kontainerDriverClient) Controller() KontainerDriverController { - s.client.Lock() - defer s.client.Unlock() - - c, ok := s.client.kontainerDriverControllers[s.ns] - if ok { - return c - } - - genericController := controller.NewGenericController(KontainerDriverGroupVersionKind.Kind+"Controller", - s.objectClient) - - c = &kontainerDriverController{ - GenericController: genericController, - } - - s.client.kontainerDriverControllers[s.ns] = c - s.client.starters = append(s.client.starters, c) - - return c -} - -type kontainerDriverClient struct { - client *Client - ns string - objectClient *objectclient.ObjectClient - controller KontainerDriverController -} - -func (s *kontainerDriverClient) ObjectClient() *objectclient.ObjectClient { - return s.objectClient -} - -func (s *kontainerDriverClient) Create(o *KontainerDriver) (*KontainerDriver, error) { - obj, err := s.objectClient.Create(o) - return obj.(*KontainerDriver), err -} - -func (s *kontainerDriverClient) Get(name string, opts metav1.GetOptions) (*KontainerDriver, error) { - obj, err := s.objectClient.Get(name, opts) - return obj.(*KontainerDriver), err -} - -func (s *kontainerDriverClient) GetNamespaced(namespace, name string, opts metav1.GetOptions) (*KontainerDriver, error) { - obj, err := s.objectClient.GetNamespaced(namespace, name, opts) - return obj.(*KontainerDriver), err -} - -func (s *kontainerDriverClient) Update(o *KontainerDriver) (*KontainerDriver, error) { - obj, err := s.objectClient.Update(o.Name, o) - return obj.(*KontainerDriver), err -} - -func (s *kontainerDriverClient) Delete(name string, options *metav1.DeleteOptions) error { - return s.objectClient.Delete(name, options) -} - -func (s *kontainerDriverClient) DeleteNamespaced(namespace, name string, options *metav1.DeleteOptions) error { - return s.objectClient.DeleteNamespaced(namespace, name, options) -} - -func (s *kontainerDriverClient) List(opts metav1.ListOptions) (*KontainerDriverList, error) { - obj, err := s.objectClient.List(opts) - return obj.(*KontainerDriverList), err -} - -func (s *kontainerDriverClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { - return s.objectClient.Watch(opts) -} - -// Patch applies the patch and returns the patched deployment. -func (s *kontainerDriverClient) Patch(o *KontainerDriver, data []byte, subresources ...string) (*KontainerDriver, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) - return obj.(*KontainerDriver), err -} - -func (s *kontainerDriverClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error { - return s.objectClient.DeleteCollection(deleteOpts, listOpts) -} - -func (s *kontainerDriverClient) AddHandler(ctx context.Context, name string, sync KontainerDriverHandlerFunc) { - s.Controller().AddHandler(ctx, name, sync) -} - -func (s *kontainerDriverClient) AddLifecycle(ctx context.Context, name string, lifecycle KontainerDriverLifecycle) { - sync := NewKontainerDriverLifecycleAdapter(name, false, s, lifecycle) - s.Controller().AddHandler(ctx, name, sync) -} - -func (s *kontainerDriverClient) AddClusterScopedHandler(ctx context.Context, name, clusterName string, sync KontainerDriverHandlerFunc) { - s.Controller().AddClusterScopedHandler(ctx, name, clusterName, sync) -} - -func (s *kontainerDriverClient) AddClusterScopedLifecycle(ctx context.Context, name, clusterName string, lifecycle KontainerDriverLifecycle) { - sync := NewKontainerDriverLifecycleAdapter(name+"_"+clusterName, true, s, lifecycle) - s.Controller().AddClusterScopedHandler(ctx, name, clusterName, sync) -} - -type KontainerDriverIndexer func(obj *KontainerDriver) ([]string, error) - -type KontainerDriverClientCache interface { - Get(namespace, name string) (*KontainerDriver, error) - List(namespace string, selector labels.Selector) ([]*KontainerDriver, error) - - Index(name string, indexer KontainerDriverIndexer) - GetIndexed(name, key string) ([]*KontainerDriver, error) -} - -type KontainerDriverClient interface { - Create(*KontainerDriver) (*KontainerDriver, error) - Get(namespace, name string, opts metav1.GetOptions) (*KontainerDriver, error) - Update(*KontainerDriver) (*KontainerDriver, error) - Delete(namespace, name string, options *metav1.DeleteOptions) error - List(namespace string, opts metav1.ListOptions) (*KontainerDriverList, error) - Watch(opts metav1.ListOptions) (watch.Interface, error) - - Cache() KontainerDriverClientCache - - OnCreate(ctx context.Context, name string, sync KontainerDriverChangeHandlerFunc) - OnChange(ctx context.Context, name string, sync KontainerDriverChangeHandlerFunc) - OnRemove(ctx context.Context, name string, sync KontainerDriverChangeHandlerFunc) - Enqueue(namespace, name string) - - Generic() controller.GenericController - Interface() KontainerDriverInterface -} - -type kontainerDriverClientCache struct { - client *kontainerDriverClient2 -} - -type kontainerDriverClient2 struct { - iface KontainerDriverInterface - controller KontainerDriverController -} - -func (n *kontainerDriverClient2) Interface() KontainerDriverInterface { - return n.iface -} - -func (n *kontainerDriverClient2) Generic() controller.GenericController { - return n.iface.Controller().Generic() -} - -func (n *kontainerDriverClient2) Enqueue(namespace, name string) { - n.iface.Controller().Enqueue(namespace, name) -} - -func (n *kontainerDriverClient2) Create(obj *KontainerDriver) (*KontainerDriver, error) { - return n.iface.Create(obj) -} - -func (n *kontainerDriverClient2) Get(namespace, name string, opts metav1.GetOptions) (*KontainerDriver, error) { - return n.iface.GetNamespaced(namespace, name, opts) -} - -func (n *kontainerDriverClient2) Update(obj *KontainerDriver) (*KontainerDriver, error) { - return n.iface.Update(obj) -} - -func (n *kontainerDriverClient2) Delete(namespace, name string, options *metav1.DeleteOptions) error { - return n.iface.DeleteNamespaced(namespace, name, options) -} - -func (n *kontainerDriverClient2) List(namespace string, opts metav1.ListOptions) (*KontainerDriverList, error) { - return n.iface.List(opts) -} - -func (n *kontainerDriverClient2) Watch(opts metav1.ListOptions) (watch.Interface, error) { - return n.iface.Watch(opts) -} - -func (n *kontainerDriverClientCache) Get(namespace, name string) (*KontainerDriver, error) { - return n.client.controller.Lister().Get(namespace, name) -} - -func (n *kontainerDriverClientCache) List(namespace string, selector labels.Selector) ([]*KontainerDriver, error) { - return n.client.controller.Lister().List(namespace, selector) -} - -func (n *kontainerDriverClient2) Cache() KontainerDriverClientCache { - n.loadController() - return &kontainerDriverClientCache{ - client: n, - } -} - -func (n *kontainerDriverClient2) OnCreate(ctx context.Context, name string, sync KontainerDriverChangeHandlerFunc) { - n.loadController() - n.iface.AddLifecycle(ctx, name+"-create", &kontainerDriverLifecycleDelegate{create: sync}) -} - -func (n *kontainerDriverClient2) OnChange(ctx context.Context, name string, sync KontainerDriverChangeHandlerFunc) { - n.loadController() - n.iface.AddLifecycle(ctx, name+"-change", &kontainerDriverLifecycleDelegate{update: sync}) -} - -func (n *kontainerDriverClient2) OnRemove(ctx context.Context, name string, sync KontainerDriverChangeHandlerFunc) { - n.loadController() - n.iface.AddLifecycle(ctx, name, &kontainerDriverLifecycleDelegate{remove: sync}) -} - -func (n *kontainerDriverClientCache) Index(name string, indexer KontainerDriverIndexer) { - err := n.client.controller.Informer().GetIndexer().AddIndexers(map[string]cache.IndexFunc{ - name: func(obj interface{}) ([]string, error) { - if v, ok := obj.(*KontainerDriver); ok { - return indexer(v) - } - return nil, nil - }, - }) - - if err != nil { - panic(err) - } -} - -func (n *kontainerDriverClientCache) GetIndexed(name, key string) ([]*KontainerDriver, error) { - var result []*KontainerDriver - objs, err := n.client.controller.Informer().GetIndexer().ByIndex(name, key) - if err != nil { - return nil, err - } - for _, obj := range objs { - if v, ok := obj.(*KontainerDriver); ok { - result = append(result, v) - } - } - - return result, nil -} - -func (n *kontainerDriverClient2) loadController() { - if n.controller == nil { - n.controller = n.iface.Controller() - } -} - -type kontainerDriverLifecycleDelegate struct { - create KontainerDriverChangeHandlerFunc - update KontainerDriverChangeHandlerFunc - remove KontainerDriverChangeHandlerFunc -} - -func (n *kontainerDriverLifecycleDelegate) HasCreate() bool { - return n.create != nil -} - -func (n *kontainerDriverLifecycleDelegate) Create(obj *KontainerDriver) (runtime.Object, error) { - if n.create == nil { - return obj, nil - } - return n.create(obj) -} - -func (n *kontainerDriverLifecycleDelegate) HasFinalize() bool { - return n.remove != nil -} - -func (n *kontainerDriverLifecycleDelegate) Remove(obj *KontainerDriver) (runtime.Object, error) { - if n.remove == nil { - return obj, nil - } - return n.remove(obj) -} - -func (n *kontainerDriverLifecycleDelegate) Updated(obj *KontainerDriver) (runtime.Object, error) { - if n.update == nil { - return obj, nil - } - return n.update(obj) -} diff --git a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_kontainer_driver_lifecycle_adapter.go deleted file mode 100644 index 5f6daa04..00000000 --- a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_lifecycle_adapter.go +++ /dev/null @@ -1,62 +0,0 @@ -package v3 - -import ( - "github.com/rancher/norman/lifecycle" - "k8s.io/apimachinery/pkg/runtime" -) - -type KontainerDriverLifecycle interface { - Create(obj *KontainerDriver) (runtime.Object, error) - Remove(obj *KontainerDriver) (runtime.Object, error) - Updated(obj *KontainerDriver) (runtime.Object, error) -} - -type kontainerDriverLifecycleAdapter struct { - lifecycle KontainerDriverLifecycle -} - -func (w *kontainerDriverLifecycleAdapter) HasCreate() bool { - o, ok := w.lifecycle.(lifecycle.ObjectLifecycleCondition) - return !ok || o.HasCreate() -} - -func (w *kontainerDriverLifecycleAdapter) HasFinalize() bool { - o, ok := w.lifecycle.(lifecycle.ObjectLifecycleCondition) - return !ok || o.HasFinalize() -} - -func (w *kontainerDriverLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) { - o, err := w.lifecycle.Create(obj.(*KontainerDriver)) - if o == nil { - return nil, err - } - return o, err -} - -func (w *kontainerDriverLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) { - o, err := w.lifecycle.Remove(obj.(*KontainerDriver)) - if o == nil { - return nil, err - } - return o, err -} - -func (w *kontainerDriverLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) { - o, err := w.lifecycle.Updated(obj.(*KontainerDriver)) - if o == nil { - return nil, err - } - return o, err -} - -func NewKontainerDriverLifecycleAdapter(name string, clusterScoped bool, client KontainerDriverInterface, l KontainerDriverLifecycle) KontainerDriverHandlerFunc { - adapter := &kontainerDriverLifecycleAdapter{lifecycle: l} - syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *KontainerDriver) (runtime.Object, error) { - newObj, err := syncFn(key, obj) - if o, ok := newObj.(runtime.Object); ok { - return o, err - } - return nil, err - } -} diff --git a/apis/management.cattle.io/v3/zz_generated_scheme.go b/apis/management.cattle.io/v3/zz_generated_scheme.go index 595d3020..45d937cb 100644 --- a/apis/management.cattle.io/v3/zz_generated_scheme.go +++ b/apis/management.cattle.io/v3/zz_generated_scheme.go @@ -110,8 +110,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ProjectCatalogList{}, &ClusterCatalog{}, &ClusterCatalogList{}, - &KontainerDriver{}, - &KontainerDriverList{}, ) return nil } diff --git a/client/management/v3/zz_generated_amazon_elastic_container_service_config.go b/client/management/v3/zz_generated_amazon_elastic_container_service_config.go new file mode 100644 index 00000000..e6a7d7cf --- /dev/null +++ b/client/management/v3/zz_generated_amazon_elastic_container_service_config.go @@ -0,0 +1,34 @@ +package client + +const ( + AmazonElasticContainerServiceConfigType = "amazonElasticContainerServiceConfig" + AmazonElasticContainerServiceConfigFieldAMI = "ami" + AmazonElasticContainerServiceConfigFieldAccessKey = "accessKey" + AmazonElasticContainerServiceConfigFieldAssociateWorkerNodePublicIP = "associateWorkerNodePublicIp" + AmazonElasticContainerServiceConfigFieldInstanceType = "instanceType" + AmazonElasticContainerServiceConfigFieldMaximumNodes = "maximumNodes" + AmazonElasticContainerServiceConfigFieldMinimumNodes = "minimumNodes" + AmazonElasticContainerServiceConfigFieldRegion = "region" + AmazonElasticContainerServiceConfigFieldSecretKey = "secretKey" + AmazonElasticContainerServiceConfigFieldSecurityGroups = "securityGroups" + AmazonElasticContainerServiceConfigFieldServiceRole = "serviceRole" + AmazonElasticContainerServiceConfigFieldSessionToken = "sessionToken" + AmazonElasticContainerServiceConfigFieldSubnets = "subnets" + AmazonElasticContainerServiceConfigFieldVirtualNetwork = "virtualNetwork" +) + +type AmazonElasticContainerServiceConfig struct { + AMI string `json:"ami,omitempty" yaml:"ami,omitempty"` + AccessKey string `json:"accessKey,omitempty" yaml:"accessKey,omitempty"` + AssociateWorkerNodePublicIP *bool `json:"associateWorkerNodePublicIp,omitempty" yaml:"associateWorkerNodePublicIp,omitempty"` + InstanceType string `json:"instanceType,omitempty" yaml:"instanceType,omitempty"` + MaximumNodes int64 `json:"maximumNodes,omitempty" yaml:"maximumNodes,omitempty"` + MinimumNodes int64 `json:"minimumNodes,omitempty" yaml:"minimumNodes,omitempty"` + Region string `json:"region,omitempty" yaml:"region,omitempty"` + SecretKey string `json:"secretKey,omitempty" yaml:"secretKey,omitempty"` + SecurityGroups []string `json:"securityGroups,omitempty" yaml:"securityGroups,omitempty"` + ServiceRole string `json:"serviceRole,omitempty" yaml:"serviceRole,omitempty"` + SessionToken string `json:"sessionToken,omitempty" yaml:"sessionToken,omitempty"` + Subnets []string `json:"subnets,omitempty" yaml:"subnets,omitempty"` + VirtualNetwork string `json:"virtualNetwork,omitempty" yaml:"virtualNetwork,omitempty"` +} diff --git a/client/management/v3/zz_generated_azure_kubernetes_service_config.go b/client/management/v3/zz_generated_azure_kubernetes_service_config.go new file mode 100644 index 00000000..8a348032 --- /dev/null +++ b/client/management/v3/zz_generated_azure_kubernetes_service_config.go @@ -0,0 +1,54 @@ +package client + +const ( + AzureKubernetesServiceConfigType = "azureKubernetesServiceConfig" + AzureKubernetesServiceConfigFieldAdminUsername = "adminUsername" + AzureKubernetesServiceConfigFieldAgentDNSPrefix = "agentDnsPrefix" + AzureKubernetesServiceConfigFieldAgentPoolName = "agentPoolName" + AzureKubernetesServiceConfigFieldAgentVMSize = "agentVmSize" + AzureKubernetesServiceConfigFieldBaseURL = "baseUrl" + AzureKubernetesServiceConfigFieldClientID = "clientId" + AzureKubernetesServiceConfigFieldClientSecret = "clientSecret" + AzureKubernetesServiceConfigFieldCount = "count" + AzureKubernetesServiceConfigFieldDNSServiceIP = "dnsServiceIp" + AzureKubernetesServiceConfigFieldDockerBridgeCIDR = "dockerBridgeCidr" + AzureKubernetesServiceConfigFieldKubernetesVersion = "kubernetesVersion" + AzureKubernetesServiceConfigFieldLocation = "location" + AzureKubernetesServiceConfigFieldMasterDNSPrefix = "masterDnsPrefix" + AzureKubernetesServiceConfigFieldOsDiskSizeGB = "osDiskSizeGb" + AzureKubernetesServiceConfigFieldResourceGroup = "resourceGroup" + AzureKubernetesServiceConfigFieldSSHPublicKeyContents = "sshPublicKeyContents" + AzureKubernetesServiceConfigFieldServiceCIDR = "serviceCidr" + AzureKubernetesServiceConfigFieldSubnet = "subnet" + AzureKubernetesServiceConfigFieldSubscriptionID = "subscriptionId" + AzureKubernetesServiceConfigFieldTag = "tags" + AzureKubernetesServiceConfigFieldTenantID = "tenantId" + AzureKubernetesServiceConfigFieldVirtualNetwork = "virtualNetwork" + AzureKubernetesServiceConfigFieldVirtualNetworkResourceGroup = "virtualNetworkResourceGroup" +) + +type AzureKubernetesServiceConfig struct { + AdminUsername string `json:"adminUsername,omitempty" yaml:"adminUsername,omitempty"` + AgentDNSPrefix string `json:"agentDnsPrefix,omitempty" yaml:"agentDnsPrefix,omitempty"` + AgentPoolName string `json:"agentPoolName,omitempty" yaml:"agentPoolName,omitempty"` + AgentVMSize string `json:"agentVmSize,omitempty" yaml:"agentVmSize,omitempty"` + BaseURL string `json:"baseUrl,omitempty" yaml:"baseUrl,omitempty"` + ClientID string `json:"clientId,omitempty" yaml:"clientId,omitempty"` + ClientSecret string `json:"clientSecret,omitempty" yaml:"clientSecret,omitempty"` + Count int64 `json:"count,omitempty" yaml:"count,omitempty"` + DNSServiceIP string `json:"dnsServiceIp,omitempty" yaml:"dnsServiceIp,omitempty"` + DockerBridgeCIDR string `json:"dockerBridgeCidr,omitempty" yaml:"dockerBridgeCidr,omitempty"` + KubernetesVersion string `json:"kubernetesVersion,omitempty" yaml:"kubernetesVersion,omitempty"` + Location string `json:"location,omitempty" yaml:"location,omitempty"` + MasterDNSPrefix string `json:"masterDnsPrefix,omitempty" yaml:"masterDnsPrefix,omitempty"` + OsDiskSizeGB int64 `json:"osDiskSizeGb,omitempty" yaml:"osDiskSizeGb,omitempty"` + ResourceGroup string `json:"resourceGroup,omitempty" yaml:"resourceGroup,omitempty"` + SSHPublicKeyContents string `json:"sshPublicKeyContents,omitempty" yaml:"sshPublicKeyContents,omitempty"` + ServiceCIDR string `json:"serviceCidr,omitempty" yaml:"serviceCidr,omitempty"` + Subnet string `json:"subnet,omitempty" yaml:"subnet,omitempty"` + SubscriptionID string `json:"subscriptionId,omitempty" yaml:"subscriptionId,omitempty"` + Tag map[string]string `json:"tags,omitempty" yaml:"tags,omitempty"` + TenantID string `json:"tenantId,omitempty" yaml:"tenantId,omitempty"` + VirtualNetwork string `json:"virtualNetwork,omitempty" yaml:"virtualNetwork,omitempty"` + VirtualNetworkResourceGroup string `json:"virtualNetworkResourceGroup,omitempty" yaml:"virtualNetworkResourceGroup,omitempty"` +} diff --git a/client/management/v3/zz_generated_client.go b/client/management/v3/zz_generated_client.go index 5ecd44bb..4e352a27 100644 --- a/client/management/v3/zz_generated_client.go +++ b/client/management/v3/zz_generated_client.go @@ -45,7 +45,6 @@ type Client struct { ComposeConfig ComposeConfigOperations ProjectCatalog ProjectCatalogOperations ClusterCatalog ClusterCatalogOperations - KontainerDriver KontainerDriverOperations } func NewClient(opts *clientbase.ClientOpts) (*Client, error) { @@ -96,7 +95,6 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) { client.ComposeConfig = newComposeConfigClient(client) client.ProjectCatalog = newProjectCatalogClient(client) client.ClusterCatalog = newClusterCatalogClient(client) - client.KontainerDriver = newKontainerDriverClient(client) return client, nil } diff --git a/client/management/v3/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go index 5718dcec..3ece689b 100644 --- a/client/management/v3/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -9,10 +9,12 @@ const ( ClusterFieldAPIEndpoint = "apiEndpoint" ClusterFieldAgentImage = "agentImage" ClusterFieldAllocatable = "allocatable" + ClusterFieldAmazonElasticContainerServiceConfig = "amazonElasticContainerServiceConfig" ClusterFieldAnnotations = "annotations" ClusterFieldAppliedEnableNetworkPolicy = "appliedEnableNetworkPolicy" ClusterFieldAppliedPodSecurityPolicyTemplateName = "appliedPodSecurityPolicyTemplateId" ClusterFieldAppliedSpec = "appliedSpec" + ClusterFieldAzureKubernetesServiceConfig = "azureKubernetesServiceConfig" ClusterFieldCACert = "caCert" ClusterFieldCapabilities = "capabilities" ClusterFieldCapacity = "capacity" @@ -28,6 +30,7 @@ const ( ClusterFieldDriver = "driver" ClusterFieldEnableNetworkPolicy = "enableNetworkPolicy" ClusterFieldFailedSpec = "failedSpec" + ClusterFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" ClusterFieldImportedConfig = "importedConfig" ClusterFieldInternal = "internal" ClusterFieldLabels = "labels" @@ -46,42 +49,45 @@ const ( type Cluster struct { types.Resource - APIEndpoint string `json:"apiEndpoint,omitempty" yaml:"apiEndpoint,omitempty"` - AgentImage string `json:"agentImage,omitempty" yaml:"agentImage,omitempty"` - Allocatable map[string]string `json:"allocatable,omitempty" yaml:"allocatable,omitempty"` - Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` - AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy,omitempty" yaml:"appliedEnableNetworkPolicy,omitempty"` - AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId,omitempty" yaml:"appliedPodSecurityPolicyTemplateId,omitempty"` - AppliedSpec *ClusterSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"` - CACert string `json:"caCert,omitempty" yaml:"caCert,omitempty"` - Capabilities *Capabilities `json:"capabilities,omitempty" yaml:"capabilities,omitempty"` - Capacity map[string]string `json:"capacity,omitempty" yaml:"capacity,omitempty"` - ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty" yaml:"componentStatuses,omitempty"` - Conditions []ClusterCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` - Created string `json:"created,omitempty" yaml:"created,omitempty"` - CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` - DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" yaml:"defaultClusterRoleForProjectMembers,omitempty"` - DefaultPodSecurityPolicyTemplateID string `json:"defaultPodSecurityPolicyTemplateId,omitempty" yaml:"defaultPodSecurityPolicyTemplateId,omitempty"` - Description string `json:"description,omitempty" yaml:"description,omitempty"` - DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"` - DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` - Driver string `json:"driver,omitempty" yaml:"driver,omitempty"` - EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` - FailedSpec *ClusterSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` - ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" yaml:"importedConfig,omitempty"` - Internal bool `json:"internal,omitempty" yaml:"internal,omitempty"` - Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` - Limits map[string]string `json:"limits,omitempty" yaml:"limits,omitempty"` - Name string `json:"name,omitempty" yaml:"name,omitempty"` - OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` - RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty" yaml:"rancherKubernetesEngineConfig,omitempty"` - Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` - Requested map[string]string `json:"requested,omitempty" yaml:"requested,omitempty"` - State string `json:"state,omitempty" yaml:"state,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"` - Version *Info `json:"version,omitempty" yaml:"version,omitempty"` + APIEndpoint string `json:"apiEndpoint,omitempty" yaml:"apiEndpoint,omitempty"` + AgentImage string `json:"agentImage,omitempty" yaml:"agentImage,omitempty"` + Allocatable map[string]string `json:"allocatable,omitempty" yaml:"allocatable,omitempty"` + AmazonElasticContainerServiceConfig *AmazonElasticContainerServiceConfig `json:"amazonElasticContainerServiceConfig,omitempty" yaml:"amazonElasticContainerServiceConfig,omitempty"` + Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` + AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy,omitempty" yaml:"appliedEnableNetworkPolicy,omitempty"` + AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId,omitempty" yaml:"appliedPodSecurityPolicyTemplateId,omitempty"` + AppliedSpec *ClusterSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"` + AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty" yaml:"azureKubernetesServiceConfig,omitempty"` + CACert string `json:"caCert,omitempty" yaml:"caCert,omitempty"` + Capabilities *Capabilities `json:"capabilities,omitempty" yaml:"capabilities,omitempty"` + Capacity map[string]string `json:"capacity,omitempty" yaml:"capacity,omitempty"` + ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty" yaml:"componentStatuses,omitempty"` + Conditions []ClusterCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` + Created string `json:"created,omitempty" yaml:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" yaml:"defaultClusterRoleForProjectMembers,omitempty"` + DefaultPodSecurityPolicyTemplateID string `json:"defaultPodSecurityPolicyTemplateId,omitempty" yaml:"defaultPodSecurityPolicyTemplateId,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"` + DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` + Driver string `json:"driver,omitempty" yaml:"driver,omitempty"` + EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` + FailedSpec *ClusterSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` + GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty" yaml:"googleKubernetesEngineConfig,omitempty"` + ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" yaml:"importedConfig,omitempty"` + Internal bool `json:"internal,omitempty" yaml:"internal,omitempty"` + Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` + Limits map[string]string `json:"limits,omitempty" yaml:"limits,omitempty"` + Name string `json:"name,omitempty" yaml:"name,omitempty"` + OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` + RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty" yaml:"rancherKubernetesEngineConfig,omitempty"` + Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` + Requested map[string]string `json:"requested,omitempty" yaml:"requested,omitempty"` + State string `json:"state,omitempty" yaml:"state,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"` + Version *Info `json:"version,omitempty" yaml:"version,omitempty"` } type ClusterCollection struct { diff --git a/client/management/v3/zz_generated_cluster_spec.go b/client/management/v3/zz_generated_cluster_spec.go index 3833c600..8329ba7d 100644 --- a/client/management/v3/zz_generated_cluster_spec.go +++ b/client/management/v3/zz_generated_cluster_spec.go @@ -11,7 +11,6 @@ const ( ClusterSpecFieldDisplayName = "displayName" ClusterSpecFieldDockerRootDir = "dockerRootDir" ClusterSpecFieldEnableNetworkPolicy = "enableNetworkPolicy" - ClusterSpecFieldGenericEngineConfig = "genericEngineConfig" ClusterSpecFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" ClusterSpecFieldImportedConfig = "importedConfig" ClusterSpecFieldInternal = "internal" @@ -19,18 +18,17 @@ const ( ) type ClusterSpec struct { - AmazonElasticContainerServiceConfig map[string]interface{} `json:"amazonElasticContainerServiceConfig,omitempty" yaml:"amazonElasticContainerServiceConfig,omitempty"` - AzureKubernetesServiceConfig map[string]interface{} `json:"azureKubernetesServiceConfig,omitempty" yaml:"azureKubernetesServiceConfig,omitempty"` - DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" yaml:"defaultClusterRoleForProjectMembers,omitempty"` - DefaultPodSecurityPolicyTemplateID string `json:"defaultPodSecurityPolicyTemplateId,omitempty" yaml:"defaultPodSecurityPolicyTemplateId,omitempty"` - Description string `json:"description,omitempty" yaml:"description,omitempty"` - DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"` - DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` - DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` - EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` - GenericEngineConfig map[string]interface{} `json:"genericEngineConfig,omitempty" yaml:"genericEngineConfig,omitempty"` - GoogleKubernetesEngineConfig map[string]interface{} `json:"googleKubernetesEngineConfig,omitempty" yaml:"googleKubernetesEngineConfig,omitempty"` - ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" yaml:"importedConfig,omitempty"` - Internal bool `json:"internal,omitempty" yaml:"internal,omitempty"` - RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty" yaml:"rancherKubernetesEngineConfig,omitempty"` + AmazonElasticContainerServiceConfig *AmazonElasticContainerServiceConfig `json:"amazonElasticContainerServiceConfig,omitempty" yaml:"amazonElasticContainerServiceConfig,omitempty"` + AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty" yaml:"azureKubernetesServiceConfig,omitempty"` + DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" yaml:"defaultClusterRoleForProjectMembers,omitempty"` + DefaultPodSecurityPolicyTemplateID string `json:"defaultPodSecurityPolicyTemplateId,omitempty" yaml:"defaultPodSecurityPolicyTemplateId,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"` + DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` + DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` + EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` + GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty" yaml:"googleKubernetesEngineConfig,omitempty"` + ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" yaml:"importedConfig,omitempty"` + Internal bool `json:"internal,omitempty" yaml:"internal,omitempty"` + RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty" yaml:"rancherKubernetesEngineConfig,omitempty"` } diff --git a/client/management/v3/zz_generated_dynamic_schema.go b/client/management/v3/zz_generated_dynamic_schema.go index 337daec0..e7dbc849 100644 --- a/client/management/v3/zz_generated_dynamic_schema.go +++ b/client/management/v3/zz_generated_dynamic_schema.go @@ -24,7 +24,6 @@ const ( DynamicSchemaFieldResourceActions = "resourceActions" DynamicSchemaFieldResourceFields = "resourceFields" DynamicSchemaFieldResourceMethods = "resourceMethods" - DynamicSchemaFieldSchemaName = "schemaName" DynamicSchemaFieldState = "state" DynamicSchemaFieldStatus = "status" DynamicSchemaFieldTransitioning = "transitioning" @@ -52,7 +51,6 @@ type DynamicSchema struct { ResourceActions map[string]Action `json:"resourceActions,omitempty" yaml:"resourceActions,omitempty"` ResourceFields map[string]Field `json:"resourceFields,omitempty" yaml:"resourceFields,omitempty"` ResourceMethods []string `json:"resourceMethods,omitempty" yaml:"resourceMethods,omitempty"` - SchemaName string `json:"schemaName,omitempty" yaml:"schemaName,omitempty"` State string `json:"state,omitempty" yaml:"state,omitempty"` Status *DynamicSchemaStatus `json:"status,omitempty" yaml:"status,omitempty"` Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` diff --git a/client/management/v3/zz_generated_dynamic_schema_spec.go b/client/management/v3/zz_generated_dynamic_schema_spec.go index f702c19d..852d5916 100644 --- a/client/management/v3/zz_generated_dynamic_schema_spec.go +++ b/client/management/v3/zz_generated_dynamic_schema_spec.go @@ -13,7 +13,6 @@ const ( DynamicSchemaSpecFieldResourceActions = "resourceActions" DynamicSchemaSpecFieldResourceFields = "resourceFields" DynamicSchemaSpecFieldResourceMethods = "resourceMethods" - DynamicSchemaSpecFieldSchemaName = "schemaName" ) type DynamicSchemaSpec struct { @@ -28,5 +27,4 @@ type DynamicSchemaSpec struct { ResourceActions map[string]Action `json:"resourceActions,omitempty" yaml:"resourceActions,omitempty"` ResourceFields map[string]Field `json:"resourceFields,omitempty" yaml:"resourceFields,omitempty"` ResourceMethods []string `json:"resourceMethods,omitempty" yaml:"resourceMethods,omitempty"` - SchemaName string `json:"schemaName,omitempty" yaml:"schemaName,omitempty"` } diff --git a/client/management/v3/zz_generated_field.go b/client/management/v3/zz_generated_field.go index 9f13a3ac..18019126 100644 --- a/client/management/v3/zz_generated_field.go +++ b/client/management/v3/zz_generated_field.go @@ -5,7 +5,6 @@ const ( FieldFieldCreate = "create" FieldFieldDefault = "default" FieldFieldDescription = "description" - FieldFieldDynamicField = "dynamicField" FieldFieldInvalidChars = "invalidChars" FieldFieldMax = "max" FieldFieldMaxLength = "maxLength" @@ -24,7 +23,6 @@ type Field struct { Create bool `json:"create,omitempty" yaml:"create,omitempty"` Default *Values `json:"default,omitempty" yaml:"default,omitempty"` Description string `json:"description,omitempty" yaml:"description,omitempty"` - DynamicField bool `json:"dynamicField,omitempty" yaml:"dynamicField,omitempty"` InvalidChars string `json:"invalidChars,omitempty" yaml:"invalidChars,omitempty"` Max int64 `json:"max,omitempty" yaml:"max,omitempty"` MaxLength int64 `json:"maxLength,omitempty" yaml:"maxLength,omitempty"` diff --git a/client/management/v3/zz_generated_google_kubernetes_engine_config.go b/client/management/v3/zz_generated_google_kubernetes_engine_config.go new file mode 100644 index 00000000..c877d9c3 --- /dev/null +++ b/client/management/v3/zz_generated_google_kubernetes_engine_config.go @@ -0,0 +1,56 @@ +package client + +const ( + GoogleKubernetesEngineConfigType = "googleKubernetesEngineConfig" + GoogleKubernetesEngineConfigFieldClusterIpv4Cidr = "clusterIpv4Cidr" + GoogleKubernetesEngineConfigFieldCredential = "credential" + GoogleKubernetesEngineConfigFieldDescription = "description" + GoogleKubernetesEngineConfigFieldDiskSizeGb = "diskSizeGb" + GoogleKubernetesEngineConfigFieldEnableAlphaFeature = "enableAlphaFeature" + GoogleKubernetesEngineConfigFieldEnableHTTPLoadBalancing = "enableHttpLoadBalancing" + GoogleKubernetesEngineConfigFieldEnableHorizontalPodAutoscaling = "enableHorizontalPodAutoscaling" + GoogleKubernetesEngineConfigFieldEnableKubernetesDashboard = "enableKubernetesDashboard" + GoogleKubernetesEngineConfigFieldEnableLegacyAbac = "enableLegacyAbac" + GoogleKubernetesEngineConfigFieldEnableNetworkPolicyConfig = "enableNetworkPolicyConfig" + GoogleKubernetesEngineConfigFieldEnableStackdriverLogging = "enableStackdriverLogging" + GoogleKubernetesEngineConfigFieldEnableStackdriverMonitoring = "enableStackdriverMonitoring" + GoogleKubernetesEngineConfigFieldImageType = "imageType" + GoogleKubernetesEngineConfigFieldLabels = "labels" + GoogleKubernetesEngineConfigFieldLocations = "locations" + GoogleKubernetesEngineConfigFieldMachineType = "machineType" + GoogleKubernetesEngineConfigFieldMaintenanceWindow = "maintenanceWindow" + GoogleKubernetesEngineConfigFieldMasterVersion = "masterVersion" + GoogleKubernetesEngineConfigFieldNetwork = "network" + GoogleKubernetesEngineConfigFieldNodeCount = "nodeCount" + GoogleKubernetesEngineConfigFieldNodeVersion = "nodeVersion" + GoogleKubernetesEngineConfigFieldProjectID = "projectId" + GoogleKubernetesEngineConfigFieldSubNetwork = "subNetwork" + GoogleKubernetesEngineConfigFieldZone = "zone" +) + +type GoogleKubernetesEngineConfig struct { + ClusterIpv4Cidr string `json:"clusterIpv4Cidr,omitempty" yaml:"clusterIpv4Cidr,omitempty"` + Credential string `json:"credential,omitempty" yaml:"credential,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + DiskSizeGb int64 `json:"diskSizeGb,omitempty" yaml:"diskSizeGb,omitempty"` + EnableAlphaFeature bool `json:"enableAlphaFeature,omitempty" yaml:"enableAlphaFeature,omitempty"` + EnableHTTPLoadBalancing *bool `json:"enableHttpLoadBalancing,omitempty" yaml:"enableHttpLoadBalancing,omitempty"` + EnableHorizontalPodAutoscaling *bool `json:"enableHorizontalPodAutoscaling,omitempty" yaml:"enableHorizontalPodAutoscaling,omitempty"` + EnableKubernetesDashboard bool `json:"enableKubernetesDashboard,omitempty" yaml:"enableKubernetesDashboard,omitempty"` + EnableLegacyAbac bool `json:"enableLegacyAbac,omitempty" yaml:"enableLegacyAbac,omitempty"` + EnableNetworkPolicyConfig *bool `json:"enableNetworkPolicyConfig,omitempty" yaml:"enableNetworkPolicyConfig,omitempty"` + EnableStackdriverLogging *bool `json:"enableStackdriverLogging,omitempty" yaml:"enableStackdriverLogging,omitempty"` + EnableStackdriverMonitoring *bool `json:"enableStackdriverMonitoring,omitempty" yaml:"enableStackdriverMonitoring,omitempty"` + ImageType string `json:"imageType,omitempty" yaml:"imageType,omitempty"` + Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` + Locations []string `json:"locations,omitempty" yaml:"locations,omitempty"` + MachineType string `json:"machineType,omitempty" yaml:"machineType,omitempty"` + MaintenanceWindow string `json:"maintenanceWindow,omitempty" yaml:"maintenanceWindow,omitempty"` + MasterVersion string `json:"masterVersion,omitempty" yaml:"masterVersion,omitempty"` + Network string `json:"network,omitempty" yaml:"network,omitempty"` + NodeCount int64 `json:"nodeCount,omitempty" yaml:"nodeCount,omitempty"` + NodeVersion string `json:"nodeVersion,omitempty" yaml:"nodeVersion,omitempty"` + ProjectID string `json:"projectId,omitempty" yaml:"projectId,omitempty"` + SubNetwork string `json:"subNetwork,omitempty" yaml:"subNetwork,omitempty"` + Zone string `json:"zone,omitempty" yaml:"zone,omitempty"` +} diff --git a/client/management/v3/zz_generated_kontainer_driver.go b/client/management/v3/zz_generated_kontainer_driver.go deleted file mode 100644 index 0a8e350b..00000000 --- a/client/management/v3/zz_generated_kontainer_driver.go +++ /dev/null @@ -1,137 +0,0 @@ -package client - -import ( - "github.com/rancher/norman/types" -) - -const ( - KontainerDriverType = "kontainerDriver" - KontainerDriverFieldActive = "active" - KontainerDriverFieldActualURL = "actualUrl" - KontainerDriverFieldAnnotations = "annotations" - KontainerDriverFieldBuiltIn = "builtIn" - KontainerDriverFieldChecksum = "checksum" - KontainerDriverFieldConditions = "conditions" - KontainerDriverFieldCreated = "created" - KontainerDriverFieldCreatorID = "creatorId" - KontainerDriverFieldExecutablePath = "executablePath" - KontainerDriverFieldLabels = "labels" - KontainerDriverFieldName = "name" - KontainerDriverFieldOwnerReferences = "ownerReferences" - KontainerDriverFieldRemoved = "removed" - KontainerDriverFieldState = "state" - KontainerDriverFieldTransitioning = "transitioning" - KontainerDriverFieldTransitioningMessage = "transitioningMessage" - KontainerDriverFieldUIURL = "uiUrl" - KontainerDriverFieldURL = "url" - KontainerDriverFieldUUID = "uuid" - KontainerDriverFieldWhitelistDomains = "whitelistDomains" -) - -type KontainerDriver struct { - types.Resource - Active bool `json:"active,omitempty" yaml:"active,omitempty"` - ActualURL string `json:"actualUrl,omitempty" yaml:"actualUrl,omitempty"` - Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` - BuiltIn bool `json:"builtIn,omitempty" yaml:"builtIn,omitempty"` - Checksum string `json:"checksum,omitempty" yaml:"checksum,omitempty"` - Conditions []Condition `json:"conditions,omitempty" yaml:"conditions,omitempty"` - Created string `json:"created,omitempty" yaml:"created,omitempty"` - CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` - ExecutablePath string `json:"executablePath,omitempty" yaml:"executablePath,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"` - State string `json:"state,omitempty" yaml:"state,omitempty"` - Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` - UIURL string `json:"uiUrl,omitempty" yaml:"uiUrl,omitempty"` - URL string `json:"url,omitempty" yaml:"url,omitempty"` - UUID string `json:"uuid,omitempty" yaml:"uuid,omitempty"` - WhitelistDomains []string `json:"whitelistDomains,omitempty" yaml:"whitelistDomains,omitempty"` -} - -type KontainerDriverCollection struct { - types.Collection - Data []KontainerDriver `json:"data,omitempty"` - client *KontainerDriverClient -} - -type KontainerDriverClient struct { - apiClient *Client -} - -type KontainerDriverOperations interface { - List(opts *types.ListOpts) (*KontainerDriverCollection, error) - Create(opts *KontainerDriver) (*KontainerDriver, error) - Update(existing *KontainerDriver, updates interface{}) (*KontainerDriver, error) - Replace(existing *KontainerDriver) (*KontainerDriver, error) - ByID(id string) (*KontainerDriver, error) - Delete(container *KontainerDriver) error - - ActionActivate(resource *KontainerDriver) error - - ActionDeactivate(resource *KontainerDriver) error -} - -func newKontainerDriverClient(apiClient *Client) *KontainerDriverClient { - return &KontainerDriverClient{ - apiClient: apiClient, - } -} - -func (c *KontainerDriverClient) Create(container *KontainerDriver) (*KontainerDriver, error) { - resp := &KontainerDriver{} - err := c.apiClient.Ops.DoCreate(KontainerDriverType, container, resp) - return resp, err -} - -func (c *KontainerDriverClient) Update(existing *KontainerDriver, updates interface{}) (*KontainerDriver, error) { - resp := &KontainerDriver{} - err := c.apiClient.Ops.DoUpdate(KontainerDriverType, &existing.Resource, updates, resp) - return resp, err -} - -func (c *KontainerDriverClient) Replace(obj *KontainerDriver) (*KontainerDriver, error) { - resp := &KontainerDriver{} - err := c.apiClient.Ops.DoReplace(KontainerDriverType, &obj.Resource, obj, resp) - return resp, err -} - -func (c *KontainerDriverClient) List(opts *types.ListOpts) (*KontainerDriverCollection, error) { - resp := &KontainerDriverCollection{} - err := c.apiClient.Ops.DoList(KontainerDriverType, opts, resp) - resp.client = c - return resp, err -} - -func (cc *KontainerDriverCollection) Next() (*KontainerDriverCollection, error) { - if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { - resp := &KontainerDriverCollection{} - err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp) - resp.client = cc.client - return resp, err - } - return nil, nil -} - -func (c *KontainerDriverClient) ByID(id string) (*KontainerDriver, error) { - resp := &KontainerDriver{} - err := c.apiClient.Ops.DoByID(KontainerDriverType, id, resp) - return resp, err -} - -func (c *KontainerDriverClient) Delete(container *KontainerDriver) error { - return c.apiClient.Ops.DoResourceDelete(KontainerDriverType, &container.Resource) -} - -func (c *KontainerDriverClient) ActionActivate(resource *KontainerDriver) error { - err := c.apiClient.Ops.DoAction(KontainerDriverType, "activate", &resource.Resource, nil, nil) - return err -} - -func (c *KontainerDriverClient) ActionDeactivate(resource *KontainerDriver) error { - err := c.apiClient.Ops.DoAction(KontainerDriverType, "deactivate", &resource.Resource, nil, nil) - return err -} diff --git a/client/management/v3/zz_generated_kontainer_driver_spec.go b/client/management/v3/zz_generated_kontainer_driver_spec.go deleted file mode 100644 index 985f7d98..00000000 --- a/client/management/v3/zz_generated_kontainer_driver_spec.go +++ /dev/null @@ -1,20 +0,0 @@ -package client - -const ( - KontainerDriverSpecType = "kontainerDriverSpec" - KontainerDriverSpecFieldActive = "active" - KontainerDriverSpecFieldBuiltIn = "builtIn" - KontainerDriverSpecFieldChecksum = "checksum" - KontainerDriverSpecFieldUIURL = "uiUrl" - KontainerDriverSpecFieldURL = "url" - KontainerDriverSpecFieldWhitelistDomains = "whitelistDomains" -) - -type KontainerDriverSpec struct { - Active bool `json:"active,omitempty" yaml:"active,omitempty"` - BuiltIn bool `json:"builtIn,omitempty" yaml:"builtIn,omitempty"` - Checksum string `json:"checksum,omitempty" yaml:"checksum,omitempty"` - UIURL string `json:"uiUrl,omitempty" yaml:"uiUrl,omitempty"` - URL string `json:"url,omitempty" yaml:"url,omitempty"` - WhitelistDomains []string `json:"whitelistDomains,omitempty" yaml:"whitelistDomains,omitempty"` -} diff --git a/client/management/v3/zz_generated_kontainer_driver_status.go b/client/management/v3/zz_generated_kontainer_driver_status.go deleted file mode 100644 index 9ea025d6..00000000 --- a/client/management/v3/zz_generated_kontainer_driver_status.go +++ /dev/null @@ -1,16 +0,0 @@ -package client - -const ( - KontainerDriverStatusType = "kontainerDriverStatus" - KontainerDriverStatusFieldActualURL = "actualUrl" - KontainerDriverStatusFieldConditions = "conditions" - KontainerDriverStatusFieldDisplayName = "displayName" - KontainerDriverStatusFieldExecutablePath = "executablePath" -) - -type KontainerDriverStatus struct { - ActualURL string `json:"actualUrl,omitempty" yaml:"actualUrl,omitempty"` - Conditions []Condition `json:"conditions,omitempty" yaml:"conditions,omitempty"` - DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` - ExecutablePath string `json:"executablePath,omitempty" yaml:"executablePath,omitempty"` -} diff --git a/compose/zz_generated_compose.go b/compose/zz_generated_compose.go index 4d2f1aff..6ec2f815 100644 --- a/compose/zz_generated_compose.go +++ b/compose/zz_generated_compose.go @@ -44,7 +44,6 @@ type Config struct { ComposeConfigs map[string]managementClient.ComposeConfig `json:"composeConfigs,omitempty" yaml:"composeConfigs,omitempty"` ProjectCatalogs map[string]managementClient.ProjectCatalog `json:"projectCatalogs,omitempty" yaml:"projectCatalogs,omitempty"` ClusterCatalogs map[string]managementClient.ClusterCatalog `json:"clusterCatalogs,omitempty" yaml:"clusterCatalogs,omitempty"` - KontainerDrivers map[string]managementClient.KontainerDriver `json:"kontainerDrivers,omitempty" yaml:"kontainerDrivers,omitempty"` // Cluster Client Namespaces map[string]clusterClient.Namespace `json:"namespaces,omitempty" yaml:"namespaces,omitempty"`