From 151639b30595d0a05f886b6bf0e195c7cd42de28 Mon Sep 17 00:00:00 2001 From: Zihong Zheng Date: Wed, 25 Apr 2018 17:33:11 -0700 Subject: [PATCH] Rename serviceextension -> backendconfig --- cmd/glbc/main.go | 8 +- hack/update-codegen.sh | 4 +- .../register.go | 2 +- .../v1alpha1/doc.go | 0 .../v1alpha1/register.go | 8 +- .../v1alpha1/types.go | 22 +-- .../v1alpha1/zz_generated.deepcopy.go | 38 ++--- .../client/clientset/versioned/clientset.go | 2 +- .../client/clientset/versioned/doc.go | 0 .../versioned/fake/clientset_generated.go | 6 +- .../client/clientset/versioned/fake/doc.go | 0 .../clientset/versioned/fake/register.go | 2 +- .../client/clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 2 +- .../backendconfig/v1alpha1/backendconfig.go | 157 ++++++++++++++++++ .../v1alpha1/backendconfig_client.go} | 10 +- .../typed/backendconfig}/v1alpha1/doc.go | 0 .../typed/backendconfig}/v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_backendconfig.go | 128 ++++++++++++++ .../fake/fake_backendconfig_client.go} | 6 +- .../v1alpha1/generated_expansion.go | 2 +- .../backendconfig}/interface.go | 4 +- .../backendconfig/v1alpha1/backendconfig.go | 89 ++++++++++ .../backendconfig}/v1alpha1/interface.go | 12 +- .../informers/externalversions/factory.go | 12 +- .../informers/externalversions/generic.go | 6 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../backendconfig/v1alpha1/backendconfig.go | 94 +++++++++++ .../v1alpha1/expansion_generated.go | 12 +- .../crd.go | 32 ++-- .../crd_test.go | 2 +- pkg/flags/flags.go | 40 ++--- .../v1alpha1/fake/fake_serviceextension.go | 128 -------------- .../v1alpha1/serviceextension.go | 157 ------------------ .../v1alpha1/serviceextension.go | 89 ---------- .../v1alpha1/serviceextension.go | 94 ----------- 36 files changed, 585 insertions(+), 585 deletions(-) rename pkg/apis/{serviceextension => backendconfig}/register.go (96%) rename pkg/apis/{serviceextension => backendconfig}/v1alpha1/doc.go (100%) rename pkg/apis/{serviceextension => backendconfig}/v1alpha1/register.go (88%) rename pkg/apis/{serviceextension => backendconfig}/v1alpha1/types.go (64%) rename pkg/apis/{serviceextension => backendconfig}/v1alpha1/zz_generated.deepcopy.go (70%) rename pkg/{serviceextension => backendconfig}/client/clientset/versioned/clientset.go (96%) rename pkg/{serviceextension => backendconfig}/client/clientset/versioned/doc.go (100%) rename pkg/{serviceextension => backendconfig}/client/clientset/versioned/fake/clientset_generated.go (88%) rename pkg/{serviceextension => backendconfig}/client/clientset/versioned/fake/doc.go (100%) rename pkg/{serviceextension => backendconfig}/client/clientset/versioned/fake/register.go (96%) rename pkg/{serviceextension => backendconfig}/client/clientset/versioned/scheme/doc.go (100%) rename pkg/{serviceextension => backendconfig}/client/clientset/versioned/scheme/register.go (96%) create mode 100644 pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/backendconfig.go rename pkg/{serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/serviceextension_client.go => backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/backendconfig_client.go} (88%) rename pkg/{serviceextension/client/clientset/versioned/typed/serviceextension => backendconfig/client/clientset/versioned/typed/backendconfig}/v1alpha1/doc.go (100%) rename pkg/{serviceextension/client/clientset/versioned/typed/serviceextension => backendconfig/client/clientset/versioned/typed/backendconfig}/v1alpha1/fake/doc.go (100%) create mode 100644 pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/fake_backendconfig.go rename pkg/{serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/fake_serviceextension_client.go => backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/fake_backendconfig_client.go} (79%) rename pkg/{serviceextension/client/clientset/versioned/typed/serviceextension => backendconfig/client/clientset/versioned/typed/backendconfig}/v1alpha1/generated_expansion.go (93%) rename pkg/{serviceextension/client/informers/externalversions/serviceextension => backendconfig/client/informers/externalversions/backendconfig}/interface.go (86%) create mode 100644 pkg/backendconfig/client/informers/externalversions/backendconfig/v1alpha1/backendconfig.go rename pkg/{serviceextension/client/informers/externalversions/serviceextension => backendconfig/client/informers/externalversions/backendconfig}/v1alpha1/interface.go (72%) rename pkg/{serviceextension => backendconfig}/client/informers/externalversions/factory.go (89%) rename pkg/{serviceextension => backendconfig}/client/informers/externalversions/generic.go (90%) rename pkg/{serviceextension => backendconfig}/client/informers/externalversions/internalinterfaces/factory_interfaces.go (93%) create mode 100644 pkg/backendconfig/client/listers/backendconfig/v1alpha1/backendconfig.go rename pkg/{serviceextension/client/listers/serviceextension => backendconfig/client/listers/backendconfig}/v1alpha1/expansion_generated.go (66%) rename pkg/{serviceextension => backendconfig}/crd.go (74%) rename pkg/{serviceextension => backendconfig}/crd_test.go (98%) delete mode 100644 pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/fake_serviceextension.go delete mode 100644 pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/serviceextension.go delete mode 100644 pkg/serviceextension/client/informers/externalversions/serviceextension/v1alpha1/serviceextension.go delete mode 100644 pkg/serviceextension/client/listers/serviceextension/v1alpha1/serviceextension.go diff --git a/cmd/glbc/main.go b/cmd/glbc/main.go index 27bed31cdf..c4f0b46b7f 100644 --- a/cmd/glbc/main.go +++ b/cmd/glbc/main.go @@ -33,8 +33,8 @@ import ( neg "k8s.io/ingress-gce/pkg/neg" "k8s.io/ingress-gce/cmd/glbc/app" + "k8s.io/ingress-gce/pkg/backendconfig" "k8s.io/ingress-gce/pkg/flags" - "k8s.io/ingress-gce/pkg/serviceextension" "k8s.io/ingress-gce/pkg/version" ) @@ -72,14 +72,14 @@ func main() { glog.Fatalf("Failed to create kubernetes client: %v", err) } - if flags.F.EnableServiceExtension { + if flags.F.EnableBackendConfig { crdClient, err := crdclient.NewForConfig(kubeConfig) if err != nil { glog.Fatalf("Failed to create kubernetes CRD client: %v", err) } - if _, err := serviceextension.EnsureCRD(crdClient); err != nil { - glog.Fatalf("Failed to ensure ServiceExtension CRD: %v", err) + if _, err := backendconfig.EnsureCRD(crdClient); err != nil { + glog.Fatalf("Failed to ensure BackendConfig CRD: %v", err) } } diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 56c7aae0ec..0468f574d3 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -26,7 +26,7 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-ge # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ - k8s.io/ingress-gce/pkg/serviceextension/client k8s.io/ingress-gce/pkg/apis \ - serviceextension:v1alpha1 \ + k8s.io/ingress-gce/pkg/backendconfig/client k8s.io/ingress-gce/pkg/apis \ + backendconfig:v1alpha1 \ --output-base "$(dirname ${BASH_SOURCE})/../../.." \ --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt diff --git a/pkg/apis/serviceextension/register.go b/pkg/apis/backendconfig/register.go similarity index 96% rename from pkg/apis/serviceextension/register.go rename to pkg/apis/backendconfig/register.go index bb46d2d0bc..461e1b10cf 100644 --- a/pkg/apis/serviceextension/register.go +++ b/pkg/apis/backendconfig/register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package serviceextension +package backendconfig const ( GroupName = "cloud.google.com" diff --git a/pkg/apis/serviceextension/v1alpha1/doc.go b/pkg/apis/backendconfig/v1alpha1/doc.go similarity index 100% rename from pkg/apis/serviceextension/v1alpha1/doc.go rename to pkg/apis/backendconfig/v1alpha1/doc.go diff --git a/pkg/apis/serviceextension/v1alpha1/register.go b/pkg/apis/backendconfig/v1alpha1/register.go similarity index 88% rename from pkg/apis/serviceextension/v1alpha1/register.go rename to pkg/apis/backendconfig/v1alpha1/register.go index aac9c2f76b..dc25513572 100644 --- a/pkg/apis/serviceextension/v1alpha1/register.go +++ b/pkg/apis/backendconfig/v1alpha1/register.go @@ -21,11 +21,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/ingress-gce/pkg/apis/serviceextension" + "k8s.io/ingress-gce/pkg/apis/backendconfig" ) // SchemeGroupVersion is group version used to register these objects -var SchemeGroupVersion = schema.GroupVersion{Group: serviceextension.GroupName, Version: "v1alpha1"} +var SchemeGroupVersion = schema.GroupVersion{Group: backendconfig.GroupName, Version: "v1alpha1"} // Kind takes an unqualified kind and returns back a Group qualified GroupKind func Kind(kind string) schema.GroupKind { @@ -45,8 +45,8 @@ var ( // Adds the list of known types to Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &ServiceExtension{}, - &ServiceExtensionList{}, + &BackendConfig{}, + &BackendConfigList{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/serviceextension/v1alpha1/types.go b/pkg/apis/backendconfig/v1alpha1/types.go similarity index 64% rename from pkg/apis/serviceextension/v1alpha1/types.go rename to pkg/apis/backendconfig/v1alpha1/types.go index e259cdc226..f56c2ad9e7 100644 --- a/pkg/apis/serviceextension/v1alpha1/types.go +++ b/pkg/apis/backendconfig/v1alpha1/types.go @@ -24,29 +24,29 @@ import ( // +genclient:noStatus // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// ServiceExtension is a specification for a ServiceExtension resource -type ServiceExtension struct { +// BackendConfig is a specification for a BackendConfig resource +type BackendConfig struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Spec ServiceExtensionSpec `json:"spec"` - Status ServiceExtensionStatus `json:"status"` + Spec BackendConfigSpec `json:"spec"` + Status BackendConfigStatus `json:"status"` } -// ServiceExtensionSpec is the spec for a ServiceExtension resource -type ServiceExtensionSpec struct { +// BackendConfigSpec is the spec for a BackendConfig resource +type BackendConfigSpec struct { } -// ServiceExtensionStatus is the status for a ServiceExtension resource -type ServiceExtensionStatus struct { +// BackendConfigStatus is the status for a BackendConfig resource +type BackendConfigStatus struct { } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// ServiceExtensionList is a list of ServiceExtension resources -type ServiceExtensionList struct { +// BackendConfigList is a list of BackendConfig resources +type BackendConfigList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata"` - Items []ServiceExtension `json:"items"` + Items []BackendConfig `json:"items"` } diff --git a/pkg/apis/serviceextension/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/backendconfig/v1alpha1/zz_generated.deepcopy.go similarity index 70% rename from pkg/apis/serviceextension/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/backendconfig/v1alpha1/zz_generated.deepcopy.go index b6ee6df6ee..1067a4e52e 100644 --- a/pkg/apis/serviceextension/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/backendconfig/v1alpha1/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ServiceExtension) DeepCopyInto(out *ServiceExtension) { +func (in *BackendConfig) DeepCopyInto(out *BackendConfig) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) @@ -34,18 +34,18 @@ func (in *ServiceExtension) DeepCopyInto(out *ServiceExtension) { return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceExtension. -func (in *ServiceExtension) DeepCopy() *ServiceExtension { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackendConfig. +func (in *BackendConfig) DeepCopy() *BackendConfig { if in == nil { return nil } - out := new(ServiceExtension) + out := new(BackendConfig) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ServiceExtension) DeepCopyObject() runtime.Object { +func (in *BackendConfig) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -53,13 +53,13 @@ func (in *ServiceExtension) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ServiceExtensionList) DeepCopyInto(out *ServiceExtensionList) { +func (in *BackendConfigList) DeepCopyInto(out *BackendConfigList) { *out = *in out.TypeMeta = in.TypeMeta out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]ServiceExtension, len(*in)) + *out = make([]BackendConfig, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -67,18 +67,18 @@ func (in *ServiceExtensionList) DeepCopyInto(out *ServiceExtensionList) { return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceExtensionList. -func (in *ServiceExtensionList) DeepCopy() *ServiceExtensionList { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackendConfigList. +func (in *BackendConfigList) DeepCopy() *BackendConfigList { if in == nil { return nil } - out := new(ServiceExtensionList) + out := new(BackendConfigList) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ServiceExtensionList) DeepCopyObject() runtime.Object { +func (in *BackendConfigList) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -86,33 +86,33 @@ func (in *ServiceExtensionList) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ServiceExtensionSpec) DeepCopyInto(out *ServiceExtensionSpec) { +func (in *BackendConfigSpec) DeepCopyInto(out *BackendConfigSpec) { *out = *in return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceExtensionSpec. -func (in *ServiceExtensionSpec) DeepCopy() *ServiceExtensionSpec { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackendConfigSpec. +func (in *BackendConfigSpec) DeepCopy() *BackendConfigSpec { if in == nil { return nil } - out := new(ServiceExtensionSpec) + out := new(BackendConfigSpec) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ServiceExtensionStatus) DeepCopyInto(out *ServiceExtensionStatus) { +func (in *BackendConfigStatus) DeepCopyInto(out *BackendConfigStatus) { *out = *in return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceExtensionStatus. -func (in *ServiceExtensionStatus) DeepCopy() *ServiceExtensionStatus { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackendConfigStatus. +func (in *BackendConfigStatus) DeepCopy() *BackendConfigStatus { if in == nil { return nil } - out := new(ServiceExtensionStatus) + out := new(BackendConfigStatus) in.DeepCopyInto(out) return out } diff --git a/pkg/serviceextension/client/clientset/versioned/clientset.go b/pkg/backendconfig/client/clientset/versioned/clientset.go similarity index 96% rename from pkg/serviceextension/client/clientset/versioned/clientset.go rename to pkg/backendconfig/client/clientset/versioned/clientset.go index d9bd6a21cd..42f4dbf239 100644 --- a/pkg/serviceextension/client/clientset/versioned/clientset.go +++ b/pkg/backendconfig/client/clientset/versioned/clientset.go @@ -23,7 +23,7 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - cloudv1alpha1 "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1" + cloudv1alpha1 "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1" ) type Interface interface { diff --git a/pkg/serviceextension/client/clientset/versioned/doc.go b/pkg/backendconfig/client/clientset/versioned/doc.go similarity index 100% rename from pkg/serviceextension/client/clientset/versioned/doc.go rename to pkg/backendconfig/client/clientset/versioned/doc.go diff --git a/pkg/serviceextension/client/clientset/versioned/fake/clientset_generated.go b/pkg/backendconfig/client/clientset/versioned/fake/clientset_generated.go similarity index 88% rename from pkg/serviceextension/client/clientset/versioned/fake/clientset_generated.go rename to pkg/backendconfig/client/clientset/versioned/fake/clientset_generated.go index caae8ec23e..95f6823407 100644 --- a/pkg/serviceextension/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/backendconfig/client/clientset/versioned/fake/clientset_generated.go @@ -24,9 +24,9 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned" - cloudv1alpha1 "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1" - fakecloudv1alpha1 "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake" + clientset "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned" + cloudv1alpha1 "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1" + fakecloudv1alpha1 "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/pkg/serviceextension/client/clientset/versioned/fake/doc.go b/pkg/backendconfig/client/clientset/versioned/fake/doc.go similarity index 100% rename from pkg/serviceextension/client/clientset/versioned/fake/doc.go rename to pkg/backendconfig/client/clientset/versioned/fake/doc.go diff --git a/pkg/serviceextension/client/clientset/versioned/fake/register.go b/pkg/backendconfig/client/clientset/versioned/fake/register.go similarity index 96% rename from pkg/serviceextension/client/clientset/versioned/fake/register.go rename to pkg/backendconfig/client/clientset/versioned/fake/register.go index 0ead456f23..8b798eaed1 100644 --- a/pkg/serviceextension/client/clientset/versioned/fake/register.go +++ b/pkg/backendconfig/client/clientset/versioned/fake/register.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - cloudv1alpha1 "k8s.io/ingress-gce/pkg/apis/serviceextension/v1alpha1" + cloudv1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/pkg/serviceextension/client/clientset/versioned/scheme/doc.go b/pkg/backendconfig/client/clientset/versioned/scheme/doc.go similarity index 100% rename from pkg/serviceextension/client/clientset/versioned/scheme/doc.go rename to pkg/backendconfig/client/clientset/versioned/scheme/doc.go diff --git a/pkg/serviceextension/client/clientset/versioned/scheme/register.go b/pkg/backendconfig/client/clientset/versioned/scheme/register.go similarity index 96% rename from pkg/serviceextension/client/clientset/versioned/scheme/register.go rename to pkg/backendconfig/client/clientset/versioned/scheme/register.go index ca6890fcd6..1f18002cb0 100644 --- a/pkg/serviceextension/client/clientset/versioned/scheme/register.go +++ b/pkg/backendconfig/client/clientset/versioned/scheme/register.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - cloudv1alpha1 "k8s.io/ingress-gce/pkg/apis/serviceextension/v1alpha1" + cloudv1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/backendconfig.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/backendconfig.go new file mode 100644 index 0000000000..84802ee0c1 --- /dev/null +++ b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/backendconfig.go @@ -0,0 +1,157 @@ +/* +Copyright 2018 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" + v1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1" + scheme "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned/scheme" +) + +// BackendConfigsGetter has a method to return a BackendConfigInterface. +// A group's client should implement this interface. +type BackendConfigsGetter interface { + BackendConfigs(namespace string) BackendConfigInterface +} + +// BackendConfigInterface has methods to work with BackendConfig resources. +type BackendConfigInterface interface { + Create(*v1alpha1.BackendConfig) (*v1alpha1.BackendConfig, error) + Update(*v1alpha1.BackendConfig) (*v1alpha1.BackendConfig, error) + Delete(name string, options *v1.DeleteOptions) error + DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error + Get(name string, options v1.GetOptions) (*v1alpha1.BackendConfig, error) + List(opts v1.ListOptions) (*v1alpha1.BackendConfigList, error) + Watch(opts v1.ListOptions) (watch.Interface, error) + Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.BackendConfig, err error) + BackendConfigExpansion +} + +// backendConfigs implements BackendConfigInterface +type backendConfigs struct { + client rest.Interface + ns string +} + +// newBackendConfigs returns a BackendConfigs +func newBackendConfigs(c *CloudV1alpha1Client, namespace string) *backendConfigs { + return &backendConfigs{ + client: c.RESTClient(), + ns: namespace, + } +} + +// Get takes name of the backendConfig, and returns the corresponding backendConfig object, and an error if there is any. +func (c *backendConfigs) Get(name string, options v1.GetOptions) (result *v1alpha1.BackendConfig, err error) { + result = &v1alpha1.BackendConfig{} + err = c.client.Get(). + Namespace(c.ns). + Resource("backendconfigs"). + Name(name). + VersionedParams(&options, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of BackendConfigs that match those selectors. +func (c *backendConfigs) List(opts v1.ListOptions) (result *v1alpha1.BackendConfigList, err error) { + result = &v1alpha1.BackendConfigList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("backendconfigs"). + VersionedParams(&opts, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested backendConfigs. +func (c *backendConfigs) Watch(opts v1.ListOptions) (watch.Interface, error) { + opts.Watch = true + return c.client.Get(). + Namespace(c.ns). + Resource("backendconfigs"). + VersionedParams(&opts, scheme.ParameterCodec). + Watch() +} + +// Create takes the representation of a backendConfig and creates it. Returns the server's representation of the backendConfig, and an error, if there is any. +func (c *backendConfigs) Create(backendConfig *v1alpha1.BackendConfig) (result *v1alpha1.BackendConfig, err error) { + result = &v1alpha1.BackendConfig{} + err = c.client.Post(). + Namespace(c.ns). + Resource("backendconfigs"). + Body(backendConfig). + Do(). + Into(result) + return +} + +// Update takes the representation of a backendConfig and updates it. Returns the server's representation of the backendConfig, and an error, if there is any. +func (c *backendConfigs) Update(backendConfig *v1alpha1.BackendConfig) (result *v1alpha1.BackendConfig, err error) { + result = &v1alpha1.BackendConfig{} + err = c.client.Put(). + Namespace(c.ns). + Resource("backendconfigs"). + Name(backendConfig.Name). + Body(backendConfig). + Do(). + Into(result) + return +} + +// Delete takes name of the backendConfig and deletes it. Returns an error if one occurs. +func (c *backendConfigs) Delete(name string, options *v1.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("backendconfigs"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *backendConfigs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("backendconfigs"). + VersionedParams(&listOptions, scheme.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Patch applies the patch and returns the patched backendConfig. +func (c *backendConfigs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.BackendConfig, err error) { + result = &v1alpha1.BackendConfig{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("backendconfigs"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/serviceextension_client.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/backendconfig_client.go similarity index 88% rename from pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/serviceextension_client.go rename to pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/backendconfig_client.go index 2a35f987c9..722a9a41c4 100644 --- a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/serviceextension_client.go +++ b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/backendconfig_client.go @@ -21,13 +21,13 @@ package v1alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/ingress-gce/pkg/apis/serviceextension/v1alpha1" - "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned/scheme" + v1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1" + "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned/scheme" ) type CloudV1alpha1Interface interface { RESTClient() rest.Interface - ServiceExtensionsGetter + BackendConfigsGetter } // CloudV1alpha1Client is used to interact with features provided by the cloud.google.com group. @@ -35,8 +35,8 @@ type CloudV1alpha1Client struct { restClient rest.Interface } -func (c *CloudV1alpha1Client) ServiceExtensions(namespace string) ServiceExtensionInterface { - return newServiceExtensions(c, namespace) +func (c *CloudV1alpha1Client) BackendConfigs(namespace string) BackendConfigInterface { + return newBackendConfigs(c, namespace) } // NewForConfig creates a new CloudV1alpha1Client for the given config. diff --git a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/doc.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/doc.go similarity index 100% rename from pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/doc.go rename to pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/doc.go diff --git a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/doc.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/doc.go similarity index 100% rename from pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/doc.go rename to pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/doc.go diff --git a/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/fake_backendconfig.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/fake_backendconfig.go new file mode 100644 index 0000000000..a1d046a8f8 --- /dev/null +++ b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/fake_backendconfig.go @@ -0,0 +1,128 @@ +/* +Copyright 2018 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + labels "k8s.io/apimachinery/pkg/labels" + schema "k8s.io/apimachinery/pkg/runtime/schema" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" + v1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1" +) + +// FakeBackendConfigs implements BackendConfigInterface +type FakeBackendConfigs struct { + Fake *FakeCloudV1alpha1 + ns string +} + +var backendconfigsResource = schema.GroupVersionResource{Group: "cloud.google.com", Version: "v1alpha1", Resource: "backendconfigs"} + +var backendconfigsKind = schema.GroupVersionKind{Group: "cloud.google.com", Version: "v1alpha1", Kind: "BackendConfig"} + +// Get takes name of the backendConfig, and returns the corresponding backendConfig object, and an error if there is any. +func (c *FakeBackendConfigs) Get(name string, options v1.GetOptions) (result *v1alpha1.BackendConfig, err error) { + obj, err := c.Fake. + Invokes(testing.NewGetAction(backendconfigsResource, c.ns, name), &v1alpha1.BackendConfig{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.BackendConfig), err +} + +// List takes label and field selectors, and returns the list of BackendConfigs that match those selectors. +func (c *FakeBackendConfigs) List(opts v1.ListOptions) (result *v1alpha1.BackendConfigList, err error) { + obj, err := c.Fake. + Invokes(testing.NewListAction(backendconfigsResource, backendconfigsKind, c.ns, opts), &v1alpha1.BackendConfigList{}) + + if obj == nil { + return nil, err + } + + label, _, _ := testing.ExtractFromListOptions(opts) + if label == nil { + label = labels.Everything() + } + list := &v1alpha1.BackendConfigList{} + for _, item := range obj.(*v1alpha1.BackendConfigList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested backendConfigs. +func (c *FakeBackendConfigs) Watch(opts v1.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(testing.NewWatchAction(backendconfigsResource, c.ns, opts)) + +} + +// Create takes the representation of a backendConfig and creates it. Returns the server's representation of the backendConfig, and an error, if there is any. +func (c *FakeBackendConfigs) Create(backendConfig *v1alpha1.BackendConfig) (result *v1alpha1.BackendConfig, err error) { + obj, err := c.Fake. + Invokes(testing.NewCreateAction(backendconfigsResource, c.ns, backendConfig), &v1alpha1.BackendConfig{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.BackendConfig), err +} + +// Update takes the representation of a backendConfig and updates it. Returns the server's representation of the backendConfig, and an error, if there is any. +func (c *FakeBackendConfigs) Update(backendConfig *v1alpha1.BackendConfig) (result *v1alpha1.BackendConfig, err error) { + obj, err := c.Fake. + Invokes(testing.NewUpdateAction(backendconfigsResource, c.ns, backendConfig), &v1alpha1.BackendConfig{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.BackendConfig), err +} + +// Delete takes name of the backendConfig and deletes it. Returns an error if one occurs. +func (c *FakeBackendConfigs) Delete(name string, options *v1.DeleteOptions) error { + _, err := c.Fake. + Invokes(testing.NewDeleteAction(backendconfigsResource, c.ns, name), &v1alpha1.BackendConfig{}) + + return err +} + +// DeleteCollection deletes a collection of objects. +func (c *FakeBackendConfigs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + action := testing.NewDeleteCollectionAction(backendconfigsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v1alpha1.BackendConfigList{}) + return err +} + +// Patch applies the patch and returns the patched backendConfig. +func (c *FakeBackendConfigs) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.BackendConfig, err error) { + obj, err := c.Fake. + Invokes(testing.NewPatchSubresourceAction(backendconfigsResource, c.ns, name, data, subresources...), &v1alpha1.BackendConfig{}) + + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.BackendConfig), err +} diff --git a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/fake_serviceextension_client.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/fake_backendconfig_client.go similarity index 79% rename from pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/fake_serviceextension_client.go rename to pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/fake_backendconfig_client.go index a0a7ec6a8e..8e76060886 100644 --- a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/fake_serviceextension_client.go +++ b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/fake/fake_backendconfig_client.go @@ -21,15 +21,15 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1" + v1alpha1 "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1" ) type FakeCloudV1alpha1 struct { *testing.Fake } -func (c *FakeCloudV1alpha1) ServiceExtensions(namespace string) v1alpha1.ServiceExtensionInterface { - return &FakeServiceExtensions{c, namespace} +func (c *FakeCloudV1alpha1) BackendConfigs(namespace string) v1alpha1.BackendConfigInterface { + return &FakeBackendConfigs{c, namespace} } // RESTClient returns a RESTClient that is used to communicate diff --git a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/generated_expansion.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/generated_expansion.go similarity index 93% rename from pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/generated_expansion.go rename to pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/generated_expansion.go index 1c40f729e7..8aa16ea633 100644 --- a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/generated_expansion.go +++ b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1alpha1/generated_expansion.go @@ -18,4 +18,4 @@ limitations under the License. package v1alpha1 -type ServiceExtensionExpansion interface{} +type BackendConfigExpansion interface{} diff --git a/pkg/serviceextension/client/informers/externalversions/serviceextension/interface.go b/pkg/backendconfig/client/informers/externalversions/backendconfig/interface.go similarity index 86% rename from pkg/serviceextension/client/informers/externalversions/serviceextension/interface.go rename to pkg/backendconfig/client/informers/externalversions/backendconfig/interface.go index d17456074d..00557447c8 100644 --- a/pkg/serviceextension/client/informers/externalversions/serviceextension/interface.go +++ b/pkg/backendconfig/client/informers/externalversions/backendconfig/interface.go @@ -19,8 +19,8 @@ limitations under the License. package cloud import ( - internalinterfaces "k8s.io/ingress-gce/pkg/serviceextension/client/informers/externalversions/internalinterfaces" - v1alpha1 "k8s.io/ingress-gce/pkg/serviceextension/client/informers/externalversions/serviceextension/v1alpha1" + v1alpha1 "k8s.io/ingress-gce/pkg/backendconfig/client/informers/externalversions/backendconfig/v1alpha1" + internalinterfaces "k8s.io/ingress-gce/pkg/backendconfig/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/backendconfig/client/informers/externalversions/backendconfig/v1alpha1/backendconfig.go b/pkg/backendconfig/client/informers/externalversions/backendconfig/v1alpha1/backendconfig.go new file mode 100644 index 0000000000..20358e67ff --- /dev/null +++ b/pkg/backendconfig/client/informers/externalversions/backendconfig/v1alpha1/backendconfig.go @@ -0,0 +1,89 @@ +/* +Copyright 2018 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by informer-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + time "time" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" + backendconfig_v1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1" + versioned "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned" + internalinterfaces "k8s.io/ingress-gce/pkg/backendconfig/client/informers/externalversions/internalinterfaces" + v1alpha1 "k8s.io/ingress-gce/pkg/backendconfig/client/listers/backendconfig/v1alpha1" +) + +// BackendConfigInformer provides access to a shared informer and lister for +// BackendConfigs. +type BackendConfigInformer interface { + Informer() cache.SharedIndexInformer + Lister() v1alpha1.BackendConfigLister +} + +type backendConfigInformer struct { + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string +} + +// NewBackendConfigInformer constructs a new informer for BackendConfig type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewBackendConfigInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredBackendConfigInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredBackendConfigInformer constructs a new informer for BackendConfig type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredBackendConfigInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { + return cache.NewSharedIndexInformer( + &cache.ListWatch{ + ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.CloudV1alpha1().BackendConfigs(namespace).List(options) + }, + WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.CloudV1alpha1().BackendConfigs(namespace).Watch(options) + }, + }, + &backendconfig_v1alpha1.BackendConfig{}, + resyncPeriod, + indexers, + ) +} + +func (f *backendConfigInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredBackendConfigInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) +} + +func (f *backendConfigInformer) Informer() cache.SharedIndexInformer { + return f.factory.InformerFor(&backendconfig_v1alpha1.BackendConfig{}, f.defaultInformer) +} + +func (f *backendConfigInformer) Lister() v1alpha1.BackendConfigLister { + return v1alpha1.NewBackendConfigLister(f.Informer().GetIndexer()) +} diff --git a/pkg/serviceextension/client/informers/externalversions/serviceextension/v1alpha1/interface.go b/pkg/backendconfig/client/informers/externalversions/backendconfig/v1alpha1/interface.go similarity index 72% rename from pkg/serviceextension/client/informers/externalversions/serviceextension/v1alpha1/interface.go rename to pkg/backendconfig/client/informers/externalversions/backendconfig/v1alpha1/interface.go index 425dac827c..743c4af0c7 100644 --- a/pkg/serviceextension/client/informers/externalversions/serviceextension/v1alpha1/interface.go +++ b/pkg/backendconfig/client/informers/externalversions/backendconfig/v1alpha1/interface.go @@ -19,13 +19,13 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "k8s.io/ingress-gce/pkg/serviceextension/client/informers/externalversions/internalinterfaces" + internalinterfaces "k8s.io/ingress-gce/pkg/backendconfig/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. type Interface interface { - // ServiceExtensions returns a ServiceExtensionInformer. - ServiceExtensions() ServiceExtensionInformer + // BackendConfigs returns a BackendConfigInformer. + BackendConfigs() BackendConfigInformer } type version struct { @@ -39,7 +39,7 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } -// ServiceExtensions returns a ServiceExtensionInformer. -func (v *version) ServiceExtensions() ServiceExtensionInformer { - return &serviceExtensionInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} +// BackendConfigs returns a BackendConfigInformer. +func (v *version) BackendConfigs() BackendConfigInformer { + return &backendConfigInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/serviceextension/client/informers/externalversions/factory.go b/pkg/backendconfig/client/informers/externalversions/factory.go similarity index 89% rename from pkg/serviceextension/client/informers/externalversions/factory.go rename to pkg/backendconfig/client/informers/externalversions/factory.go index 4e66afaa10..39e641c69d 100644 --- a/pkg/serviceextension/client/informers/externalversions/factory.go +++ b/pkg/backendconfig/client/informers/externalversions/factory.go @@ -27,9 +27,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned" - internalinterfaces "k8s.io/ingress-gce/pkg/serviceextension/client/informers/externalversions/internalinterfaces" - serviceextension "k8s.io/ingress-gce/pkg/serviceextension/client/informers/externalversions/serviceextension" + versioned "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned" + backendconfig "k8s.io/ingress-gce/pkg/backendconfig/client/informers/externalversions/backendconfig" + internalinterfaces "k8s.io/ingress-gce/pkg/backendconfig/client/informers/externalversions/internalinterfaces" ) type sharedInformerFactory struct { @@ -123,9 +123,9 @@ type SharedInformerFactory interface { ForResource(resource schema.GroupVersionResource) (GenericInformer, error) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - Cloud() serviceextension.Interface + Cloud() backendconfig.Interface } -func (f *sharedInformerFactory) Cloud() serviceextension.Interface { - return serviceextension.New(f, f.namespace, f.tweakListOptions) +func (f *sharedInformerFactory) Cloud() backendconfig.Interface { + return backendconfig.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/serviceextension/client/informers/externalversions/generic.go b/pkg/backendconfig/client/informers/externalversions/generic.go similarity index 90% rename from pkg/serviceextension/client/informers/externalversions/generic.go rename to pkg/backendconfig/client/informers/externalversions/generic.go index e4d74ca090..36cdf88d52 100644 --- a/pkg/serviceextension/client/informers/externalversions/generic.go +++ b/pkg/backendconfig/client/informers/externalversions/generic.go @@ -23,7 +23,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/ingress-gce/pkg/apis/serviceextension/v1alpha1" + v1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other @@ -53,8 +53,8 @@ func (f *genericInformer) Lister() cache.GenericLister { func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { // Group=cloud.google.com, Version=v1alpha1 - case v1alpha1.SchemeGroupVersion.WithResource("serviceextensions"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Cloud().V1alpha1().ServiceExtensions().Informer()}, nil + case v1alpha1.SchemeGroupVersion.WithResource("backendconfigs"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Cloud().V1alpha1().BackendConfigs().Informer()}, nil } diff --git a/pkg/serviceextension/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/backendconfig/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 93% rename from pkg/serviceextension/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/backendconfig/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 5db142c693..a1bd34182e 100644 --- a/pkg/serviceextension/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/backendconfig/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned" + versioned "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned" ) type NewInformerFunc func(versioned.Interface, time.Duration) cache.SharedIndexInformer diff --git a/pkg/backendconfig/client/listers/backendconfig/v1alpha1/backendconfig.go b/pkg/backendconfig/client/listers/backendconfig/v1alpha1/backendconfig.go new file mode 100644 index 0000000000..fd6588a244 --- /dev/null +++ b/pkg/backendconfig/client/listers/backendconfig/v1alpha1/backendconfig.go @@ -0,0 +1,94 @@ +/* +Copyright 2018 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by lister-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/tools/cache" + v1alpha1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1alpha1" +) + +// BackendConfigLister helps list BackendConfigs. +type BackendConfigLister interface { + // List lists all BackendConfigs in the indexer. + List(selector labels.Selector) (ret []*v1alpha1.BackendConfig, err error) + // BackendConfigs returns an object that can list and get BackendConfigs. + BackendConfigs(namespace string) BackendConfigNamespaceLister + BackendConfigListerExpansion +} + +// backendConfigLister implements the BackendConfigLister interface. +type backendConfigLister struct { + indexer cache.Indexer +} + +// NewBackendConfigLister returns a new BackendConfigLister. +func NewBackendConfigLister(indexer cache.Indexer) BackendConfigLister { + return &backendConfigLister{indexer: indexer} +} + +// List lists all BackendConfigs in the indexer. +func (s *backendConfigLister) List(selector labels.Selector) (ret []*v1alpha1.BackendConfig, err error) { + err = cache.ListAll(s.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1alpha1.BackendConfig)) + }) + return ret, err +} + +// BackendConfigs returns an object that can list and get BackendConfigs. +func (s *backendConfigLister) BackendConfigs(namespace string) BackendConfigNamespaceLister { + return backendConfigNamespaceLister{indexer: s.indexer, namespace: namespace} +} + +// BackendConfigNamespaceLister helps list and get BackendConfigs. +type BackendConfigNamespaceLister interface { + // List lists all BackendConfigs in the indexer for a given namespace. + List(selector labels.Selector) (ret []*v1alpha1.BackendConfig, err error) + // Get retrieves the BackendConfig from the indexer for a given namespace and name. + Get(name string) (*v1alpha1.BackendConfig, error) + BackendConfigNamespaceListerExpansion +} + +// backendConfigNamespaceLister implements the BackendConfigNamespaceLister +// interface. +type backendConfigNamespaceLister struct { + indexer cache.Indexer + namespace string +} + +// List lists all BackendConfigs in the indexer for a given namespace. +func (s backendConfigNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.BackendConfig, err error) { + err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1alpha1.BackendConfig)) + }) + return ret, err +} + +// Get retrieves the BackendConfig from the indexer for a given namespace and name. +func (s backendConfigNamespaceLister) Get(name string) (*v1alpha1.BackendConfig, error) { + obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(v1alpha1.Resource("backendconfig"), name) + } + return obj.(*v1alpha1.BackendConfig), nil +} diff --git a/pkg/serviceextension/client/listers/serviceextension/v1alpha1/expansion_generated.go b/pkg/backendconfig/client/listers/backendconfig/v1alpha1/expansion_generated.go similarity index 66% rename from pkg/serviceextension/client/listers/serviceextension/v1alpha1/expansion_generated.go rename to pkg/backendconfig/client/listers/backendconfig/v1alpha1/expansion_generated.go index 43bc8c91d8..a20190a2a3 100644 --- a/pkg/serviceextension/client/listers/serviceextension/v1alpha1/expansion_generated.go +++ b/pkg/backendconfig/client/listers/backendconfig/v1alpha1/expansion_generated.go @@ -18,10 +18,10 @@ limitations under the License. package v1alpha1 -// ServiceExtensionListerExpansion allows custom methods to be added to -// ServiceExtensionLister. -type ServiceExtensionListerExpansion interface{} +// BackendConfigListerExpansion allows custom methods to be added to +// BackendConfigLister. +type BackendConfigListerExpansion interface{} -// ServiceExtensionNamespaceListerExpansion allows custom methods to be added to -// ServiceExtensionNamespaceLister. -type ServiceExtensionNamespaceListerExpansion interface{} +// BackendConfigNamespaceListerExpansion allows custom methods to be added to +// BackendConfigNamespaceLister. +type BackendConfigNamespaceListerExpansion interface{} diff --git a/pkg/serviceextension/crd.go b/pkg/backendconfig/crd.go similarity index 74% rename from pkg/serviceextension/crd.go rename to pkg/backendconfig/crd.go index 01c2011ea0..ffebeba9e4 100644 --- a/pkg/serviceextension/crd.go +++ b/pkg/backendconfig/crd.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package serviceextension +package backendconfig import ( "fmt" @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - apisserviceextension "k8s.io/ingress-gce/pkg/apis/serviceextension" + apisbackendconfig "k8s.io/ingress-gce/pkg/apis/backendconfig" ) const ( @@ -40,22 +40,22 @@ const ( func getCRDSpec() *apiextensionsv1beta1.CustomResourceDefinition { return &apiextensionsv1beta1.CustomResourceDefinition{ - ObjectMeta: metav1.ObjectMeta{Name: "serviceextensions" + "." + apisserviceextension.GroupName}, + ObjectMeta: metav1.ObjectMeta{Name: "backendconfigs" + "." + apisbackendconfig.GroupName}, Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{ - Group: apisserviceextension.GroupName, + Group: apisbackendconfig.GroupName, Version: "v1alpha1", Scope: apiextensionsv1beta1.NamespaceScoped, Names: apiextensionsv1beta1.CustomResourceDefinitionNames{ - Kind: "ServiceExtension", - ListKind: "ServiceExtensionList", - Plural: "serviceextensions", - Singular: "serviceextension", + Kind: "BackendConfig", + ListKind: "BackendConfigList", + Plural: "backendconfigs", + Singular: "backendconfig", }, }, } } -// EnsureCRD ensures the ServiceExtension CRD resource for cluster. +// EnsureCRD ensures the BackendConfig CRD resource for cluster. func EnsureCRD(clientset crdclient.Interface) (*apiextensionsv1beta1.CustomResourceDefinition, error) { crd, err := createOrUpdateCRD(clientset) if err != nil { @@ -63,7 +63,7 @@ func EnsureCRD(clientset crdclient.Interface) (*apiextensionsv1beta1.CustomResou } // After CRD creation, it might take a few seconds for the RESTful API endpoint - // to be created. Keeps watching the Established condition of ServiceExtension + // to be created. Keeps watching the Established condition of BackendConfig // CRD to be true. if err := wait.PollImmediate(checkCRDEstablishedInterval, checkCRDEstablishedTimeout, func() (bool, error) { crd, err = clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{}) @@ -78,10 +78,10 @@ func EnsureCRD(clientset crdclient.Interface) (*apiextensionsv1beta1.CustomResou } return false, nil }); err != nil { - return nil, fmt.Errorf("timed out waiting for ServiceExtension CRD to become Established: %v", err) + return nil, fmt.Errorf("timed out waiting for BackendConfig CRD to become Established: %v", err) } - glog.V(0).Infof("ServiceExtension CRD is Established.") + glog.V(0).Infof("BackendConfig CRD is Established.") return crd, nil } @@ -89,16 +89,16 @@ func createOrUpdateCRD(clientset crdclient.Interface) (*apiextensionsv1beta1.Cus crd := getCRDSpec() existingCRD, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{}) if err != nil && !apierrors.IsNotFound(err) { - return nil, fmt.Errorf("failed to verify the existence of ServiceExtension CRD: %v", err) + return nil, fmt.Errorf("failed to verify the existence of BackendConfig CRD: %v", err) } - // Update ServieExtension CRD if already present. + // Update BackendConfig CRD if already present. if err == nil { - glog.V(0).Infof("Updating existing ServiceExtension CRD...") + glog.V(0).Infof("Updating existing BackendConfig CRD...") crd.ResourceVersion = existingCRD.ResourceVersion return clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Update(crd) } - glog.V(0).Infof("Creating ServiceExtension CRD...") + glog.V(0).Infof("Creating BackendConfig CRD...") return clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd) } diff --git a/pkg/serviceextension/crd_test.go b/pkg/backendconfig/crd_test.go similarity index 98% rename from pkg/serviceextension/crd_test.go rename to pkg/backendconfig/crd_test.go index adf1faa4c9..e72234a35c 100644 --- a/pkg/serviceextension/crd_test.go +++ b/pkg/backendconfig/crd_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package serviceextension +package backendconfig import ( "reflect" diff --git a/pkg/flags/flags.go b/pkg/flags/flags.go index a52c7711f2..88701235ac 100644 --- a/pkg/flags/flags.go +++ b/pkg/flags/flags.go @@ -38,24 +38,24 @@ const ( var ( // F are global flags for the controller. F = struct { - APIServerHost string - ClusterName string - ConfigFilePath string - DefaultSvc string - DeleteAllOnQuit bool - GCERateLimit RateLimitSpecs - HealthCheckPath string - HealthzPort int - Features *Features - InCluster bool - IngressClass string - KubeConfigFile string - ResyncPeriod time.Duration - Verbose bool - Version bool - WatchNamespace string - NodePortRanges PortRanges - EnableServiceExtension bool + APIServerHost string + ClusterName string + ConfigFilePath string + DefaultSvc string + DeleteAllOnQuit bool + GCERateLimit RateLimitSpecs + HealthCheckPath string + HealthzPort int + Features *Features + InCluster bool + IngressClass string + KubeConfigFile string + ResyncPeriod time.Duration + Verbose bool + Version bool + WatchNamespace string + NodePortRanges PortRanges + EnableBackendConfig bool }{} ) @@ -135,8 +135,8 @@ the pod secrets for creating a Kubernetes client.`) `If set, overrides what ingress classes are managed by the controller.`) flag.Var(&F.NodePortRanges, "node-port-ranges", `Node port/port-ranges whitelisted for the L7 load balancing. CSV values accepted. Example: -node-port-ranges=80,8080,400-500`) - flag.BoolVar(&F.EnableServiceExtension, "enable-service-extension", false, - `Optional, whether or not to enable ServiceExtension.`) + flag.BoolVar(&F.EnableBackendConfig, "enable-backend-config", false, + `Optional, whether or not to enable BackendConfig.`) // Deprecated F. flag.BoolVar(&F.Verbose, "verbose", false, diff --git a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/fake_serviceextension.go b/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/fake_serviceextension.go deleted file mode 100644 index 6d2f4331f5..0000000000 --- a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/fake/fake_serviceextension.go +++ /dev/null @@ -1,128 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/ingress-gce/pkg/apis/serviceextension/v1alpha1" -) - -// FakeServiceExtensions implements ServiceExtensionInterface -type FakeServiceExtensions struct { - Fake *FakeCloudV1alpha1 - ns string -} - -var serviceextensionsResource = schema.GroupVersionResource{Group: "cloud.google.com", Version: "v1alpha1", Resource: "serviceextensions"} - -var serviceextensionsKind = schema.GroupVersionKind{Group: "cloud.google.com", Version: "v1alpha1", Kind: "ServiceExtension"} - -// Get takes name of the serviceExtension, and returns the corresponding serviceExtension object, and an error if there is any. -func (c *FakeServiceExtensions) Get(name string, options v1.GetOptions) (result *v1alpha1.ServiceExtension, err error) { - obj, err := c.Fake. - Invokes(testing.NewGetAction(serviceextensionsResource, c.ns, name), &v1alpha1.ServiceExtension{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ServiceExtension), err -} - -// List takes label and field selectors, and returns the list of ServiceExtensions that match those selectors. -func (c *FakeServiceExtensions) List(opts v1.ListOptions) (result *v1alpha1.ServiceExtensionList, err error) { - obj, err := c.Fake. - Invokes(testing.NewListAction(serviceextensionsResource, serviceextensionsKind, c.ns, opts), &v1alpha1.ServiceExtensionList{}) - - if obj == nil { - return nil, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.ServiceExtensionList{} - for _, item := range obj.(*v1alpha1.ServiceExtensionList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested serviceExtensions. -func (c *FakeServiceExtensions) Watch(opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchAction(serviceextensionsResource, c.ns, opts)) - -} - -// Create takes the representation of a serviceExtension and creates it. Returns the server's representation of the serviceExtension, and an error, if there is any. -func (c *FakeServiceExtensions) Create(serviceExtension *v1alpha1.ServiceExtension) (result *v1alpha1.ServiceExtension, err error) { - obj, err := c.Fake. - Invokes(testing.NewCreateAction(serviceextensionsResource, c.ns, serviceExtension), &v1alpha1.ServiceExtension{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ServiceExtension), err -} - -// Update takes the representation of a serviceExtension and updates it. Returns the server's representation of the serviceExtension, and an error, if there is any. -func (c *FakeServiceExtensions) Update(serviceExtension *v1alpha1.ServiceExtension) (result *v1alpha1.ServiceExtension, err error) { - obj, err := c.Fake. - Invokes(testing.NewUpdateAction(serviceextensionsResource, c.ns, serviceExtension), &v1alpha1.ServiceExtension{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ServiceExtension), err -} - -// Delete takes name of the serviceExtension and deletes it. Returns an error if one occurs. -func (c *FakeServiceExtensions) Delete(name string, options *v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteAction(serviceextensionsResource, c.ns, name), &v1alpha1.ServiceExtension{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeServiceExtensions) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := testing.NewDeleteCollectionAction(serviceextensionsResource, c.ns, listOptions) - - _, err := c.Fake.Invokes(action, &v1alpha1.ServiceExtensionList{}) - return err -} - -// Patch applies the patch and returns the patched serviceExtension. -func (c *FakeServiceExtensions) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ServiceExtension, err error) { - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(serviceextensionsResource, c.ns, name, data, subresources...), &v1alpha1.ServiceExtension{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ServiceExtension), err -} diff --git a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/serviceextension.go b/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/serviceextension.go deleted file mode 100644 index 19fd99112b..0000000000 --- a/pkg/serviceextension/client/clientset/versioned/typed/serviceextension/v1alpha1/serviceextension.go +++ /dev/null @@ -1,157 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/ingress-gce/pkg/apis/serviceextension/v1alpha1" - scheme "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned/scheme" -) - -// ServiceExtensionsGetter has a method to return a ServiceExtensionInterface. -// A group's client should implement this interface. -type ServiceExtensionsGetter interface { - ServiceExtensions(namespace string) ServiceExtensionInterface -} - -// ServiceExtensionInterface has methods to work with ServiceExtension resources. -type ServiceExtensionInterface interface { - Create(*v1alpha1.ServiceExtension) (*v1alpha1.ServiceExtension, error) - Update(*v1alpha1.ServiceExtension) (*v1alpha1.ServiceExtension, error) - Delete(name string, options *v1.DeleteOptions) error - DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error - Get(name string, options v1.GetOptions) (*v1alpha1.ServiceExtension, error) - List(opts v1.ListOptions) (*v1alpha1.ServiceExtensionList, error) - Watch(opts v1.ListOptions) (watch.Interface, error) - Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ServiceExtension, err error) - ServiceExtensionExpansion -} - -// serviceExtensions implements ServiceExtensionInterface -type serviceExtensions struct { - client rest.Interface - ns string -} - -// newServiceExtensions returns a ServiceExtensions -func newServiceExtensions(c *CloudV1alpha1Client, namespace string) *serviceExtensions { - return &serviceExtensions{ - client: c.RESTClient(), - ns: namespace, - } -} - -// Get takes name of the serviceExtension, and returns the corresponding serviceExtension object, and an error if there is any. -func (c *serviceExtensions) Get(name string, options v1.GetOptions) (result *v1alpha1.ServiceExtension, err error) { - result = &v1alpha1.ServiceExtension{} - err = c.client.Get(). - Namespace(c.ns). - Resource("serviceextensions"). - Name(name). - VersionedParams(&options, scheme.ParameterCodec). - Do(). - Into(result) - return -} - -// List takes label and field selectors, and returns the list of ServiceExtensions that match those selectors. -func (c *serviceExtensions) List(opts v1.ListOptions) (result *v1alpha1.ServiceExtensionList, err error) { - result = &v1alpha1.ServiceExtensionList{} - err = c.client.Get(). - Namespace(c.ns). - Resource("serviceextensions"). - VersionedParams(&opts, scheme.ParameterCodec). - Do(). - Into(result) - return -} - -// Watch returns a watch.Interface that watches the requested serviceExtensions. -func (c *serviceExtensions) Watch(opts v1.ListOptions) (watch.Interface, error) { - opts.Watch = true - return c.client.Get(). - Namespace(c.ns). - Resource("serviceextensions"). - VersionedParams(&opts, scheme.ParameterCodec). - Watch() -} - -// Create takes the representation of a serviceExtension and creates it. Returns the server's representation of the serviceExtension, and an error, if there is any. -func (c *serviceExtensions) Create(serviceExtension *v1alpha1.ServiceExtension) (result *v1alpha1.ServiceExtension, err error) { - result = &v1alpha1.ServiceExtension{} - err = c.client.Post(). - Namespace(c.ns). - Resource("serviceextensions"). - Body(serviceExtension). - Do(). - Into(result) - return -} - -// Update takes the representation of a serviceExtension and updates it. Returns the server's representation of the serviceExtension, and an error, if there is any. -func (c *serviceExtensions) Update(serviceExtension *v1alpha1.ServiceExtension) (result *v1alpha1.ServiceExtension, err error) { - result = &v1alpha1.ServiceExtension{} - err = c.client.Put(). - Namespace(c.ns). - Resource("serviceextensions"). - Name(serviceExtension.Name). - Body(serviceExtension). - Do(). - Into(result) - return -} - -// Delete takes name of the serviceExtension and deletes it. Returns an error if one occurs. -func (c *serviceExtensions) Delete(name string, options *v1.DeleteOptions) error { - return c.client.Delete(). - Namespace(c.ns). - Resource("serviceextensions"). - Name(name). - Body(options). - Do(). - Error() -} - -// DeleteCollection deletes a collection of objects. -func (c *serviceExtensions) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - return c.client.Delete(). - Namespace(c.ns). - Resource("serviceextensions"). - VersionedParams(&listOptions, scheme.ParameterCodec). - Body(options). - Do(). - Error() -} - -// Patch applies the patch and returns the patched serviceExtension. -func (c *serviceExtensions) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.ServiceExtension, err error) { - result = &v1alpha1.ServiceExtension{} - err = c.client.Patch(pt). - Namespace(c.ns). - Resource("serviceextensions"). - SubResource(subresources...). - Name(name). - Body(data). - Do(). - Into(result) - return -} diff --git a/pkg/serviceextension/client/informers/externalversions/serviceextension/v1alpha1/serviceextension.go b/pkg/serviceextension/client/informers/externalversions/serviceextension/v1alpha1/serviceextension.go deleted file mode 100644 index 7d1f27becb..0000000000 --- a/pkg/serviceextension/client/informers/externalversions/serviceextension/v1alpha1/serviceextension.go +++ /dev/null @@ -1,89 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - time "time" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - serviceextension_v1alpha1 "k8s.io/ingress-gce/pkg/apis/serviceextension/v1alpha1" - versioned "k8s.io/ingress-gce/pkg/serviceextension/client/clientset/versioned" - internalinterfaces "k8s.io/ingress-gce/pkg/serviceextension/client/informers/externalversions/internalinterfaces" - v1alpha1 "k8s.io/ingress-gce/pkg/serviceextension/client/listers/serviceextension/v1alpha1" -) - -// ServiceExtensionInformer provides access to a shared informer and lister for -// ServiceExtensions. -type ServiceExtensionInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1alpha1.ServiceExtensionLister -} - -type serviceExtensionInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc - namespace string -} - -// NewServiceExtensionInformer constructs a new informer for ServiceExtension type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewServiceExtensionInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredServiceExtensionInformer(client, namespace, resyncPeriod, indexers, nil) -} - -// NewFilteredServiceExtensionInformer constructs a new informer for ServiceExtension type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredServiceExtensionInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.CloudV1alpha1().ServiceExtensions(namespace).List(options) - }, - WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.CloudV1alpha1().ServiceExtensions(namespace).Watch(options) - }, - }, - &serviceextension_v1alpha1.ServiceExtension{}, - resyncPeriod, - indexers, - ) -} - -func (f *serviceExtensionInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredServiceExtensionInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *serviceExtensionInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&serviceextension_v1alpha1.ServiceExtension{}, f.defaultInformer) -} - -func (f *serviceExtensionInformer) Lister() v1alpha1.ServiceExtensionLister { - return v1alpha1.NewServiceExtensionLister(f.Informer().GetIndexer()) -} diff --git a/pkg/serviceextension/client/listers/serviceextension/v1alpha1/serviceextension.go b/pkg/serviceextension/client/listers/serviceextension/v1alpha1/serviceextension.go deleted file mode 100644 index 23c67a98ad..0000000000 --- a/pkg/serviceextension/client/listers/serviceextension/v1alpha1/serviceextension.go +++ /dev/null @@ -1,94 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/ingress-gce/pkg/apis/serviceextension/v1alpha1" -) - -// ServiceExtensionLister helps list ServiceExtensions. -type ServiceExtensionLister interface { - // List lists all ServiceExtensions in the indexer. - List(selector labels.Selector) (ret []*v1alpha1.ServiceExtension, err error) - // ServiceExtensions returns an object that can list and get ServiceExtensions. - ServiceExtensions(namespace string) ServiceExtensionNamespaceLister - ServiceExtensionListerExpansion -} - -// serviceExtensionLister implements the ServiceExtensionLister interface. -type serviceExtensionLister struct { - indexer cache.Indexer -} - -// NewServiceExtensionLister returns a new ServiceExtensionLister. -func NewServiceExtensionLister(indexer cache.Indexer) ServiceExtensionLister { - return &serviceExtensionLister{indexer: indexer} -} - -// List lists all ServiceExtensions in the indexer. -func (s *serviceExtensionLister) List(selector labels.Selector) (ret []*v1alpha1.ServiceExtension, err error) { - err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.ServiceExtension)) - }) - return ret, err -} - -// ServiceExtensions returns an object that can list and get ServiceExtensions. -func (s *serviceExtensionLister) ServiceExtensions(namespace string) ServiceExtensionNamespaceLister { - return serviceExtensionNamespaceLister{indexer: s.indexer, namespace: namespace} -} - -// ServiceExtensionNamespaceLister helps list and get ServiceExtensions. -type ServiceExtensionNamespaceLister interface { - // List lists all ServiceExtensions in the indexer for a given namespace. - List(selector labels.Selector) (ret []*v1alpha1.ServiceExtension, err error) - // Get retrieves the ServiceExtension from the indexer for a given namespace and name. - Get(name string) (*v1alpha1.ServiceExtension, error) - ServiceExtensionNamespaceListerExpansion -} - -// serviceExtensionNamespaceLister implements the ServiceExtensionNamespaceLister -// interface. -type serviceExtensionNamespaceLister struct { - indexer cache.Indexer - namespace string -} - -// List lists all ServiceExtensions in the indexer for a given namespace. -func (s serviceExtensionNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.ServiceExtension, err error) { - err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.ServiceExtension)) - }) - return ret, err -} - -// Get retrieves the ServiceExtension from the indexer for a given namespace and name. -func (s serviceExtensionNamespaceLister) Get(name string) (*v1alpha1.ServiceExtension, error) { - obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(v1alpha1.Resource("serviceextension"), name) - } - return obj.(*v1alpha1.ServiceExtension), nil -}