mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 01:06:27 +00:00
Ingress's plural
This commit is contained in:
parent
ee6f03f55a
commit
030043b5be
@ -57,6 +57,7 @@ func NameSystems() namer.NameSystems {
|
|||||||
pluralExceptions := map[string]string{
|
pluralExceptions := map[string]string{
|
||||||
"Endpoints": "Endpoints",
|
"Endpoints": "Endpoints",
|
||||||
"ComponentStatus": "ComponentStatus",
|
"ComponentStatus": "ComponentStatus",
|
||||||
|
"Ingress": "Ingress",
|
||||||
}
|
}
|
||||||
return namer.NameSystems{
|
return namer.NameSystems{
|
||||||
"public": namer.NewPublicNamer(0),
|
"public": namer.NewPublicNamer(0),
|
||||||
|
@ -26,7 +26,7 @@ type ExtensionsInterface interface {
|
|||||||
DaemonSetsGetter
|
DaemonSetsGetter
|
||||||
DeploymentsGetter
|
DeploymentsGetter
|
||||||
HorizontalPodAutoscalersGetter
|
HorizontalPodAutoscalersGetter
|
||||||
IngressesGetter
|
IngressGetter
|
||||||
JobsGetter
|
JobsGetter
|
||||||
ScalesGetter
|
ScalesGetter
|
||||||
ThirdPartyResourcesGetter
|
ThirdPartyResourcesGetter
|
||||||
@ -49,8 +49,8 @@ func (c *ExtensionsClient) HorizontalPodAutoscalers(namespace string) Horizontal
|
|||||||
return newHorizontalPodAutoscalers(c, namespace)
|
return newHorizontalPodAutoscalers(c, namespace)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ExtensionsClient) Ingresses(namespace string) IngressInterface {
|
func (c *ExtensionsClient) Ingress(namespace string) IngressInterface {
|
||||||
return newIngresses(c, namespace)
|
return newIngress(c, namespace)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ExtensionsClient) Jobs(namespace string) JobInterface {
|
func (c *ExtensionsClient) Jobs(namespace string) JobInterface {
|
||||||
|
@ -37,8 +37,8 @@ func (c *FakeExtensions) HorizontalPodAutoscalers(namespace string) unversioned.
|
|||||||
return &FakeHorizontalPodAutoscalers{c, namespace}
|
return &FakeHorizontalPodAutoscalers{c, namespace}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeExtensions) Ingresses(namespace string) unversioned.IngressInterface {
|
func (c *FakeExtensions) Ingress(namespace string) unversioned.IngressInterface {
|
||||||
return &FakeIngresses{c, namespace}
|
return &FakeIngress{c, namespace}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeExtensions) Jobs(namespace string) unversioned.JobInterface {
|
func (c *FakeExtensions) Jobs(namespace string) unversioned.JobInterface {
|
||||||
|
@ -24,15 +24,15 @@ import (
|
|||||||
watch "k8s.io/kubernetes/pkg/watch"
|
watch "k8s.io/kubernetes/pkg/watch"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FakeIngresses implements IngressInterface
|
// FakeIngress implements IngressInterface
|
||||||
type FakeIngresses struct {
|
type FakeIngress struct {
|
||||||
Fake *FakeExtensions
|
Fake *FakeExtensions
|
||||||
ns string
|
ns string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeIngresses) Create(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
func (c *FakeIngress) Create(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
||||||
obj, err := c.Fake.
|
obj, err := c.Fake.
|
||||||
Invokes(core.NewCreateAction("ingresses", c.ns, ingress), &extensions.Ingress{})
|
Invokes(core.NewCreateAction("ingress", c.ns, ingress), &extensions.Ingress{})
|
||||||
|
|
||||||
if obj == nil {
|
if obj == nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -40,9 +40,9 @@ func (c *FakeIngresses) Create(ingress *extensions.Ingress) (result *extensions.
|
|||||||
return obj.(*extensions.Ingress), err
|
return obj.(*extensions.Ingress), err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeIngresses) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
func (c *FakeIngress) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
||||||
obj, err := c.Fake.
|
obj, err := c.Fake.
|
||||||
Invokes(core.NewUpdateAction("ingresses", c.ns, ingress), &extensions.Ingress{})
|
Invokes(core.NewUpdateAction("ingress", c.ns, ingress), &extensions.Ingress{})
|
||||||
|
|
||||||
if obj == nil {
|
if obj == nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -50,9 +50,9 @@ func (c *FakeIngresses) Update(ingress *extensions.Ingress) (result *extensions.
|
|||||||
return obj.(*extensions.Ingress), err
|
return obj.(*extensions.Ingress), err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeIngresses) UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error) {
|
func (c *FakeIngress) UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error) {
|
||||||
obj, err := c.Fake.
|
obj, err := c.Fake.
|
||||||
Invokes(core.NewUpdateSubresourceAction("ingresses", "status", c.ns, ingress), &extensions.Ingress{})
|
Invokes(core.NewUpdateSubresourceAction("ingress", "status", c.ns, ingress), &extensions.Ingress{})
|
||||||
|
|
||||||
if obj == nil {
|
if obj == nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -60,23 +60,23 @@ func (c *FakeIngresses) UpdateStatus(ingress *extensions.Ingress) (*extensions.I
|
|||||||
return obj.(*extensions.Ingress), err
|
return obj.(*extensions.Ingress), err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeIngresses) Delete(name string, options *api.DeleteOptions) error {
|
func (c *FakeIngress) Delete(name string, options *api.DeleteOptions) error {
|
||||||
_, err := c.Fake.
|
_, err := c.Fake.
|
||||||
Invokes(core.NewDeleteAction("ingresses", c.ns, name), &extensions.Ingress{})
|
Invokes(core.NewDeleteAction("ingress", c.ns, name), &extensions.Ingress{})
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeIngresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
|
func (c *FakeIngress) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
|
||||||
action := core.NewDeleteCollectionAction("events", c.ns, listOptions)
|
action := core.NewDeleteCollectionAction("events", c.ns, listOptions)
|
||||||
|
|
||||||
_, err := c.Fake.Invokes(action, &extensions.IngressList{})
|
_, err := c.Fake.Invokes(action, &extensions.IngressList{})
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeIngresses) Get(name string) (result *extensions.Ingress, err error) {
|
func (c *FakeIngress) Get(name string) (result *extensions.Ingress, err error) {
|
||||||
obj, err := c.Fake.
|
obj, err := c.Fake.
|
||||||
Invokes(core.NewGetAction("ingresses", c.ns, name), &extensions.Ingress{})
|
Invokes(core.NewGetAction("ingress", c.ns, name), &extensions.Ingress{})
|
||||||
|
|
||||||
if obj == nil {
|
if obj == nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -84,9 +84,9 @@ func (c *FakeIngresses) Get(name string) (result *extensions.Ingress, err error)
|
|||||||
return obj.(*extensions.Ingress), err
|
return obj.(*extensions.Ingress), err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *FakeIngresses) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
|
func (c *FakeIngress) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
|
||||||
obj, err := c.Fake.
|
obj, err := c.Fake.
|
||||||
Invokes(core.NewListAction("ingresses", c.ns, opts), &extensions.IngressList{})
|
Invokes(core.NewListAction("ingress", c.ns, opts), &extensions.IngressList{})
|
||||||
|
|
||||||
if obj == nil {
|
if obj == nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -105,9 +105,9 @@ func (c *FakeIngresses) List(opts api.ListOptions) (result *extensions.IngressLi
|
|||||||
return list, err
|
return list, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Watch returns a watch.Interface that watches the requested ingresses.
|
// Watch returns a watch.Interface that watches the requested ingress.
|
||||||
func (c *FakeIngresses) Watch(opts api.ListOptions) (watch.Interface, error) {
|
func (c *FakeIngress) Watch(opts api.ListOptions) (watch.Interface, error) {
|
||||||
return c.Fake.
|
return c.Fake.
|
||||||
InvokesWatch(core.NewWatchAction("ingresses", c.ns, opts))
|
InvokesWatch(core.NewWatchAction("ingress", c.ns, opts))
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -22,10 +22,10 @@ import (
|
|||||||
watch "k8s.io/kubernetes/pkg/watch"
|
watch "k8s.io/kubernetes/pkg/watch"
|
||||||
)
|
)
|
||||||
|
|
||||||
// IngressesGetter has a method to return a IngressInterface.
|
// IngressGetter has a method to return a IngressInterface.
|
||||||
// A group's client should implement this interface.
|
// A group's client should implement this interface.
|
||||||
type IngressesGetter interface {
|
type IngressGetter interface {
|
||||||
Ingresses(namespace string) IngressInterface
|
Ingress(namespace string) IngressInterface
|
||||||
}
|
}
|
||||||
|
|
||||||
// IngressInterface has methods to work with Ingress resources.
|
// IngressInterface has methods to work with Ingress resources.
|
||||||
@ -41,26 +41,26 @@ type IngressInterface interface {
|
|||||||
IngressExpansion
|
IngressExpansion
|
||||||
}
|
}
|
||||||
|
|
||||||
// ingresses implements IngressInterface
|
// ingress implements IngressInterface
|
||||||
type ingresses struct {
|
type ingress struct {
|
||||||
client *ExtensionsClient
|
client *ExtensionsClient
|
||||||
ns string
|
ns string
|
||||||
}
|
}
|
||||||
|
|
||||||
// newIngresses returns a Ingresses
|
// newIngress returns a Ingress
|
||||||
func newIngresses(c *ExtensionsClient, namespace string) *ingresses {
|
func newIngress(c *ExtensionsClient, namespace string) *ingress {
|
||||||
return &ingresses{
|
return &ingress{
|
||||||
client: c,
|
client: c,
|
||||||
ns: namespace,
|
ns: namespace,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create takes the representation of a ingress and creates it. Returns the server's representation of the ingress, and an error, if there is any.
|
// Create takes the representation of a ingress and creates it. Returns the server's representation of the ingress, and an error, if there is any.
|
||||||
func (c *ingresses) Create(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
func (c *ingress) Create(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
||||||
result = &extensions.Ingress{}
|
result = &extensions.Ingress{}
|
||||||
err = c.client.Post().
|
err = c.client.Post().
|
||||||
Namespace(c.ns).
|
Namespace(c.ns).
|
||||||
Resource("ingresses").
|
Resource("ingress").
|
||||||
Body(ingress).
|
Body(ingress).
|
||||||
Do().
|
Do().
|
||||||
Into(result)
|
Into(result)
|
||||||
@ -68,11 +68,11 @@ func (c *ingresses) Create(ingress *extensions.Ingress) (result *extensions.Ingr
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update takes the representation of a ingress and updates it. Returns the server's representation of the ingress, and an error, if there is any.
|
// Update takes the representation of a ingress and updates it. Returns the server's representation of the ingress, and an error, if there is any.
|
||||||
func (c *ingresses) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
func (c *ingress) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
||||||
result = &extensions.Ingress{}
|
result = &extensions.Ingress{}
|
||||||
err = c.client.Put().
|
err = c.client.Put().
|
||||||
Namespace(c.ns).
|
Namespace(c.ns).
|
||||||
Resource("ingresses").
|
Resource("ingress").
|
||||||
Name(ingress.Name).
|
Name(ingress.Name).
|
||||||
Body(ingress).
|
Body(ingress).
|
||||||
Do().
|
Do().
|
||||||
@ -80,11 +80,11 @@ func (c *ingresses) Update(ingress *extensions.Ingress) (result *extensions.Ingr
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ingresses) UpdateStatus(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
func (c *ingress) UpdateStatus(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
|
||||||
result = &extensions.Ingress{}
|
result = &extensions.Ingress{}
|
||||||
err = c.client.Put().
|
err = c.client.Put().
|
||||||
Namespace(c.ns).
|
Namespace(c.ns).
|
||||||
Resource("ingresses").
|
Resource("ingress").
|
||||||
Name(ingress.Name).
|
Name(ingress.Name).
|
||||||
SubResource("status").
|
SubResource("status").
|
||||||
Body(ingress).
|
Body(ingress).
|
||||||
@ -94,10 +94,10 @@ func (c *ingresses) UpdateStatus(ingress *extensions.Ingress) (result *extension
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Delete takes name of the ingress and deletes it. Returns an error if one occurs.
|
// Delete takes name of the ingress and deletes it. Returns an error if one occurs.
|
||||||
func (c *ingresses) Delete(name string, options *api.DeleteOptions) error {
|
func (c *ingress) Delete(name string, options *api.DeleteOptions) error {
|
||||||
return c.client.Delete().
|
return c.client.Delete().
|
||||||
Namespace(c.ns).
|
Namespace(c.ns).
|
||||||
Resource("ingresses").
|
Resource("ingress").
|
||||||
Name(name).
|
Name(name).
|
||||||
Body(options).
|
Body(options).
|
||||||
Do().
|
Do().
|
||||||
@ -105,10 +105,10 @@ func (c *ingresses) Delete(name string, options *api.DeleteOptions) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// DeleteCollection deletes a collection of objects.
|
// DeleteCollection deletes a collection of objects.
|
||||||
func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
|
func (c *ingress) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
|
||||||
return c.client.Delete().
|
return c.client.Delete().
|
||||||
Namespace(c.ns).
|
Namespace(c.ns).
|
||||||
Resource("ingresses").
|
Resource("ingress").
|
||||||
VersionedParams(&listOptions, api.Scheme).
|
VersionedParams(&listOptions, api.Scheme).
|
||||||
Body(options).
|
Body(options).
|
||||||
Do().
|
Do().
|
||||||
@ -116,35 +116,35 @@ func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions api
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get takes name of the ingress, and returns the corresponding ingress object, and an error if there is any.
|
// Get takes name of the ingress, and returns the corresponding ingress object, and an error if there is any.
|
||||||
func (c *ingresses) Get(name string) (result *extensions.Ingress, err error) {
|
func (c *ingress) Get(name string) (result *extensions.Ingress, err error) {
|
||||||
result = &extensions.Ingress{}
|
result = &extensions.Ingress{}
|
||||||
err = c.client.Get().
|
err = c.client.Get().
|
||||||
Namespace(c.ns).
|
Namespace(c.ns).
|
||||||
Resource("ingresses").
|
Resource("ingress").
|
||||||
Name(name).
|
Name(name).
|
||||||
Do().
|
Do().
|
||||||
Into(result)
|
Into(result)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// List takes label and field selectors, and returns the list of Ingresses that match those selectors.
|
// List takes label and field selectors, and returns the list of Ingress that match those selectors.
|
||||||
func (c *ingresses) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
|
func (c *ingress) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
|
||||||
result = &extensions.IngressList{}
|
result = &extensions.IngressList{}
|
||||||
err = c.client.Get().
|
err = c.client.Get().
|
||||||
Namespace(c.ns).
|
Namespace(c.ns).
|
||||||
Resource("ingresses").
|
Resource("ingress").
|
||||||
VersionedParams(&opts, api.Scheme).
|
VersionedParams(&opts, api.Scheme).
|
||||||
Do().
|
Do().
|
||||||
Into(result)
|
Into(result)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Watch returns a watch.Interface that watches the requested ingresses.
|
// Watch returns a watch.Interface that watches the requested ingress.
|
||||||
func (c *ingresses) Watch(opts api.ListOptions) (watch.Interface, error) {
|
func (c *ingress) Watch(opts api.ListOptions) (watch.Interface, error) {
|
||||||
return c.client.Get().
|
return c.client.Get().
|
||||||
Prefix("watch").
|
Prefix("watch").
|
||||||
Namespace(c.ns).
|
Namespace(c.ns).
|
||||||
Resource("ingresses").
|
Resource("ingress").
|
||||||
VersionedParams(&opts, api.Scheme).
|
VersionedParams(&opts, api.Scheme).
|
||||||
Watch()
|
Watch()
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user