generated files

This commit is contained in:
Jordan Liggitt
2019-02-14 01:00:28 -05:00
parent 47cb9559be
commit 6c0b1b87f0
23 changed files with 778 additions and 475 deletions

View File

@@ -11,15 +11,10 @@ go_library(
"doc.go",
"extensions_client.go",
"generated_expansion.go",
"ingress.go",
],
importpath = "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion",
deps = [
"//pkg/apis/extensions:go_default_library",
"//pkg/client/clientset_generated/internalclientset/scheme:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
],
)

View File

@@ -25,7 +25,6 @@ import (
type ExtensionsInterface interface {
RESTClient() rest.Interface
IngressesGetter
}
// ExtensionsClient is used to interact with features provided by the extensions group.
@@ -33,10 +32,6 @@ type ExtensionsClient struct {
restClient rest.Interface
}
func (c *ExtensionsClient) Ingresses(namespace string) IngressInterface {
return newIngresses(c, namespace)
}
// NewForConfig creates a new ExtensionsClient for the given config.
func NewForConfig(c *rest.Config) (*ExtensionsClient, error) {
config := *c

View File

@@ -10,17 +10,9 @@ go_library(
srcs = [
"doc.go",
"fake_extensions_client.go",
"fake_ingress.go",
],
importpath = "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake",
deps = [
"//pkg/apis/extensions:go_default_library",
"//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/testing:go_default_library",
],

View File

@@ -21,17 +21,12 @@ package fake
import (
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion"
)
type FakeExtensions struct {
*testing.Fake
}
func (c *FakeExtensions) Ingresses(namespace string) internalversion.IngressInterface {
return &FakeIngresses{c, namespace}
}
// RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation.
func (c *FakeExtensions) RESTClient() rest.Interface {

View File

@@ -17,5 +17,3 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
package internalversion
type IngressExpansion interface{}

View File

@@ -10,6 +10,7 @@ go_library(
srcs = [
"doc.go",
"generated_expansion.go",
"ingress.go",
"networking_client.go",
"networkpolicy.go",
],

View File

@@ -9,6 +9,7 @@ go_library(
name = "go_default_library",
srcs = [
"doc.go",
"fake_ingress.go",
"fake_networking_client.go",
"fake_networkpolicy.go",
],

View File

@@ -25,34 +25,34 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
extensions "k8s.io/kubernetes/pkg/apis/extensions"
networking "k8s.io/kubernetes/pkg/apis/networking"
)
// FakeIngresses implements IngressInterface
type FakeIngresses struct {
Fake *FakeExtensions
Fake *FakeNetworking
ns string
}
var ingressesResource = schema.GroupVersionResource{Group: "extensions", Version: "", Resource: "ingresses"}
var ingressesResource = schema.GroupVersionResource{Group: "networking.k8s.io", Version: "", Resource: "ingresses"}
var ingressesKind = schema.GroupVersionKind{Group: "extensions", Version: "", Kind: "Ingress"}
var ingressesKind = schema.GroupVersionKind{Group: "networking.k8s.io", Version: "", Kind: "Ingress"}
// Get takes name of the ingress, and returns the corresponding ingress object, and an error if there is any.
func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *extensions.Ingress, err error) {
func (c *FakeIngresses) Get(name string, options v1.GetOptions) (result *networking.Ingress, err error) {
obj, err := c.Fake.
Invokes(testing.NewGetAction(ingressesResource, c.ns, name), &extensions.Ingress{})
Invokes(testing.NewGetAction(ingressesResource, c.ns, name), &networking.Ingress{})
if obj == nil {
return nil, err
}
return obj.(*extensions.Ingress), err
return obj.(*networking.Ingress), err
}
// List takes label and field selectors, and returns the list of Ingresses that match those selectors.
func (c *FakeIngresses) List(opts v1.ListOptions) (result *extensions.IngressList, err error) {
func (c *FakeIngresses) List(opts v1.ListOptions) (result *networking.IngressList, err error) {
obj, err := c.Fake.
Invokes(testing.NewListAction(ingressesResource, ingressesKind, c.ns, opts), &extensions.IngressList{})
Invokes(testing.NewListAction(ingressesResource, ingressesKind, c.ns, opts), &networking.IngressList{})
if obj == nil {
return nil, err
@@ -62,8 +62,8 @@ func (c *FakeIngresses) List(opts v1.ListOptions) (result *extensions.IngressLis
if label == nil {
label = labels.Everything()
}
list := &extensions.IngressList{ListMeta: obj.(*extensions.IngressList).ListMeta}
for _, item := range obj.(*extensions.IngressList).Items {
list := &networking.IngressList{ListMeta: obj.(*networking.IngressList).ListMeta}
for _, item := range obj.(*networking.IngressList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
}
@@ -79,43 +79,43 @@ func (c *FakeIngresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
}
// 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 *FakeIngresses) Create(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
func (c *FakeIngresses) Create(ingress *networking.Ingress) (result *networking.Ingress, err error) {
obj, err := c.Fake.
Invokes(testing.NewCreateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{})
Invokes(testing.NewCreateAction(ingressesResource, c.ns, ingress), &networking.Ingress{})
if obj == nil {
return nil, err
}
return obj.(*extensions.Ingress), err
return obj.(*networking.Ingress), err
}
// 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 *FakeIngresses) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
func (c *FakeIngresses) Update(ingress *networking.Ingress) (result *networking.Ingress, err error) {
obj, err := c.Fake.
Invokes(testing.NewUpdateAction(ingressesResource, c.ns, ingress), &extensions.Ingress{})
Invokes(testing.NewUpdateAction(ingressesResource, c.ns, ingress), &networking.Ingress{})
if obj == nil {
return nil, err
}
return obj.(*extensions.Ingress), err
return obj.(*networking.Ingress), err
}
// UpdateStatus was generated because the type contains a Status member.
// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
func (c *FakeIngresses) UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error) {
func (c *FakeIngresses) UpdateStatus(ingress *networking.Ingress) (*networking.Ingress, error) {
obj, err := c.Fake.
Invokes(testing.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &extensions.Ingress{})
Invokes(testing.NewUpdateSubresourceAction(ingressesResource, "status", c.ns, ingress), &networking.Ingress{})
if obj == nil {
return nil, err
}
return obj.(*extensions.Ingress), err
return obj.(*networking.Ingress), err
}
// Delete takes name of the ingress and deletes it. Returns an error if one occurs.
func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error {
_, err := c.Fake.
Invokes(testing.NewDeleteAction(ingressesResource, c.ns, name), &extensions.Ingress{})
Invokes(testing.NewDeleteAction(ingressesResource, c.ns, name), &networking.Ingress{})
return err
}
@@ -124,17 +124,17 @@ func (c *FakeIngresses) Delete(name string, options *v1.DeleteOptions) error {
func (c *FakeIngresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(ingressesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &extensions.IngressList{})
_, err := c.Fake.Invokes(action, &networking.IngressList{})
return err
}
// Patch applies the patch and returns the patched ingress.
func (c *FakeIngresses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Ingress, err error) {
func (c *FakeIngresses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *networking.Ingress, err error) {
obj, err := c.Fake.
Invokes(testing.NewPatchSubresourceAction(ingressesResource, c.ns, name, pt, data, subresources...), &extensions.Ingress{})
Invokes(testing.NewPatchSubresourceAction(ingressesResource, c.ns, name, pt, data, subresources...), &networking.Ingress{})
if obj == nil {
return nil, err
}
return obj.(*extensions.Ingress), err
return obj.(*networking.Ingress), err
}

View File

@@ -28,6 +28,10 @@ type FakeNetworking struct {
*testing.Fake
}
func (c *FakeNetworking) Ingresses(namespace string) internalversion.IngressInterface {
return &FakeIngresses{c, namespace}
}
func (c *FakeNetworking) NetworkPolicies(namespace string) internalversion.NetworkPolicyInterface {
return &FakeNetworkPolicies{c, namespace}
}

View File

@@ -18,4 +18,6 @@ limitations under the License.
package internalversion
type IngressExpansion interface{}
type NetworkPolicyExpansion interface{}

View File

@@ -25,7 +25,7 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
extensions "k8s.io/kubernetes/pkg/apis/extensions"
networking "k8s.io/kubernetes/pkg/apis/networking"
scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme"
)
@@ -37,15 +37,15 @@ type IngressesGetter interface {
// IngressInterface has methods to work with Ingress resources.
type IngressInterface interface {
Create(*extensions.Ingress) (*extensions.Ingress, error)
Update(*extensions.Ingress) (*extensions.Ingress, error)
UpdateStatus(*extensions.Ingress) (*extensions.Ingress, error)
Create(*networking.Ingress) (*networking.Ingress, error)
Update(*networking.Ingress) (*networking.Ingress, error)
UpdateStatus(*networking.Ingress) (*networking.Ingress, error)
Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options v1.GetOptions) (*extensions.Ingress, error)
List(opts v1.ListOptions) (*extensions.IngressList, error)
Get(name string, options v1.GetOptions) (*networking.Ingress, error)
List(opts v1.ListOptions) (*networking.IngressList, error)
Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Ingress, err error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *networking.Ingress, err error)
IngressExpansion
}
@@ -56,7 +56,7 @@ type ingresses struct {
}
// newIngresses returns a Ingresses
func newIngresses(c *ExtensionsClient, namespace string) *ingresses {
func newIngresses(c *NetworkingClient, namespace string) *ingresses {
return &ingresses{
client: c.RESTClient(),
ns: namespace,
@@ -64,8 +64,8 @@ func newIngresses(c *ExtensionsClient, namespace string) *ingresses {
}
// 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, options v1.GetOptions) (result *extensions.Ingress, err error) {
result = &extensions.Ingress{}
func (c *ingresses) Get(name string, options v1.GetOptions) (result *networking.Ingress, err error) {
result = &networking.Ingress{}
err = c.client.Get().
Namespace(c.ns).
Resource("ingresses").
@@ -77,12 +77,12 @@ func (c *ingresses) Get(name string, options v1.GetOptions) (result *extensions.
}
// List takes label and field selectors, and returns the list of Ingresses that match those selectors.
func (c *ingresses) List(opts v1.ListOptions) (result *extensions.IngressList, err error) {
func (c *ingresses) List(opts v1.ListOptions) (result *networking.IngressList, err error) {
var timeout time.Duration
if opts.TimeoutSeconds != nil {
timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
}
result = &extensions.IngressList{}
result = &networking.IngressList{}
err = c.client.Get().
Namespace(c.ns).
Resource("ingresses").
@@ -109,8 +109,8 @@ func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) {
}
// 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) {
result = &extensions.Ingress{}
func (c *ingresses) Create(ingress *networking.Ingress) (result *networking.Ingress, err error) {
result = &networking.Ingress{}
err = c.client.Post().
Namespace(c.ns).
Resource("ingresses").
@@ -121,8 +121,8 @@ 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.
func (c *ingresses) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
result = &extensions.Ingress{}
func (c *ingresses) Update(ingress *networking.Ingress) (result *networking.Ingress, err error) {
result = &networking.Ingress{}
err = c.client.Put().
Namespace(c.ns).
Resource("ingresses").
@@ -136,8 +136,8 @@ func (c *ingresses) Update(ingress *extensions.Ingress) (result *extensions.Ingr
// UpdateStatus was generated because the type contains a Status member.
// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
func (c *ingresses) UpdateStatus(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
result = &extensions.Ingress{}
func (c *ingresses) UpdateStatus(ingress *networking.Ingress) (result *networking.Ingress, err error) {
result = &networking.Ingress{}
err = c.client.Put().
Namespace(c.ns).
Resource("ingresses").
@@ -177,8 +177,8 @@ func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L
}
// Patch applies the patch and returns the patched ingress.
func (c *ingresses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *extensions.Ingress, err error) {
result = &extensions.Ingress{}
func (c *ingresses) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *networking.Ingress, err error) {
result = &networking.Ingress{}
err = c.client.Patch(pt).
Namespace(c.ns).
Resource("ingresses").

View File

@@ -25,6 +25,7 @@ import (
type NetworkingInterface interface {
RESTClient() rest.Interface
IngressesGetter
NetworkPoliciesGetter
}
@@ -33,6 +34,10 @@ type NetworkingClient struct {
restClient rest.Interface
}
func (c *NetworkingClient) Ingresses(namespace string) IngressInterface {
return newIngresses(c, namespace)
}
func (c *NetworkingClient) NetworkPolicies(namespace string) NetworkPolicyInterface {
return newNetworkPolicies(c, namespace)
}