diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7bd180c4cc..bc2eca7f66 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -54,7 +54,7 @@ updates: # Dependencies listed in requirements.txt - package-ecosystem: "pip" - directory: "/" + directory: "/hack/mkdocs/image" schedule: interval: "weekly" labels: diff --git a/.gitignore b/.gitignore index 79a29af671..e85170b480 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ go.work.sum /cache .venv/ release/ +site-src/reference/spec.md diff --git a/Makefile b/Makefile index 4bde1cc5e5..e03c9b963b 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ test.crds-validation: .PHONY: conformance conformance: go test ${GO_TEST_FLAGS} -v ./conformance -run TestConformance -args ${CONFORMANCE_FLAGS} - + # Install CRD's and example resources to a preexisting cluster. .PHONY: install install: crd example @@ -159,14 +159,28 @@ image.multiarch.setup: image.buildx.verify release-staging: image.multiarch.setup hack/build-and-push.sh -# Generate a virtualenv install, which is useful for hacking on the -# docs since it installs mkdocs and all the right dependencies. -# -# On Ubuntu, this requires the python3-venv package. -virtualenv: .venv -.venv: requirements.txt - @echo Creating a virtualenv in $@"... " - @python3 -m venv $@ || (rm -rf $@ && exit 1) - @echo Installing packages in $@"... " - @$@/bin/python3 -m pip install -q -r requirements.txt || (rm -rf $@ && exit 1) - @echo To enter the virtualenv type \"source $@/bin/activate\", to exit type \"deactivate\" +# Docs + +.PHONY: build-docs +build-docs: + docker build --pull -t gaie/mkdocs hack/mkdocs/image + docker run --rm -v ${PWD}:/docs gaie/mkdocs build + +.PHONY: build-docs-netlify +build-docs-netlify: + hack/mkdocs/generate.sh + pip install -r hack/mkdocs/image/requirements.txt + python -m mkdocs build + +.PHONY: live-docs +live-docs: + docker build -t gw/mkdocs hack/mkdocs/image + docker run --rm -it -p 3000:3000 -v ${PWD}:/docs gw/mkdocs + +.PHONY: api-ref-docs +api-ref-docs: + crd-ref-docs \ + --source-path=${PWD}/apis \ + --config=crd-ref-docs.yaml \ + --renderer=markdown \ + --output-path=${PWD}/site-src/reference/spec.md diff --git a/apis/v1/zz_generated.register.go b/apis/v1/zz_generated.register.go index 9c8db216af..6eedba7bb7 100644 --- a/apis/v1/zz_generated.register.go +++ b/apis/v1/zz_generated.register.go @@ -22,7 +22,7 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -31,7 +31,7 @@ import ( const GroupName = "gateway.networking.k8s.io" // GroupVersion specifies the group and the version used to register the objects. -var GroupVersion = v1.GroupVersion{Group: GroupName, Version: "v1"} +var GroupVersion = metav1.GroupVersion{Group: GroupName, Version: "v1"} // SchemeGroupVersion is group version used to register these objects // Deprecated: use GroupVersion instead. @@ -71,6 +71,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &HTTPRouteList{}, ) // AddToGroupVersion allows the serialization of client types like ListOptions. - v1.AddToGroupVersion(scheme, SchemeGroupVersion) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/apis/v1alpha2/zz_generated.deepcopy.go b/apis/v1alpha2/zz_generated.deepcopy.go index 17723bb810..8b09c2d70d 100644 --- a/apis/v1alpha2/zz_generated.deepcopy.go +++ b/apis/v1alpha2/zz_generated.deepcopy.go @@ -21,9 +21,8 @@ limitations under the License. package v1alpha2 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/gateway-api/apis/v1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -103,10 +102,10 @@ func (in *LocalPolicyTargetReference) DeepCopy() *LocalPolicyTargetReference { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LocalPolicyTargetReferenceWithSectionName) DeepCopyInto(out *LocalPolicyTargetReferenceWithSectionName) { *out = *in - out.LocalPolicyTargetReference = in.LocalPolicyTargetReference + in.LocalPolicyTargetReference.DeepCopyInto(&out.LocalPolicyTargetReference) if in.SectionName != nil { in, out := &in.SectionName, &out.SectionName - *out = new(v1.SectionName) + *out = new(SectionName) **out = **in } } @@ -126,7 +125,7 @@ func (in *NamespacedPolicyTargetReference) DeepCopyInto(out *NamespacedPolicyTar *out = *in if in.Namespace != nil { in, out := &in.Namespace, &out.Namespace - *out = new(v1.Namespace) + *out = new(Namespace) **out = **in } } @@ -147,7 +146,7 @@ func (in *PolicyAncestorStatus) DeepCopyInto(out *PolicyAncestorStatus) { in.AncestorRef.DeepCopyInto(&out.AncestorRef) if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make([]metav1.Condition, len(*in)) + *out = make([]v1.Condition, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -308,12 +307,12 @@ func (in *TCPRouteRule) DeepCopyInto(out *TCPRouteRule) { *out = *in if in.Name != nil { in, out := &in.Name, &out.Name - *out = new(v1.SectionName) + *out = new(SectionName) **out = **in } if in.BackendRefs != nil { in, out := &in.BackendRefs, &out.BackendRefs - *out = make([]v1.BackendRef, len(*in)) + *out = make([]BackendRef, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -433,12 +432,12 @@ func (in *TLSRouteRule) DeepCopyInto(out *TLSRouteRule) { *out = *in if in.Name != nil { in, out := &in.Name, &out.Name - *out = new(v1.SectionName) + *out = new(SectionName) **out = **in } if in.BackendRefs != nil { in, out := &in.BackendRefs, &out.BackendRefs - *out = make([]v1.BackendRef, len(*in)) + *out = make([]BackendRef, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -461,7 +460,7 @@ func (in *TLSRouteSpec) DeepCopyInto(out *TLSRouteSpec) { in.CommonRouteSpec.DeepCopyInto(&out.CommonRouteSpec) if in.Hostnames != nil { in, out := &in.Hostnames, &out.Hostnames - *out = make([]v1.Hostname, len(*in)) + *out = make([]Hostname, len(*in)) copy(*out, *in) } if in.Rules != nil { @@ -563,12 +562,12 @@ func (in *UDPRouteRule) DeepCopyInto(out *UDPRouteRule) { *out = *in if in.Name != nil { in, out := &in.Name, &out.Name - *out = new(v1.SectionName) + *out = new(SectionName) **out = **in } if in.BackendRefs != nil { in, out := &in.BackendRefs, &out.BackendRefs - *out = make([]v1.BackendRef, len(*in)) + *out = make([]BackendRef, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go index 5f266543bd..0b298456e2 100644 --- a/apis/v1beta1/zz_generated.deepcopy.go +++ b/apis/v1beta1/zz_generated.deepcopy.go @@ -22,7 +22,6 @@ package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/gateway-api/apis/v1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -281,7 +280,9 @@ func (in *ReferenceGrantSpec) DeepCopyInto(out *ReferenceGrantSpec) { if in.From != nil { in, out := &in.From, &out.From *out = make([]ReferenceGrantFrom, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } if in.To != nil { in, out := &in.To, &out.To @@ -307,7 +308,7 @@ func (in *ReferenceGrantTo) DeepCopyInto(out *ReferenceGrantTo) { *out = *in if in.Name != nil { in, out := &in.Name, &out.Name - *out = new(v1.ObjectName) + *out = new(ObjectName) **out = **in } } diff --git a/apisx/v1alpha1/zz_generated.deepcopy.go b/apisx/v1alpha1/zz_generated.deepcopy.go index 0f201b5027..bd5348692d 100644 --- a/apisx/v1alpha1/zz_generated.deepcopy.go +++ b/apisx/v1alpha1/zz_generated.deepcopy.go @@ -21,10 +21,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/gateway-api/apis/v1" - "sigs.k8s.io/gateway-api/apis/v1alpha2" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -32,8 +30,10 @@ func (in *BackendTrafficPolicySpec) DeepCopyInto(out *BackendTrafficPolicySpec) *out = *in if in.TargetRefs != nil { in, out := &in.TargetRefs, &out.TargetRefs - *out = make([]v1alpha2.LocalPolicyTargetReference, len(*in)) - copy(*out, *in) + *out = make([]LocalPolicyTargetReference, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } if in.RetryConstraint != nil { in, out := &in.RetryConstraint, &out.RetryConstraint @@ -42,7 +42,7 @@ func (in *BackendTrafficPolicySpec) DeepCopyInto(out *BackendTrafficPolicySpec) } if in.SessionPersistence != nil { in, out := &in.SessionPersistence, &out.SessionPersistence - *out = new(v1.SessionPersistence) + *out = new(SessionPersistence) (*in).DeepCopyInto(*out) } } @@ -67,7 +67,7 @@ func (in *BudgetDetails) DeepCopyInto(out *BudgetDetails) { } if in.Interval != nil { in, out := &in.Interval, &out.Interval - *out = new(v1.Duration) + *out = new(Duration) **out = **in } } @@ -87,17 +87,17 @@ func (in *ListenerEntry) DeepCopyInto(out *ListenerEntry) { *out = *in if in.Hostname != nil { in, out := &in.Hostname, &out.Hostname - *out = new(v1.Hostname) + *out = new(Hostname) **out = **in } if in.TLS != nil { in, out := &in.TLS, &out.TLS - *out = new(v1.GatewayTLSConfig) + *out = new(GatewayTLSConfig) (*in).DeepCopyInto(*out) } if in.AllowedRoutes != nil { in, out := &in.AllowedRoutes, &out.AllowedRoutes - *out = new(v1.AllowedRoutes) + *out = new(AllowedRoutes) (*in).DeepCopyInto(*out) } } @@ -117,14 +117,14 @@ func (in *ListenerEntryStatus) DeepCopyInto(out *ListenerEntryStatus) { *out = *in if in.SupportedKinds != nil { in, out := &in.SupportedKinds, &out.SupportedKinds - *out = make([]v1.RouteGroupKind, len(*in)) + *out = make([]RouteGroupKind, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make([]metav1.Condition, len(*in)) + *out = make([]v1.Condition, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -169,7 +169,7 @@ func (in *ListenerSetStatus) DeepCopyInto(out *ListenerSetStatus) { *out = *in if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make([]metav1.Condition, len(*in)) + *out = make([]v1.Condition, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -198,17 +198,17 @@ func (in *ParentGatewayReference) DeepCopyInto(out *ParentGatewayReference) { *out = *in if in.Group != nil { in, out := &in.Group, &out.Group - *out = new(v1.Group) + *out = new(Group) **out = **in } if in.Kind != nil { in, out := &in.Kind, &out.Kind - *out = new(v1.Kind) + *out = new(Kind) **out = **in } if in.Namespace != nil { in, out := &in.Namespace, &out.Namespace - *out = new(v1.Namespace) + *out = new(Namespace) **out = **in } } @@ -233,7 +233,7 @@ func (in *RequestRate) DeepCopyInto(out *RequestRate) { } if in.Interval != nil { in, out := &in.Interval, &out.Interval - *out = new(v1.Duration) + *out = new(Duration) **out = **in } } diff --git a/applyconfiguration/apis/v1/backendobjectreference.go b/applyconfiguration/apis/v1/backendobjectreference.go index a8d9c663de..58337304af 100644 --- a/applyconfiguration/apis/v1/backendobjectreference.go +++ b/applyconfiguration/apis/v1/backendobjectreference.go @@ -19,17 +19,17 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // BackendObjectReferenceApplyConfiguration represents a declarative configuration of the BackendObjectReference type for use // with apply. type BackendObjectReferenceApplyConfiguration struct { - Group *v1.Group `json:"group,omitempty"` - Kind *v1.Kind `json:"kind,omitempty"` - Name *v1.ObjectName `json:"name,omitempty"` - Namespace *v1.Namespace `json:"namespace,omitempty"` - Port *v1.PortNumber `json:"port,omitempty"` + Group *apisv1.Group `json:"group,omitempty"` + Kind *apisv1.Kind `json:"kind,omitempty"` + Name *apisv1.ObjectName `json:"name,omitempty"` + Namespace *apisv1.Namespace `json:"namespace,omitempty"` + Port *apisv1.PortNumber `json:"port,omitempty"` } // BackendObjectReferenceApplyConfiguration constructs a declarative configuration of the BackendObjectReference type for use with @@ -41,7 +41,7 @@ func BackendObjectReference() *BackendObjectReferenceApplyConfiguration { // WithGroup sets the Group field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. -func (b *BackendObjectReferenceApplyConfiguration) WithGroup(value v1.Group) *BackendObjectReferenceApplyConfiguration { +func (b *BackendObjectReferenceApplyConfiguration) WithGroup(value apisv1.Group) *BackendObjectReferenceApplyConfiguration { b.Group = &value return b } @@ -49,7 +49,7 @@ func (b *BackendObjectReferenceApplyConfiguration) WithGroup(value v1.Group) *Ba // WithKind sets the Kind field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. -func (b *BackendObjectReferenceApplyConfiguration) WithKind(value v1.Kind) *BackendObjectReferenceApplyConfiguration { +func (b *BackendObjectReferenceApplyConfiguration) WithKind(value apisv1.Kind) *BackendObjectReferenceApplyConfiguration { b.Kind = &value return b } @@ -57,7 +57,7 @@ func (b *BackendObjectReferenceApplyConfiguration) WithKind(value v1.Kind) *Back // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *BackendObjectReferenceApplyConfiguration) WithName(value v1.ObjectName) *BackendObjectReferenceApplyConfiguration { +func (b *BackendObjectReferenceApplyConfiguration) WithName(value apisv1.ObjectName) *BackendObjectReferenceApplyConfiguration { b.Name = &value return b } @@ -65,7 +65,7 @@ func (b *BackendObjectReferenceApplyConfiguration) WithName(value v1.ObjectName) // WithNamespace sets the Namespace field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Namespace field is set to the value of the last call. -func (b *BackendObjectReferenceApplyConfiguration) WithNamespace(value v1.Namespace) *BackendObjectReferenceApplyConfiguration { +func (b *BackendObjectReferenceApplyConfiguration) WithNamespace(value apisv1.Namespace) *BackendObjectReferenceApplyConfiguration { b.Namespace = &value return b } @@ -73,7 +73,7 @@ func (b *BackendObjectReferenceApplyConfiguration) WithNamespace(value v1.Namesp // WithPort sets the Port field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Port field is set to the value of the last call. -func (b *BackendObjectReferenceApplyConfiguration) WithPort(value v1.PortNumber) *BackendObjectReferenceApplyConfiguration { +func (b *BackendObjectReferenceApplyConfiguration) WithPort(value apisv1.PortNumber) *BackendObjectReferenceApplyConfiguration { b.Port = &value return b } diff --git a/applyconfiguration/apis/v1/backendref.go b/applyconfiguration/apis/v1/backendref.go index c30007dc86..838dd6f6a3 100644 --- a/applyconfiguration/apis/v1/backendref.go +++ b/applyconfiguration/apis/v1/backendref.go @@ -39,7 +39,7 @@ func BackendRef() *BackendRefApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. func (b *BackendRefApplyConfiguration) WithGroup(value apisv1.Group) *BackendRefApplyConfiguration { - b.Group = &value + b.BackendObjectReferenceApplyConfiguration.Group = &value return b } @@ -47,7 +47,7 @@ func (b *BackendRefApplyConfiguration) WithGroup(value apisv1.Group) *BackendRef // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *BackendRefApplyConfiguration) WithKind(value apisv1.Kind) *BackendRefApplyConfiguration { - b.Kind = &value + b.BackendObjectReferenceApplyConfiguration.Kind = &value return b } @@ -55,7 +55,7 @@ func (b *BackendRefApplyConfiguration) WithKind(value apisv1.Kind) *BackendRefAp // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. func (b *BackendRefApplyConfiguration) WithName(value apisv1.ObjectName) *BackendRefApplyConfiguration { - b.Name = &value + b.BackendObjectReferenceApplyConfiguration.Name = &value return b } @@ -63,7 +63,7 @@ func (b *BackendRefApplyConfiguration) WithName(value apisv1.ObjectName) *Backen // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Namespace field is set to the value of the last call. func (b *BackendRefApplyConfiguration) WithNamespace(value apisv1.Namespace) *BackendRefApplyConfiguration { - b.Namespace = &value + b.BackendObjectReferenceApplyConfiguration.Namespace = &value return b } @@ -71,7 +71,7 @@ func (b *BackendRefApplyConfiguration) WithNamespace(value apisv1.Namespace) *Ba // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Port field is set to the value of the last call. func (b *BackendRefApplyConfiguration) WithPort(value apisv1.PortNumber) *BackendRefApplyConfiguration { - b.Port = &value + b.BackendObjectReferenceApplyConfiguration.Port = &value return b } diff --git a/applyconfiguration/apis/v1/cookieconfig.go b/applyconfiguration/apis/v1/cookieconfig.go index 9280ddce51..59d549fe89 100644 --- a/applyconfiguration/apis/v1/cookieconfig.go +++ b/applyconfiguration/apis/v1/cookieconfig.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // CookieConfigApplyConfiguration represents a declarative configuration of the CookieConfig type for use // with apply. type CookieConfigApplyConfiguration struct { - LifetimeType *v1.CookieLifetimeType `json:"lifetimeType,omitempty"` + LifetimeType *apisv1.CookieLifetimeType `json:"lifetimeType,omitempty"` } // CookieConfigApplyConfiguration constructs a declarative configuration of the CookieConfig type for use with @@ -37,7 +37,7 @@ func CookieConfig() *CookieConfigApplyConfiguration { // WithLifetimeType sets the LifetimeType field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the LifetimeType field is set to the value of the last call. -func (b *CookieConfigApplyConfiguration) WithLifetimeType(value v1.CookieLifetimeType) *CookieConfigApplyConfiguration { +func (b *CookieConfigApplyConfiguration) WithLifetimeType(value apisv1.CookieLifetimeType) *CookieConfigApplyConfiguration { b.LifetimeType = &value return b } diff --git a/applyconfiguration/apis/v1/gateway.go b/applyconfiguration/apis/v1/gateway.go index 965ae3838d..98ee1b9ad0 100644 --- a/applyconfiguration/apis/v1/gateway.go +++ b/applyconfiguration/apis/v1/gateway.go @@ -19,21 +19,21 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" - gatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) // GatewayApplyConfiguration represents a declarative configuration of the Gateway type for use // with apply. type GatewayApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *GatewaySpecApplyConfiguration `json:"spec,omitempty"` - Status *GatewayStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *GatewaySpecApplyConfiguration `json:"spec,omitempty"` + Status *GatewayStatusApplyConfiguration `json:"status,omitempty"` } // Gateway constructs a declarative configuration of the Gateway type for use with @@ -58,18 +58,18 @@ func Gateway(name, namespace string) *GatewayApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractGateway(gateway *gatewayapiapisv1.Gateway, fieldManager string) (*GatewayApplyConfiguration, error) { +func ExtractGateway(gateway *apisv1.Gateway, fieldManager string) (*GatewayApplyConfiguration, error) { return extractGateway(gateway, fieldManager, "") } // ExtractGatewayStatus is the same as ExtractGateway except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractGatewayStatus(gateway *gatewayapiapisv1.Gateway, fieldManager string) (*GatewayApplyConfiguration, error) { +func ExtractGatewayStatus(gateway *apisv1.Gateway, fieldManager string) (*GatewayApplyConfiguration, error) { return extractGateway(gateway, fieldManager, "status") } -func extractGateway(gateway *gatewayapiapisv1.Gateway, fieldManager string, subresource string) (*GatewayApplyConfiguration, error) { +func extractGateway(gateway *apisv1.Gateway, fieldManager string, subresource string) (*GatewayApplyConfiguration, error) { b := &GatewayApplyConfiguration{} err := managedfields.ExtractInto(gateway, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1.Gateway"), fieldManager, b, subresource) if err != nil { @@ -87,7 +87,7 @@ func extractGateway(gateway *gatewayapiapisv1.Gateway, fieldManager string, subr // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithKind(value string) *GatewayApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -95,7 +95,7 @@ func (b *GatewayApplyConfiguration) WithKind(value string) *GatewayApplyConfigur // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithAPIVersion(value string) *GatewayApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -104,7 +104,7 @@ func (b *GatewayApplyConfiguration) WithAPIVersion(value string) *GatewayApplyCo // If called multiple times, the Name field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithName(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -113,7 +113,7 @@ func (b *GatewayApplyConfiguration) WithName(value string) *GatewayApplyConfigur // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithGenerateName(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -122,7 +122,7 @@ func (b *GatewayApplyConfiguration) WithGenerateName(value string) *GatewayApply // If called multiple times, the Namespace field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithNamespace(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -131,7 +131,7 @@ func (b *GatewayApplyConfiguration) WithNamespace(value string) *GatewayApplyCon // If called multiple times, the UID field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithUID(value types.UID) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -140,7 +140,7 @@ func (b *GatewayApplyConfiguration) WithUID(value types.UID) *GatewayApplyConfig // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithResourceVersion(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -149,25 +149,25 @@ func (b *GatewayApplyConfiguration) WithResourceVersion(value string) *GatewayAp // If called multiple times, the Generation field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithGeneration(value int64) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *GatewayApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GatewayApplyConfiguration { +func (b *GatewayApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *GatewayApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GatewayApplyConfiguration { +func (b *GatewayApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -176,7 +176,7 @@ func (b *GatewayApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *Ga // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -186,11 +186,11 @@ func (b *GatewayApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *GatewayApplyConfiguration) WithLabels(entries map[string]string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -201,11 +201,11 @@ func (b *GatewayApplyConfiguration) WithLabels(entries map[string]string) *Gatew // overwriting an existing map entries in Annotations field with the same key. func (b *GatewayApplyConfiguration) WithAnnotations(entries map[string]string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -213,13 +213,13 @@ func (b *GatewayApplyConfiguration) WithAnnotations(entries map[string]string) * // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *GatewayApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *GatewayApplyConfiguration { +func (b *GatewayApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -230,14 +230,14 @@ func (b *GatewayApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefer func (b *GatewayApplyConfiguration) WithFinalizers(values ...string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *GatewayApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -260,5 +260,5 @@ func (b *GatewayApplyConfiguration) WithStatus(value *GatewayStatusApplyConfigur // GetName retrieves the value of the Name field in the declarative configuration. func (b *GatewayApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1/gatewayclass.go b/applyconfiguration/apis/v1/gatewayclass.go index a356c50163..fa6792f343 100644 --- a/applyconfiguration/apis/v1/gatewayclass.go +++ b/applyconfiguration/apis/v1/gatewayclass.go @@ -19,21 +19,21 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" - gatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) // GatewayClassApplyConfiguration represents a declarative configuration of the GatewayClass type for use // with apply. type GatewayClassApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *GatewayClassSpecApplyConfiguration `json:"spec,omitempty"` - Status *GatewayClassStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *GatewayClassSpecApplyConfiguration `json:"spec,omitempty"` + Status *GatewayClassStatusApplyConfiguration `json:"status,omitempty"` } // GatewayClass constructs a declarative configuration of the GatewayClass type for use with @@ -57,18 +57,18 @@ func GatewayClass(name string) *GatewayClassApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractGatewayClass(gatewayClass *gatewayapiapisv1.GatewayClass, fieldManager string) (*GatewayClassApplyConfiguration, error) { +func ExtractGatewayClass(gatewayClass *apisv1.GatewayClass, fieldManager string) (*GatewayClassApplyConfiguration, error) { return extractGatewayClass(gatewayClass, fieldManager, "") } // ExtractGatewayClassStatus is the same as ExtractGatewayClass except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractGatewayClassStatus(gatewayClass *gatewayapiapisv1.GatewayClass, fieldManager string) (*GatewayClassApplyConfiguration, error) { +func ExtractGatewayClassStatus(gatewayClass *apisv1.GatewayClass, fieldManager string) (*GatewayClassApplyConfiguration, error) { return extractGatewayClass(gatewayClass, fieldManager, "status") } -func extractGatewayClass(gatewayClass *gatewayapiapisv1.GatewayClass, fieldManager string, subresource string) (*GatewayClassApplyConfiguration, error) { +func extractGatewayClass(gatewayClass *apisv1.GatewayClass, fieldManager string, subresource string) (*GatewayClassApplyConfiguration, error) { b := &GatewayClassApplyConfiguration{} err := managedfields.ExtractInto(gatewayClass, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1.GatewayClass"), fieldManager, b, subresource) if err != nil { @@ -85,7 +85,7 @@ func extractGatewayClass(gatewayClass *gatewayapiapisv1.GatewayClass, fieldManag // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithKind(value string) *GatewayClassApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -93,7 +93,7 @@ func (b *GatewayClassApplyConfiguration) WithKind(value string) *GatewayClassApp // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithAPIVersion(value string) *GatewayClassApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -102,7 +102,7 @@ func (b *GatewayClassApplyConfiguration) WithAPIVersion(value string) *GatewayCl // If called multiple times, the Name field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithName(value string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -111,7 +111,7 @@ func (b *GatewayClassApplyConfiguration) WithName(value string) *GatewayClassApp // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithGenerateName(value string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -120,7 +120,7 @@ func (b *GatewayClassApplyConfiguration) WithGenerateName(value string) *Gateway // If called multiple times, the Namespace field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithNamespace(value string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -129,7 +129,7 @@ func (b *GatewayClassApplyConfiguration) WithNamespace(value string) *GatewayCla // If called multiple times, the UID field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithUID(value types.UID) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -138,7 +138,7 @@ func (b *GatewayClassApplyConfiguration) WithUID(value types.UID) *GatewayClassA // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithResourceVersion(value string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -147,25 +147,25 @@ func (b *GatewayClassApplyConfiguration) WithResourceVersion(value string) *Gate // If called multiple times, the Generation field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithGeneration(value int64) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *GatewayClassApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GatewayClassApplyConfiguration { +func (b *GatewayClassApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *GatewayClassApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GatewayClassApplyConfiguration { +func (b *GatewayClassApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -174,7 +174,7 @@ func (b *GatewayClassApplyConfiguration) WithDeletionTimestamp(value metav1.Time // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -184,11 +184,11 @@ func (b *GatewayClassApplyConfiguration) WithDeletionGracePeriodSeconds(value in // overwriting an existing map entries in Labels field with the same key. func (b *GatewayClassApplyConfiguration) WithLabels(entries map[string]string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -199,11 +199,11 @@ func (b *GatewayClassApplyConfiguration) WithLabels(entries map[string]string) * // overwriting an existing map entries in Annotations field with the same key. func (b *GatewayClassApplyConfiguration) WithAnnotations(entries map[string]string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -211,13 +211,13 @@ func (b *GatewayClassApplyConfiguration) WithAnnotations(entries map[string]stri // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *GatewayClassApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *GatewayClassApplyConfiguration { +func (b *GatewayClassApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -228,14 +228,14 @@ func (b *GatewayClassApplyConfiguration) WithOwnerReferences(values ...*v1.Owner func (b *GatewayClassApplyConfiguration) WithFinalizers(values ...string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *GatewayClassApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -258,5 +258,5 @@ func (b *GatewayClassApplyConfiguration) WithStatus(value *GatewayClassStatusApp // GetName retrieves the value of the Name field in the declarative configuration. func (b *GatewayClassApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1/gatewayclassspec.go b/applyconfiguration/apis/v1/gatewayclassspec.go index 8591cd2138..fda9be7168 100644 --- a/applyconfiguration/apis/v1/gatewayclassspec.go +++ b/applyconfiguration/apis/v1/gatewayclassspec.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GatewayClassSpecApplyConfiguration represents a declarative configuration of the GatewayClassSpec type for use // with apply. type GatewayClassSpecApplyConfiguration struct { - ControllerName *v1.GatewayController `json:"controllerName,omitempty"` + ControllerName *apisv1.GatewayController `json:"controllerName,omitempty"` ParametersRef *ParametersReferenceApplyConfiguration `json:"parametersRef,omitempty"` Description *string `json:"description,omitempty"` } @@ -39,7 +39,7 @@ func GatewayClassSpec() *GatewayClassSpecApplyConfiguration { // WithControllerName sets the ControllerName field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the ControllerName field is set to the value of the last call. -func (b *GatewayClassSpecApplyConfiguration) WithControllerName(value v1.GatewayController) *GatewayClassSpecApplyConfiguration { +func (b *GatewayClassSpecApplyConfiguration) WithControllerName(value apisv1.GatewayController) *GatewayClassSpecApplyConfiguration { b.ControllerName = &value return b } diff --git a/applyconfiguration/apis/v1/gatewayclassstatus.go b/applyconfiguration/apis/v1/gatewayclassstatus.go index fb3fa8df15..746da3ba26 100644 --- a/applyconfiguration/apis/v1/gatewayclassstatus.go +++ b/applyconfiguration/apis/v1/gatewayclassstatus.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // GatewayClassStatusApplyConfiguration represents a declarative configuration of the GatewayClassStatus type for use // with apply. type GatewayClassStatusApplyConfiguration struct { - Conditions []v1.ConditionApplyConfiguration `json:"conditions,omitempty"` + Conditions []metav1.ConditionApplyConfiguration `json:"conditions,omitempty"` SupportedFeatures []SupportedFeatureApplyConfiguration `json:"supportedFeatures,omitempty"` } @@ -38,7 +38,7 @@ func GatewayClassStatus() *GatewayClassStatusApplyConfiguration { // WithConditions adds the given value to the Conditions field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the Conditions field. -func (b *GatewayClassStatusApplyConfiguration) WithConditions(values ...*v1.ConditionApplyConfiguration) *GatewayClassStatusApplyConfiguration { +func (b *GatewayClassStatusApplyConfiguration) WithConditions(values ...*metav1.ConditionApplyConfiguration) *GatewayClassStatusApplyConfiguration { for i := range values { if values[i] == nil { panic("nil value passed to WithConditions") diff --git a/applyconfiguration/apis/v1/gatewayinfrastructure.go b/applyconfiguration/apis/v1/gatewayinfrastructure.go index 0bed1ad25c..3d6716db2a 100644 --- a/applyconfiguration/apis/v1/gatewayinfrastructure.go +++ b/applyconfiguration/apis/v1/gatewayinfrastructure.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GatewayInfrastructureApplyConfiguration represents a declarative configuration of the GatewayInfrastructure type for use // with apply. type GatewayInfrastructureApplyConfiguration struct { - Labels map[v1.LabelKey]v1.LabelValue `json:"labels,omitempty"` - Annotations map[v1.AnnotationKey]v1.AnnotationValue `json:"annotations,omitempty"` - ParametersRef *LocalParametersReferenceApplyConfiguration `json:"parametersRef,omitempty"` + Labels map[apisv1.LabelKey]apisv1.LabelValue `json:"labels,omitempty"` + Annotations map[apisv1.AnnotationKey]apisv1.AnnotationValue `json:"annotations,omitempty"` + ParametersRef *LocalParametersReferenceApplyConfiguration `json:"parametersRef,omitempty"` } // GatewayInfrastructureApplyConfiguration constructs a declarative configuration of the GatewayInfrastructure type for use with @@ -40,9 +40,9 @@ func GatewayInfrastructure() *GatewayInfrastructureApplyConfiguration { // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, the entries provided by each call will be put on the Labels field, // overwriting an existing map entries in Labels field with the same key. -func (b *GatewayInfrastructureApplyConfiguration) WithLabels(entries map[v1.LabelKey]v1.LabelValue) *GatewayInfrastructureApplyConfiguration { +func (b *GatewayInfrastructureApplyConfiguration) WithLabels(entries map[apisv1.LabelKey]apisv1.LabelValue) *GatewayInfrastructureApplyConfiguration { if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[v1.LabelKey]v1.LabelValue, len(entries)) + b.Labels = make(map[apisv1.LabelKey]apisv1.LabelValue, len(entries)) } for k, v := range entries { b.Labels[k] = v @@ -54,9 +54,9 @@ func (b *GatewayInfrastructureApplyConfiguration) WithLabels(entries map[v1.Labe // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, the entries provided by each call will be put on the Annotations field, // overwriting an existing map entries in Annotations field with the same key. -func (b *GatewayInfrastructureApplyConfiguration) WithAnnotations(entries map[v1.AnnotationKey]v1.AnnotationValue) *GatewayInfrastructureApplyConfiguration { +func (b *GatewayInfrastructureApplyConfiguration) WithAnnotations(entries map[apisv1.AnnotationKey]apisv1.AnnotationValue) *GatewayInfrastructureApplyConfiguration { if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[v1.AnnotationKey]v1.AnnotationValue, len(entries)) + b.Annotations = make(map[apisv1.AnnotationKey]apisv1.AnnotationValue, len(entries)) } for k, v := range entries { b.Annotations[k] = v diff --git a/applyconfiguration/apis/v1/gatewayspec.go b/applyconfiguration/apis/v1/gatewayspec.go index 65e3e1991d..bdfeba84d4 100644 --- a/applyconfiguration/apis/v1/gatewayspec.go +++ b/applyconfiguration/apis/v1/gatewayspec.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GatewaySpecApplyConfiguration represents a declarative configuration of the GatewaySpec type for use // with apply. type GatewaySpecApplyConfiguration struct { - GatewayClassName *v1.ObjectName `json:"gatewayClassName,omitempty"` + GatewayClassName *apisv1.ObjectName `json:"gatewayClassName,omitempty"` Listeners []ListenerApplyConfiguration `json:"listeners,omitempty"` Addresses []GatewaySpecAddressApplyConfiguration `json:"addresses,omitempty"` Infrastructure *GatewayInfrastructureApplyConfiguration `json:"infrastructure,omitempty"` @@ -42,7 +42,7 @@ func GatewaySpec() *GatewaySpecApplyConfiguration { // WithGatewayClassName sets the GatewayClassName field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the GatewayClassName field is set to the value of the last call. -func (b *GatewaySpecApplyConfiguration) WithGatewayClassName(value v1.ObjectName) *GatewaySpecApplyConfiguration { +func (b *GatewaySpecApplyConfiguration) WithGatewayClassName(value apisv1.ObjectName) *GatewaySpecApplyConfiguration { b.GatewayClassName = &value return b } diff --git a/applyconfiguration/apis/v1/gatewayspecaddress.go b/applyconfiguration/apis/v1/gatewayspecaddress.go index f633012fbd..ac796e115d 100644 --- a/applyconfiguration/apis/v1/gatewayspecaddress.go +++ b/applyconfiguration/apis/v1/gatewayspecaddress.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GatewaySpecAddressApplyConfiguration represents a declarative configuration of the GatewaySpecAddress type for use // with apply. type GatewaySpecAddressApplyConfiguration struct { - Type *v1.AddressType `json:"type,omitempty"` - Value *string `json:"value,omitempty"` + Type *apisv1.AddressType `json:"type,omitempty"` + Value *string `json:"value,omitempty"` } // GatewaySpecAddressApplyConfiguration constructs a declarative configuration of the GatewaySpecAddress type for use with @@ -38,7 +38,7 @@ func GatewaySpecAddress() *GatewaySpecAddressApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *GatewaySpecAddressApplyConfiguration) WithType(value v1.AddressType) *GatewaySpecAddressApplyConfiguration { +func (b *GatewaySpecAddressApplyConfiguration) WithType(value apisv1.AddressType) *GatewaySpecAddressApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1/gatewaystatusaddress.go b/applyconfiguration/apis/v1/gatewaystatusaddress.go index a40b54415a..6e46a5dad1 100644 --- a/applyconfiguration/apis/v1/gatewaystatusaddress.go +++ b/applyconfiguration/apis/v1/gatewaystatusaddress.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GatewayStatusAddressApplyConfiguration represents a declarative configuration of the GatewayStatusAddress type for use // with apply. type GatewayStatusAddressApplyConfiguration struct { - Type *v1.AddressType `json:"type,omitempty"` - Value *string `json:"value,omitempty"` + Type *apisv1.AddressType `json:"type,omitempty"` + Value *string `json:"value,omitempty"` } // GatewayStatusAddressApplyConfiguration constructs a declarative configuration of the GatewayStatusAddress type for use with @@ -38,7 +38,7 @@ func GatewayStatusAddress() *GatewayStatusAddressApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *GatewayStatusAddressApplyConfiguration) WithType(value v1.AddressType) *GatewayStatusAddressApplyConfiguration { +func (b *GatewayStatusAddressApplyConfiguration) WithType(value apisv1.AddressType) *GatewayStatusAddressApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1/gatewaytlsconfig.go b/applyconfiguration/apis/v1/gatewaytlsconfig.go index 57c76b2e89..896e3e56b3 100644 --- a/applyconfiguration/apis/v1/gatewaytlsconfig.go +++ b/applyconfiguration/apis/v1/gatewaytlsconfig.go @@ -19,16 +19,16 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GatewayTLSConfigApplyConfiguration represents a declarative configuration of the GatewayTLSConfig type for use // with apply. type GatewayTLSConfigApplyConfiguration struct { - Mode *v1.TLSModeType `json:"mode,omitempty"` - CertificateRefs []SecretObjectReferenceApplyConfiguration `json:"certificateRefs,omitempty"` - FrontendValidation *FrontendTLSValidationApplyConfiguration `json:"frontendValidation,omitempty"` - Options map[v1.AnnotationKey]v1.AnnotationValue `json:"options,omitempty"` + Mode *apisv1.TLSModeType `json:"mode,omitempty"` + CertificateRefs []SecretObjectReferenceApplyConfiguration `json:"certificateRefs,omitempty"` + FrontendValidation *FrontendTLSValidationApplyConfiguration `json:"frontendValidation,omitempty"` + Options map[apisv1.AnnotationKey]apisv1.AnnotationValue `json:"options,omitempty"` } // GatewayTLSConfigApplyConfiguration constructs a declarative configuration of the GatewayTLSConfig type for use with @@ -40,7 +40,7 @@ func GatewayTLSConfig() *GatewayTLSConfigApplyConfiguration { // WithMode sets the Mode field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Mode field is set to the value of the last call. -func (b *GatewayTLSConfigApplyConfiguration) WithMode(value v1.TLSModeType) *GatewayTLSConfigApplyConfiguration { +func (b *GatewayTLSConfigApplyConfiguration) WithMode(value apisv1.TLSModeType) *GatewayTLSConfigApplyConfiguration { b.Mode = &value return b } @@ -70,9 +70,9 @@ func (b *GatewayTLSConfigApplyConfiguration) WithFrontendValidation(value *Front // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, the entries provided by each call will be put on the Options field, // overwriting an existing map entries in Options field with the same key. -func (b *GatewayTLSConfigApplyConfiguration) WithOptions(entries map[v1.AnnotationKey]v1.AnnotationValue) *GatewayTLSConfigApplyConfiguration { +func (b *GatewayTLSConfigApplyConfiguration) WithOptions(entries map[apisv1.AnnotationKey]apisv1.AnnotationValue) *GatewayTLSConfigApplyConfiguration { if b.Options == nil && len(entries) > 0 { - b.Options = make(map[v1.AnnotationKey]v1.AnnotationValue, len(entries)) + b.Options = make(map[apisv1.AnnotationKey]apisv1.AnnotationValue, len(entries)) } for k, v := range entries { b.Options[k] = v diff --git a/applyconfiguration/apis/v1/grpcbackendref.go b/applyconfiguration/apis/v1/grpcbackendref.go index ed8bd4edec..75465480fe 100644 --- a/applyconfiguration/apis/v1/grpcbackendref.go +++ b/applyconfiguration/apis/v1/grpcbackendref.go @@ -39,7 +39,7 @@ func GRPCBackendRef() *GRPCBackendRefApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. func (b *GRPCBackendRefApplyConfiguration) WithGroup(value apisv1.Group) *GRPCBackendRefApplyConfiguration { - b.Group = &value + b.BackendObjectReferenceApplyConfiguration.Group = &value return b } @@ -47,7 +47,7 @@ func (b *GRPCBackendRefApplyConfiguration) WithGroup(value apisv1.Group) *GRPCBa // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GRPCBackendRefApplyConfiguration) WithKind(value apisv1.Kind) *GRPCBackendRefApplyConfiguration { - b.Kind = &value + b.BackendObjectReferenceApplyConfiguration.Kind = &value return b } @@ -55,7 +55,7 @@ func (b *GRPCBackendRefApplyConfiguration) WithKind(value apisv1.Kind) *GRPCBack // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. func (b *GRPCBackendRefApplyConfiguration) WithName(value apisv1.ObjectName) *GRPCBackendRefApplyConfiguration { - b.Name = &value + b.BackendObjectReferenceApplyConfiguration.Name = &value return b } @@ -63,7 +63,7 @@ func (b *GRPCBackendRefApplyConfiguration) WithName(value apisv1.ObjectName) *GR // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Namespace field is set to the value of the last call. func (b *GRPCBackendRefApplyConfiguration) WithNamespace(value apisv1.Namespace) *GRPCBackendRefApplyConfiguration { - b.Namespace = &value + b.BackendObjectReferenceApplyConfiguration.Namespace = &value return b } @@ -71,7 +71,7 @@ func (b *GRPCBackendRefApplyConfiguration) WithNamespace(value apisv1.Namespace) // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Port field is set to the value of the last call. func (b *GRPCBackendRefApplyConfiguration) WithPort(value apisv1.PortNumber) *GRPCBackendRefApplyConfiguration { - b.Port = &value + b.BackendObjectReferenceApplyConfiguration.Port = &value return b } @@ -79,7 +79,7 @@ func (b *GRPCBackendRefApplyConfiguration) WithPort(value apisv1.PortNumber) *GR // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Weight field is set to the value of the last call. func (b *GRPCBackendRefApplyConfiguration) WithWeight(value int32) *GRPCBackendRefApplyConfiguration { - b.Weight = &value + b.BackendRefApplyConfiguration.Weight = &value return b } diff --git a/applyconfiguration/apis/v1/grpcheadermatch.go b/applyconfiguration/apis/v1/grpcheadermatch.go index 868f404874..20b59b1291 100644 --- a/applyconfiguration/apis/v1/grpcheadermatch.go +++ b/applyconfiguration/apis/v1/grpcheadermatch.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GRPCHeaderMatchApplyConfiguration represents a declarative configuration of the GRPCHeaderMatch type for use // with apply. type GRPCHeaderMatchApplyConfiguration struct { - Type *v1.GRPCHeaderMatchType `json:"type,omitempty"` - Name *v1.GRPCHeaderName `json:"name,omitempty"` - Value *string `json:"value,omitempty"` + Type *apisv1.GRPCHeaderMatchType `json:"type,omitempty"` + Name *apisv1.GRPCHeaderName `json:"name,omitempty"` + Value *string `json:"value,omitempty"` } // GRPCHeaderMatchApplyConfiguration constructs a declarative configuration of the GRPCHeaderMatch type for use with @@ -39,7 +39,7 @@ func GRPCHeaderMatch() *GRPCHeaderMatchApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *GRPCHeaderMatchApplyConfiguration) WithType(value v1.GRPCHeaderMatchType) *GRPCHeaderMatchApplyConfiguration { +func (b *GRPCHeaderMatchApplyConfiguration) WithType(value apisv1.GRPCHeaderMatchType) *GRPCHeaderMatchApplyConfiguration { b.Type = &value return b } @@ -47,7 +47,7 @@ func (b *GRPCHeaderMatchApplyConfiguration) WithType(value v1.GRPCHeaderMatchTyp // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *GRPCHeaderMatchApplyConfiguration) WithName(value v1.GRPCHeaderName) *GRPCHeaderMatchApplyConfiguration { +func (b *GRPCHeaderMatchApplyConfiguration) WithName(value apisv1.GRPCHeaderName) *GRPCHeaderMatchApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1/grpcmethodmatch.go b/applyconfiguration/apis/v1/grpcmethodmatch.go index 26e0804506..fd84f59cee 100644 --- a/applyconfiguration/apis/v1/grpcmethodmatch.go +++ b/applyconfiguration/apis/v1/grpcmethodmatch.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GRPCMethodMatchApplyConfiguration represents a declarative configuration of the GRPCMethodMatch type for use // with apply. type GRPCMethodMatchApplyConfiguration struct { - Type *v1.GRPCMethodMatchType `json:"type,omitempty"` - Service *string `json:"service,omitempty"` - Method *string `json:"method,omitempty"` + Type *apisv1.GRPCMethodMatchType `json:"type,omitempty"` + Service *string `json:"service,omitempty"` + Method *string `json:"method,omitempty"` } // GRPCMethodMatchApplyConfiguration constructs a declarative configuration of the GRPCMethodMatch type for use with @@ -39,7 +39,7 @@ func GRPCMethodMatch() *GRPCMethodMatchApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *GRPCMethodMatchApplyConfiguration) WithType(value v1.GRPCMethodMatchType) *GRPCMethodMatchApplyConfiguration { +func (b *GRPCMethodMatchApplyConfiguration) WithType(value apisv1.GRPCMethodMatchType) *GRPCMethodMatchApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1/grpcroute.go b/applyconfiguration/apis/v1/grpcroute.go index 5728e58334..d7e0568e9c 100644 --- a/applyconfiguration/apis/v1/grpcroute.go +++ b/applyconfiguration/apis/v1/grpcroute.go @@ -19,21 +19,21 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" - gatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) // GRPCRouteApplyConfiguration represents a declarative configuration of the GRPCRoute type for use // with apply. type GRPCRouteApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *GRPCRouteSpecApplyConfiguration `json:"spec,omitempty"` - Status *GRPCRouteStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *GRPCRouteSpecApplyConfiguration `json:"spec,omitempty"` + Status *GRPCRouteStatusApplyConfiguration `json:"status,omitempty"` } // GRPCRoute constructs a declarative configuration of the GRPCRoute type for use with @@ -58,18 +58,18 @@ func GRPCRoute(name, namespace string) *GRPCRouteApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractGRPCRoute(gRPCRoute *gatewayapiapisv1.GRPCRoute, fieldManager string) (*GRPCRouteApplyConfiguration, error) { +func ExtractGRPCRoute(gRPCRoute *apisv1.GRPCRoute, fieldManager string) (*GRPCRouteApplyConfiguration, error) { return extractGRPCRoute(gRPCRoute, fieldManager, "") } // ExtractGRPCRouteStatus is the same as ExtractGRPCRoute except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractGRPCRouteStatus(gRPCRoute *gatewayapiapisv1.GRPCRoute, fieldManager string) (*GRPCRouteApplyConfiguration, error) { +func ExtractGRPCRouteStatus(gRPCRoute *apisv1.GRPCRoute, fieldManager string) (*GRPCRouteApplyConfiguration, error) { return extractGRPCRoute(gRPCRoute, fieldManager, "status") } -func extractGRPCRoute(gRPCRoute *gatewayapiapisv1.GRPCRoute, fieldManager string, subresource string) (*GRPCRouteApplyConfiguration, error) { +func extractGRPCRoute(gRPCRoute *apisv1.GRPCRoute, fieldManager string, subresource string) (*GRPCRouteApplyConfiguration, error) { b := &GRPCRouteApplyConfiguration{} err := managedfields.ExtractInto(gRPCRoute, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1.GRPCRoute"), fieldManager, b, subresource) if err != nil { @@ -87,7 +87,7 @@ func extractGRPCRoute(gRPCRoute *gatewayapiapisv1.GRPCRoute, fieldManager string // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithKind(value string) *GRPCRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -95,7 +95,7 @@ func (b *GRPCRouteApplyConfiguration) WithKind(value string) *GRPCRouteApplyConf // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithAPIVersion(value string) *GRPCRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -104,7 +104,7 @@ func (b *GRPCRouteApplyConfiguration) WithAPIVersion(value string) *GRPCRouteApp // If called multiple times, the Name field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithName(value string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -113,7 +113,7 @@ func (b *GRPCRouteApplyConfiguration) WithName(value string) *GRPCRouteApplyConf // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithGenerateName(value string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -122,7 +122,7 @@ func (b *GRPCRouteApplyConfiguration) WithGenerateName(value string) *GRPCRouteA // If called multiple times, the Namespace field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithNamespace(value string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -131,7 +131,7 @@ func (b *GRPCRouteApplyConfiguration) WithNamespace(value string) *GRPCRouteAppl // If called multiple times, the UID field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithUID(value types.UID) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -140,7 +140,7 @@ func (b *GRPCRouteApplyConfiguration) WithUID(value types.UID) *GRPCRouteApplyCo // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithResourceVersion(value string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -149,25 +149,25 @@ func (b *GRPCRouteApplyConfiguration) WithResourceVersion(value string) *GRPCRou // If called multiple times, the Generation field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithGeneration(value int64) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *GRPCRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GRPCRouteApplyConfiguration { +func (b *GRPCRouteApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *GRPCRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GRPCRouteApplyConfiguration { +func (b *GRPCRouteApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -176,7 +176,7 @@ func (b *GRPCRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) * // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -186,11 +186,11 @@ func (b *GRPCRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64 // overwriting an existing map entries in Labels field with the same key. func (b *GRPCRouteApplyConfiguration) WithLabels(entries map[string]string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -201,11 +201,11 @@ func (b *GRPCRouteApplyConfiguration) WithLabels(entries map[string]string) *GRP // overwriting an existing map entries in Annotations field with the same key. func (b *GRPCRouteApplyConfiguration) WithAnnotations(entries map[string]string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -213,13 +213,13 @@ func (b *GRPCRouteApplyConfiguration) WithAnnotations(entries map[string]string) // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *GRPCRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *GRPCRouteApplyConfiguration { +func (b *GRPCRouteApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -230,14 +230,14 @@ func (b *GRPCRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef func (b *GRPCRouteApplyConfiguration) WithFinalizers(values ...string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *GRPCRouteApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -260,5 +260,5 @@ func (b *GRPCRouteApplyConfiguration) WithStatus(value *GRPCRouteStatusApplyConf // GetName retrieves the value of the Name field in the declarative configuration. func (b *GRPCRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1/grpcroutefilter.go b/applyconfiguration/apis/v1/grpcroutefilter.go index 80f94c947e..7b531ef7d2 100644 --- a/applyconfiguration/apis/v1/grpcroutefilter.go +++ b/applyconfiguration/apis/v1/grpcroutefilter.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GRPCRouteFilterApplyConfiguration represents a declarative configuration of the GRPCRouteFilter type for use // with apply. type GRPCRouteFilterApplyConfiguration struct { - Type *v1.GRPCRouteFilterType `json:"type,omitempty"` + Type *apisv1.GRPCRouteFilterType `json:"type,omitempty"` RequestHeaderModifier *HTTPHeaderFilterApplyConfiguration `json:"requestHeaderModifier,omitempty"` ResponseHeaderModifier *HTTPHeaderFilterApplyConfiguration `json:"responseHeaderModifier,omitempty"` RequestMirror *HTTPRequestMirrorFilterApplyConfiguration `json:"requestMirror,omitempty"` @@ -41,7 +41,7 @@ func GRPCRouteFilter() *GRPCRouteFilterApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *GRPCRouteFilterApplyConfiguration) WithType(value v1.GRPCRouteFilterType) *GRPCRouteFilterApplyConfiguration { +func (b *GRPCRouteFilterApplyConfiguration) WithType(value apisv1.GRPCRouteFilterType) *GRPCRouteFilterApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1/grpcrouterule.go b/applyconfiguration/apis/v1/grpcrouterule.go index 447a9ccc2e..f03ab7db95 100644 --- a/applyconfiguration/apis/v1/grpcrouterule.go +++ b/applyconfiguration/apis/v1/grpcrouterule.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GRPCRouteRuleApplyConfiguration represents a declarative configuration of the GRPCRouteRule type for use // with apply. type GRPCRouteRuleApplyConfiguration struct { - Name *v1.SectionName `json:"name,omitempty"` + Name *apisv1.SectionName `json:"name,omitempty"` Matches []GRPCRouteMatchApplyConfiguration `json:"matches,omitempty"` Filters []GRPCRouteFilterApplyConfiguration `json:"filters,omitempty"` BackendRefs []GRPCBackendRefApplyConfiguration `json:"backendRefs,omitempty"` @@ -41,7 +41,7 @@ func GRPCRouteRule() *GRPCRouteRuleApplyConfiguration { // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *GRPCRouteRuleApplyConfiguration) WithName(value v1.SectionName) *GRPCRouteRuleApplyConfiguration { +func (b *GRPCRouteRuleApplyConfiguration) WithName(value apisv1.SectionName) *GRPCRouteRuleApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1/grpcroutespec.go b/applyconfiguration/apis/v1/grpcroutespec.go index 70c1e63741..00c567e59c 100644 --- a/applyconfiguration/apis/v1/grpcroutespec.go +++ b/applyconfiguration/apis/v1/grpcroutespec.go @@ -44,7 +44,7 @@ func (b *GRPCRouteSpecApplyConfiguration) WithParentRefs(values ...*ParentRefere if values[i] == nil { panic("nil value passed to WithParentRefs") } - b.ParentRefs = append(b.ParentRefs, *values[i]) + b.CommonRouteSpecApplyConfiguration.ParentRefs = append(b.CommonRouteSpecApplyConfiguration.ParentRefs, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1/grpcroutestatus.go b/applyconfiguration/apis/v1/grpcroutestatus.go index 3ed9c24801..dc52b839bb 100644 --- a/applyconfiguration/apis/v1/grpcroutestatus.go +++ b/applyconfiguration/apis/v1/grpcroutestatus.go @@ -38,7 +38,7 @@ func (b *GRPCRouteStatusApplyConfiguration) WithParents(values ...*RouteParentSt if values[i] == nil { panic("nil value passed to WithParents") } - b.Parents = append(b.Parents, *values[i]) + b.RouteStatusApplyConfiguration.Parents = append(b.RouteStatusApplyConfiguration.Parents, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1/httpbackendref.go b/applyconfiguration/apis/v1/httpbackendref.go index 3110537f60..28fda8dd7b 100644 --- a/applyconfiguration/apis/v1/httpbackendref.go +++ b/applyconfiguration/apis/v1/httpbackendref.go @@ -39,7 +39,7 @@ func HTTPBackendRef() *HTTPBackendRefApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. func (b *HTTPBackendRefApplyConfiguration) WithGroup(value apisv1.Group) *HTTPBackendRefApplyConfiguration { - b.Group = &value + b.BackendObjectReferenceApplyConfiguration.Group = &value return b } @@ -47,7 +47,7 @@ func (b *HTTPBackendRefApplyConfiguration) WithGroup(value apisv1.Group) *HTTPBa // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *HTTPBackendRefApplyConfiguration) WithKind(value apisv1.Kind) *HTTPBackendRefApplyConfiguration { - b.Kind = &value + b.BackendObjectReferenceApplyConfiguration.Kind = &value return b } @@ -55,7 +55,7 @@ func (b *HTTPBackendRefApplyConfiguration) WithKind(value apisv1.Kind) *HTTPBack // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. func (b *HTTPBackendRefApplyConfiguration) WithName(value apisv1.ObjectName) *HTTPBackendRefApplyConfiguration { - b.Name = &value + b.BackendObjectReferenceApplyConfiguration.Name = &value return b } @@ -63,7 +63,7 @@ func (b *HTTPBackendRefApplyConfiguration) WithName(value apisv1.ObjectName) *HT // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Namespace field is set to the value of the last call. func (b *HTTPBackendRefApplyConfiguration) WithNamespace(value apisv1.Namespace) *HTTPBackendRefApplyConfiguration { - b.Namespace = &value + b.BackendObjectReferenceApplyConfiguration.Namespace = &value return b } @@ -71,7 +71,7 @@ func (b *HTTPBackendRefApplyConfiguration) WithNamespace(value apisv1.Namespace) // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Port field is set to the value of the last call. func (b *HTTPBackendRefApplyConfiguration) WithPort(value apisv1.PortNumber) *HTTPBackendRefApplyConfiguration { - b.Port = &value + b.BackendObjectReferenceApplyConfiguration.Port = &value return b } @@ -79,7 +79,7 @@ func (b *HTTPBackendRefApplyConfiguration) WithPort(value apisv1.PortNumber) *HT // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Weight field is set to the value of the last call. func (b *HTTPBackendRefApplyConfiguration) WithWeight(value int32) *HTTPBackendRefApplyConfiguration { - b.Weight = &value + b.BackendRefApplyConfiguration.Weight = &value return b } diff --git a/applyconfiguration/apis/v1/httpcorsfilter.go b/applyconfiguration/apis/v1/httpcorsfilter.go index 9addcf9559..c2cf023c25 100644 --- a/applyconfiguration/apis/v1/httpcorsfilter.go +++ b/applyconfiguration/apis/v1/httpcorsfilter.go @@ -19,18 +19,18 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPCORSFilterApplyConfiguration represents a declarative configuration of the HTTPCORSFilter type for use // with apply. type HTTPCORSFilterApplyConfiguration struct { - AllowOrigins []v1.AbsoluteURI `json:"allowOrigins,omitempty"` - AllowCredentials *v1.TrueField `json:"allowCredentials,omitempty"` - AllowMethods []v1.HTTPMethodWithWildcard `json:"allowMethods,omitempty"` - AllowHeaders []v1.HTTPHeaderName `json:"allowHeaders,omitempty"` - ExposeHeaders []v1.HTTPHeaderName `json:"exposeHeaders,omitempty"` - MaxAge *int32 `json:"maxAge,omitempty"` + AllowOrigins []apisv1.AbsoluteURI `json:"allowOrigins,omitempty"` + AllowCredentials *apisv1.TrueField `json:"allowCredentials,omitempty"` + AllowMethods []apisv1.HTTPMethodWithWildcard `json:"allowMethods,omitempty"` + AllowHeaders []apisv1.HTTPHeaderName `json:"allowHeaders,omitempty"` + ExposeHeaders []apisv1.HTTPHeaderName `json:"exposeHeaders,omitempty"` + MaxAge *int32 `json:"maxAge,omitempty"` } // HTTPCORSFilterApplyConfiguration constructs a declarative configuration of the HTTPCORSFilter type for use with @@ -42,7 +42,7 @@ func HTTPCORSFilter() *HTTPCORSFilterApplyConfiguration { // WithAllowOrigins adds the given value to the AllowOrigins field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the AllowOrigins field. -func (b *HTTPCORSFilterApplyConfiguration) WithAllowOrigins(values ...v1.AbsoluteURI) *HTTPCORSFilterApplyConfiguration { +func (b *HTTPCORSFilterApplyConfiguration) WithAllowOrigins(values ...apisv1.AbsoluteURI) *HTTPCORSFilterApplyConfiguration { for i := range values { b.AllowOrigins = append(b.AllowOrigins, values[i]) } @@ -52,7 +52,7 @@ func (b *HTTPCORSFilterApplyConfiguration) WithAllowOrigins(values ...v1.Absolut // WithAllowCredentials sets the AllowCredentials field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the AllowCredentials field is set to the value of the last call. -func (b *HTTPCORSFilterApplyConfiguration) WithAllowCredentials(value v1.TrueField) *HTTPCORSFilterApplyConfiguration { +func (b *HTTPCORSFilterApplyConfiguration) WithAllowCredentials(value apisv1.TrueField) *HTTPCORSFilterApplyConfiguration { b.AllowCredentials = &value return b } @@ -60,7 +60,7 @@ func (b *HTTPCORSFilterApplyConfiguration) WithAllowCredentials(value v1.TrueFie // WithAllowMethods adds the given value to the AllowMethods field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the AllowMethods field. -func (b *HTTPCORSFilterApplyConfiguration) WithAllowMethods(values ...v1.HTTPMethodWithWildcard) *HTTPCORSFilterApplyConfiguration { +func (b *HTTPCORSFilterApplyConfiguration) WithAllowMethods(values ...apisv1.HTTPMethodWithWildcard) *HTTPCORSFilterApplyConfiguration { for i := range values { b.AllowMethods = append(b.AllowMethods, values[i]) } @@ -70,7 +70,7 @@ func (b *HTTPCORSFilterApplyConfiguration) WithAllowMethods(values ...v1.HTTPMet // WithAllowHeaders adds the given value to the AllowHeaders field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the AllowHeaders field. -func (b *HTTPCORSFilterApplyConfiguration) WithAllowHeaders(values ...v1.HTTPHeaderName) *HTTPCORSFilterApplyConfiguration { +func (b *HTTPCORSFilterApplyConfiguration) WithAllowHeaders(values ...apisv1.HTTPHeaderName) *HTTPCORSFilterApplyConfiguration { for i := range values { b.AllowHeaders = append(b.AllowHeaders, values[i]) } @@ -80,7 +80,7 @@ func (b *HTTPCORSFilterApplyConfiguration) WithAllowHeaders(values ...v1.HTTPHea // WithExposeHeaders adds the given value to the ExposeHeaders field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the ExposeHeaders field. -func (b *HTTPCORSFilterApplyConfiguration) WithExposeHeaders(values ...v1.HTTPHeaderName) *HTTPCORSFilterApplyConfiguration { +func (b *HTTPCORSFilterApplyConfiguration) WithExposeHeaders(values ...apisv1.HTTPHeaderName) *HTTPCORSFilterApplyConfiguration { for i := range values { b.ExposeHeaders = append(b.ExposeHeaders, values[i]) } diff --git a/applyconfiguration/apis/v1/httpheader.go b/applyconfiguration/apis/v1/httpheader.go index 9a4bfc8b32..16eebb3f63 100644 --- a/applyconfiguration/apis/v1/httpheader.go +++ b/applyconfiguration/apis/v1/httpheader.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPHeaderApplyConfiguration represents a declarative configuration of the HTTPHeader type for use // with apply. type HTTPHeaderApplyConfiguration struct { - Name *v1.HTTPHeaderName `json:"name,omitempty"` - Value *string `json:"value,omitempty"` + Name *apisv1.HTTPHeaderName `json:"name,omitempty"` + Value *string `json:"value,omitempty"` } // HTTPHeaderApplyConfiguration constructs a declarative configuration of the HTTPHeader type for use with @@ -38,7 +38,7 @@ func HTTPHeader() *HTTPHeaderApplyConfiguration { // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *HTTPHeaderApplyConfiguration) WithName(value v1.HTTPHeaderName) *HTTPHeaderApplyConfiguration { +func (b *HTTPHeaderApplyConfiguration) WithName(value apisv1.HTTPHeaderName) *HTTPHeaderApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1/httpheadermatch.go b/applyconfiguration/apis/v1/httpheadermatch.go index e2ce954a23..d76dd3dfe2 100644 --- a/applyconfiguration/apis/v1/httpheadermatch.go +++ b/applyconfiguration/apis/v1/httpheadermatch.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPHeaderMatchApplyConfiguration represents a declarative configuration of the HTTPHeaderMatch type for use // with apply. type HTTPHeaderMatchApplyConfiguration struct { - Type *v1.HeaderMatchType `json:"type,omitempty"` - Name *v1.HTTPHeaderName `json:"name,omitempty"` - Value *string `json:"value,omitempty"` + Type *apisv1.HeaderMatchType `json:"type,omitempty"` + Name *apisv1.HTTPHeaderName `json:"name,omitempty"` + Value *string `json:"value,omitempty"` } // HTTPHeaderMatchApplyConfiguration constructs a declarative configuration of the HTTPHeaderMatch type for use with @@ -39,7 +39,7 @@ func HTTPHeaderMatch() *HTTPHeaderMatchApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *HTTPHeaderMatchApplyConfiguration) WithType(value v1.HeaderMatchType) *HTTPHeaderMatchApplyConfiguration { +func (b *HTTPHeaderMatchApplyConfiguration) WithType(value apisv1.HeaderMatchType) *HTTPHeaderMatchApplyConfiguration { b.Type = &value return b } @@ -47,7 +47,7 @@ func (b *HTTPHeaderMatchApplyConfiguration) WithType(value v1.HeaderMatchType) * // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *HTTPHeaderMatchApplyConfiguration) WithName(value v1.HTTPHeaderName) *HTTPHeaderMatchApplyConfiguration { +func (b *HTTPHeaderMatchApplyConfiguration) WithName(value apisv1.HTTPHeaderName) *HTTPHeaderMatchApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1/httppathmatch.go b/applyconfiguration/apis/v1/httppathmatch.go index ca21e6dfcc..d1c3f6700f 100644 --- a/applyconfiguration/apis/v1/httppathmatch.go +++ b/applyconfiguration/apis/v1/httppathmatch.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPPathMatchApplyConfiguration represents a declarative configuration of the HTTPPathMatch type for use // with apply. type HTTPPathMatchApplyConfiguration struct { - Type *v1.PathMatchType `json:"type,omitempty"` - Value *string `json:"value,omitempty"` + Type *apisv1.PathMatchType `json:"type,omitempty"` + Value *string `json:"value,omitempty"` } // HTTPPathMatchApplyConfiguration constructs a declarative configuration of the HTTPPathMatch type for use with @@ -38,7 +38,7 @@ func HTTPPathMatch() *HTTPPathMatchApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *HTTPPathMatchApplyConfiguration) WithType(value v1.PathMatchType) *HTTPPathMatchApplyConfiguration { +func (b *HTTPPathMatchApplyConfiguration) WithType(value apisv1.PathMatchType) *HTTPPathMatchApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1/httppathmodifier.go b/applyconfiguration/apis/v1/httppathmodifier.go index 888f3c7f1f..e0aec0d129 100644 --- a/applyconfiguration/apis/v1/httppathmodifier.go +++ b/applyconfiguration/apis/v1/httppathmodifier.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPPathModifierApplyConfiguration represents a declarative configuration of the HTTPPathModifier type for use // with apply. type HTTPPathModifierApplyConfiguration struct { - Type *v1.HTTPPathModifierType `json:"type,omitempty"` - ReplaceFullPath *string `json:"replaceFullPath,omitempty"` - ReplacePrefixMatch *string `json:"replacePrefixMatch,omitempty"` + Type *apisv1.HTTPPathModifierType `json:"type,omitempty"` + ReplaceFullPath *string `json:"replaceFullPath,omitempty"` + ReplacePrefixMatch *string `json:"replacePrefixMatch,omitempty"` } // HTTPPathModifierApplyConfiguration constructs a declarative configuration of the HTTPPathModifier type for use with @@ -39,7 +39,7 @@ func HTTPPathModifier() *HTTPPathModifierApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *HTTPPathModifierApplyConfiguration) WithType(value v1.HTTPPathModifierType) *HTTPPathModifierApplyConfiguration { +func (b *HTTPPathModifierApplyConfiguration) WithType(value apisv1.HTTPPathModifierType) *HTTPPathModifierApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1/httpqueryparammatch.go b/applyconfiguration/apis/v1/httpqueryparammatch.go index ccbdfe941f..a53206adab 100644 --- a/applyconfiguration/apis/v1/httpqueryparammatch.go +++ b/applyconfiguration/apis/v1/httpqueryparammatch.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPQueryParamMatchApplyConfiguration represents a declarative configuration of the HTTPQueryParamMatch type for use // with apply. type HTTPQueryParamMatchApplyConfiguration struct { - Type *v1.QueryParamMatchType `json:"type,omitempty"` - Name *v1.HTTPHeaderName `json:"name,omitempty"` - Value *string `json:"value,omitempty"` + Type *apisv1.QueryParamMatchType `json:"type,omitempty"` + Name *apisv1.HTTPHeaderName `json:"name,omitempty"` + Value *string `json:"value,omitempty"` } // HTTPQueryParamMatchApplyConfiguration constructs a declarative configuration of the HTTPQueryParamMatch type for use with @@ -39,7 +39,7 @@ func HTTPQueryParamMatch() *HTTPQueryParamMatchApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *HTTPQueryParamMatchApplyConfiguration) WithType(value v1.QueryParamMatchType) *HTTPQueryParamMatchApplyConfiguration { +func (b *HTTPQueryParamMatchApplyConfiguration) WithType(value apisv1.QueryParamMatchType) *HTTPQueryParamMatchApplyConfiguration { b.Type = &value return b } @@ -47,7 +47,7 @@ func (b *HTTPQueryParamMatchApplyConfiguration) WithType(value v1.QueryParamMatc // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *HTTPQueryParamMatchApplyConfiguration) WithName(value v1.HTTPHeaderName) *HTTPQueryParamMatchApplyConfiguration { +func (b *HTTPQueryParamMatchApplyConfiguration) WithName(value apisv1.HTTPHeaderName) *HTTPQueryParamMatchApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1/httprequestredirectfilter.go b/applyconfiguration/apis/v1/httprequestredirectfilter.go index 3a0c860070..a9d82b90d5 100644 --- a/applyconfiguration/apis/v1/httprequestredirectfilter.go +++ b/applyconfiguration/apis/v1/httprequestredirectfilter.go @@ -19,16 +19,16 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPRequestRedirectFilterApplyConfiguration represents a declarative configuration of the HTTPRequestRedirectFilter type for use // with apply. type HTTPRequestRedirectFilterApplyConfiguration struct { Scheme *string `json:"scheme,omitempty"` - Hostname *v1.PreciseHostname `json:"hostname,omitempty"` + Hostname *apisv1.PreciseHostname `json:"hostname,omitempty"` Path *HTTPPathModifierApplyConfiguration `json:"path,omitempty"` - Port *v1.PortNumber `json:"port,omitempty"` + Port *apisv1.PortNumber `json:"port,omitempty"` StatusCode *int `json:"statusCode,omitempty"` } @@ -49,7 +49,7 @@ func (b *HTTPRequestRedirectFilterApplyConfiguration) WithScheme(value string) * // WithHostname sets the Hostname field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Hostname field is set to the value of the last call. -func (b *HTTPRequestRedirectFilterApplyConfiguration) WithHostname(value v1.PreciseHostname) *HTTPRequestRedirectFilterApplyConfiguration { +func (b *HTTPRequestRedirectFilterApplyConfiguration) WithHostname(value apisv1.PreciseHostname) *HTTPRequestRedirectFilterApplyConfiguration { b.Hostname = &value return b } @@ -65,7 +65,7 @@ func (b *HTTPRequestRedirectFilterApplyConfiguration) WithPath(value *HTTPPathMo // WithPort sets the Port field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Port field is set to the value of the last call. -func (b *HTTPRequestRedirectFilterApplyConfiguration) WithPort(value v1.PortNumber) *HTTPRequestRedirectFilterApplyConfiguration { +func (b *HTTPRequestRedirectFilterApplyConfiguration) WithPort(value apisv1.PortNumber) *HTTPRequestRedirectFilterApplyConfiguration { b.Port = &value return b } diff --git a/applyconfiguration/apis/v1/httproute.go b/applyconfiguration/apis/v1/httproute.go index ee961e0130..31863abdb7 100644 --- a/applyconfiguration/apis/v1/httproute.go +++ b/applyconfiguration/apis/v1/httproute.go @@ -19,21 +19,21 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" - gatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) // HTTPRouteApplyConfiguration represents a declarative configuration of the HTTPRoute type for use // with apply. type HTTPRouteApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *HTTPRouteSpecApplyConfiguration `json:"spec,omitempty"` - Status *HTTPRouteStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *HTTPRouteSpecApplyConfiguration `json:"spec,omitempty"` + Status *HTTPRouteStatusApplyConfiguration `json:"status,omitempty"` } // HTTPRoute constructs a declarative configuration of the HTTPRoute type for use with @@ -58,18 +58,18 @@ func HTTPRoute(name, namespace string) *HTTPRouteApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractHTTPRoute(hTTPRoute *gatewayapiapisv1.HTTPRoute, fieldManager string) (*HTTPRouteApplyConfiguration, error) { +func ExtractHTTPRoute(hTTPRoute *apisv1.HTTPRoute, fieldManager string) (*HTTPRouteApplyConfiguration, error) { return extractHTTPRoute(hTTPRoute, fieldManager, "") } // ExtractHTTPRouteStatus is the same as ExtractHTTPRoute except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractHTTPRouteStatus(hTTPRoute *gatewayapiapisv1.HTTPRoute, fieldManager string) (*HTTPRouteApplyConfiguration, error) { +func ExtractHTTPRouteStatus(hTTPRoute *apisv1.HTTPRoute, fieldManager string) (*HTTPRouteApplyConfiguration, error) { return extractHTTPRoute(hTTPRoute, fieldManager, "status") } -func extractHTTPRoute(hTTPRoute *gatewayapiapisv1.HTTPRoute, fieldManager string, subresource string) (*HTTPRouteApplyConfiguration, error) { +func extractHTTPRoute(hTTPRoute *apisv1.HTTPRoute, fieldManager string, subresource string) (*HTTPRouteApplyConfiguration, error) { b := &HTTPRouteApplyConfiguration{} err := managedfields.ExtractInto(hTTPRoute, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1.HTTPRoute"), fieldManager, b, subresource) if err != nil { @@ -87,7 +87,7 @@ func extractHTTPRoute(hTTPRoute *gatewayapiapisv1.HTTPRoute, fieldManager string // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithKind(value string) *HTTPRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -95,7 +95,7 @@ func (b *HTTPRouteApplyConfiguration) WithKind(value string) *HTTPRouteApplyConf // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithAPIVersion(value string) *HTTPRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -104,7 +104,7 @@ func (b *HTTPRouteApplyConfiguration) WithAPIVersion(value string) *HTTPRouteApp // If called multiple times, the Name field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithName(value string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -113,7 +113,7 @@ func (b *HTTPRouteApplyConfiguration) WithName(value string) *HTTPRouteApplyConf // If called multiple times, the GenerateName field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithGenerateName(value string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -122,7 +122,7 @@ func (b *HTTPRouteApplyConfiguration) WithGenerateName(value string) *HTTPRouteA // If called multiple times, the Namespace field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithNamespace(value string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -131,7 +131,7 @@ func (b *HTTPRouteApplyConfiguration) WithNamespace(value string) *HTTPRouteAppl // If called multiple times, the UID field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithUID(value types.UID) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -140,7 +140,7 @@ func (b *HTTPRouteApplyConfiguration) WithUID(value types.UID) *HTTPRouteApplyCo // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithResourceVersion(value string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -149,25 +149,25 @@ func (b *HTTPRouteApplyConfiguration) WithResourceVersion(value string) *HTTPRou // If called multiple times, the Generation field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithGeneration(value int64) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *HTTPRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *HTTPRouteApplyConfiguration { +func (b *HTTPRouteApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *HTTPRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *HTTPRouteApplyConfiguration { +func (b *HTTPRouteApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -176,7 +176,7 @@ func (b *HTTPRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) * // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -186,11 +186,11 @@ func (b *HTTPRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64 // overwriting an existing map entries in Labels field with the same key. func (b *HTTPRouteApplyConfiguration) WithLabels(entries map[string]string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -201,11 +201,11 @@ func (b *HTTPRouteApplyConfiguration) WithLabels(entries map[string]string) *HTT // overwriting an existing map entries in Annotations field with the same key. func (b *HTTPRouteApplyConfiguration) WithAnnotations(entries map[string]string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -213,13 +213,13 @@ func (b *HTTPRouteApplyConfiguration) WithAnnotations(entries map[string]string) // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *HTTPRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *HTTPRouteApplyConfiguration { +func (b *HTTPRouteApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -230,14 +230,14 @@ func (b *HTTPRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef func (b *HTTPRouteApplyConfiguration) WithFinalizers(values ...string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *HTTPRouteApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -260,5 +260,5 @@ func (b *HTTPRouteApplyConfiguration) WithStatus(value *HTTPRouteStatusApplyConf // GetName retrieves the value of the Name field in the declarative configuration. func (b *HTTPRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1/httproutefilter.go b/applyconfiguration/apis/v1/httproutefilter.go index 647b1dbaa9..2a46046bc6 100644 --- a/applyconfiguration/apis/v1/httproutefilter.go +++ b/applyconfiguration/apis/v1/httproutefilter.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPRouteFilterApplyConfiguration represents a declarative configuration of the HTTPRouteFilter type for use // with apply. type HTTPRouteFilterApplyConfiguration struct { - Type *v1.HTTPRouteFilterType `json:"type,omitempty"` + Type *apisv1.HTTPRouteFilterType `json:"type,omitempty"` RequestHeaderModifier *HTTPHeaderFilterApplyConfiguration `json:"requestHeaderModifier,omitempty"` ResponseHeaderModifier *HTTPHeaderFilterApplyConfiguration `json:"responseHeaderModifier,omitempty"` RequestMirror *HTTPRequestMirrorFilterApplyConfiguration `json:"requestMirror,omitempty"` @@ -44,7 +44,7 @@ func HTTPRouteFilter() *HTTPRouteFilterApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *HTTPRouteFilterApplyConfiguration) WithType(value v1.HTTPRouteFilterType) *HTTPRouteFilterApplyConfiguration { +func (b *HTTPRouteFilterApplyConfiguration) WithType(value apisv1.HTTPRouteFilterType) *HTTPRouteFilterApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1/httprouteretry.go b/applyconfiguration/apis/v1/httprouteretry.go index 7528bccee8..71c6ec1c0f 100644 --- a/applyconfiguration/apis/v1/httprouteretry.go +++ b/applyconfiguration/apis/v1/httprouteretry.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPRouteRetryApplyConfiguration represents a declarative configuration of the HTTPRouteRetry type for use // with apply. type HTTPRouteRetryApplyConfiguration struct { - Codes []v1.HTTPRouteRetryStatusCode `json:"codes,omitempty"` - Attempts *int `json:"attempts,omitempty"` - Backoff *v1.Duration `json:"backoff,omitempty"` + Codes []apisv1.HTTPRouteRetryStatusCode `json:"codes,omitempty"` + Attempts *int `json:"attempts,omitempty"` + Backoff *apisv1.Duration `json:"backoff,omitempty"` } // HTTPRouteRetryApplyConfiguration constructs a declarative configuration of the HTTPRouteRetry type for use with @@ -39,7 +39,7 @@ func HTTPRouteRetry() *HTTPRouteRetryApplyConfiguration { // WithCodes adds the given value to the Codes field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the Codes field. -func (b *HTTPRouteRetryApplyConfiguration) WithCodes(values ...v1.HTTPRouteRetryStatusCode) *HTTPRouteRetryApplyConfiguration { +func (b *HTTPRouteRetryApplyConfiguration) WithCodes(values ...apisv1.HTTPRouteRetryStatusCode) *HTTPRouteRetryApplyConfiguration { for i := range values { b.Codes = append(b.Codes, values[i]) } @@ -57,7 +57,7 @@ func (b *HTTPRouteRetryApplyConfiguration) WithAttempts(value int) *HTTPRouteRet // WithBackoff sets the Backoff field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Backoff field is set to the value of the last call. -func (b *HTTPRouteRetryApplyConfiguration) WithBackoff(value v1.Duration) *HTTPRouteRetryApplyConfiguration { +func (b *HTTPRouteRetryApplyConfiguration) WithBackoff(value apisv1.Duration) *HTTPRouteRetryApplyConfiguration { b.Backoff = &value return b } diff --git a/applyconfiguration/apis/v1/httprouterule.go b/applyconfiguration/apis/v1/httprouterule.go index b7ac89a7a8..57300a317c 100644 --- a/applyconfiguration/apis/v1/httprouterule.go +++ b/applyconfiguration/apis/v1/httprouterule.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPRouteRuleApplyConfiguration represents a declarative configuration of the HTTPRouteRule type for use // with apply. type HTTPRouteRuleApplyConfiguration struct { - Name *v1.SectionName `json:"name,omitempty"` + Name *apisv1.SectionName `json:"name,omitempty"` Matches []HTTPRouteMatchApplyConfiguration `json:"matches,omitempty"` Filters []HTTPRouteFilterApplyConfiguration `json:"filters,omitempty"` BackendRefs []HTTPBackendRefApplyConfiguration `json:"backendRefs,omitempty"` @@ -43,7 +43,7 @@ func HTTPRouteRule() *HTTPRouteRuleApplyConfiguration { // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *HTTPRouteRuleApplyConfiguration) WithName(value v1.SectionName) *HTTPRouteRuleApplyConfiguration { +func (b *HTTPRouteRuleApplyConfiguration) WithName(value apisv1.SectionName) *HTTPRouteRuleApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1/httproutespec.go b/applyconfiguration/apis/v1/httproutespec.go index e12516149a..439ddbd9d6 100644 --- a/applyconfiguration/apis/v1/httproutespec.go +++ b/applyconfiguration/apis/v1/httproutespec.go @@ -44,7 +44,7 @@ func (b *HTTPRouteSpecApplyConfiguration) WithParentRefs(values ...*ParentRefere if values[i] == nil { panic("nil value passed to WithParentRefs") } - b.ParentRefs = append(b.ParentRefs, *values[i]) + b.CommonRouteSpecApplyConfiguration.ParentRefs = append(b.CommonRouteSpecApplyConfiguration.ParentRefs, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1/httproutestatus.go b/applyconfiguration/apis/v1/httproutestatus.go index d7fce10d1e..6f8128dc37 100644 --- a/applyconfiguration/apis/v1/httproutestatus.go +++ b/applyconfiguration/apis/v1/httproutestatus.go @@ -38,7 +38,7 @@ func (b *HTTPRouteStatusApplyConfiguration) WithParents(values ...*RouteParentSt if values[i] == nil { panic("nil value passed to WithParents") } - b.Parents = append(b.Parents, *values[i]) + b.RouteStatusApplyConfiguration.Parents = append(b.RouteStatusApplyConfiguration.Parents, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1/httproutetimeouts.go b/applyconfiguration/apis/v1/httproutetimeouts.go index 98a1a9909a..0e77bb2101 100644 --- a/applyconfiguration/apis/v1/httproutetimeouts.go +++ b/applyconfiguration/apis/v1/httproutetimeouts.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPRouteTimeoutsApplyConfiguration represents a declarative configuration of the HTTPRouteTimeouts type for use // with apply. type HTTPRouteTimeoutsApplyConfiguration struct { - Request *v1.Duration `json:"request,omitempty"` - BackendRequest *v1.Duration `json:"backendRequest,omitempty"` + Request *apisv1.Duration `json:"request,omitempty"` + BackendRequest *apisv1.Duration `json:"backendRequest,omitempty"` } // HTTPRouteTimeoutsApplyConfiguration constructs a declarative configuration of the HTTPRouteTimeouts type for use with @@ -38,7 +38,7 @@ func HTTPRouteTimeouts() *HTTPRouteTimeoutsApplyConfiguration { // WithRequest sets the Request field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Request field is set to the value of the last call. -func (b *HTTPRouteTimeoutsApplyConfiguration) WithRequest(value v1.Duration) *HTTPRouteTimeoutsApplyConfiguration { +func (b *HTTPRouteTimeoutsApplyConfiguration) WithRequest(value apisv1.Duration) *HTTPRouteTimeoutsApplyConfiguration { b.Request = &value return b } @@ -46,7 +46,7 @@ func (b *HTTPRouteTimeoutsApplyConfiguration) WithRequest(value v1.Duration) *HT // WithBackendRequest sets the BackendRequest field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the BackendRequest field is set to the value of the last call. -func (b *HTTPRouteTimeoutsApplyConfiguration) WithBackendRequest(value v1.Duration) *HTTPRouteTimeoutsApplyConfiguration { +func (b *HTTPRouteTimeoutsApplyConfiguration) WithBackendRequest(value apisv1.Duration) *HTTPRouteTimeoutsApplyConfiguration { b.BackendRequest = &value return b } diff --git a/applyconfiguration/apis/v1/httpurlrewritefilter.go b/applyconfiguration/apis/v1/httpurlrewritefilter.go index 9761c24c28..07d45ad216 100644 --- a/applyconfiguration/apis/v1/httpurlrewritefilter.go +++ b/applyconfiguration/apis/v1/httpurlrewritefilter.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPURLRewriteFilterApplyConfiguration represents a declarative configuration of the HTTPURLRewriteFilter type for use // with apply. type HTTPURLRewriteFilterApplyConfiguration struct { - Hostname *v1.PreciseHostname `json:"hostname,omitempty"` + Hostname *apisv1.PreciseHostname `json:"hostname,omitempty"` Path *HTTPPathModifierApplyConfiguration `json:"path,omitempty"` } @@ -38,7 +38,7 @@ func HTTPURLRewriteFilter() *HTTPURLRewriteFilterApplyConfiguration { // WithHostname sets the Hostname field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Hostname field is set to the value of the last call. -func (b *HTTPURLRewriteFilterApplyConfiguration) WithHostname(value v1.PreciseHostname) *HTTPURLRewriteFilterApplyConfiguration { +func (b *HTTPURLRewriteFilterApplyConfiguration) WithHostname(value apisv1.PreciseHostname) *HTTPURLRewriteFilterApplyConfiguration { b.Hostname = &value return b } diff --git a/applyconfiguration/apis/v1/listener.go b/applyconfiguration/apis/v1/listener.go index 5301fa46de..35be06a768 100644 --- a/applyconfiguration/apis/v1/listener.go +++ b/applyconfiguration/apis/v1/listener.go @@ -19,16 +19,16 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // ListenerApplyConfiguration represents a declarative configuration of the Listener type for use // with apply. type ListenerApplyConfiguration struct { - Name *v1.SectionName `json:"name,omitempty"` - Hostname *v1.Hostname `json:"hostname,omitempty"` - Port *v1.PortNumber `json:"port,omitempty"` - Protocol *v1.ProtocolType `json:"protocol,omitempty"` + Name *apisv1.SectionName `json:"name,omitempty"` + Hostname *apisv1.Hostname `json:"hostname,omitempty"` + Port *apisv1.PortNumber `json:"port,omitempty"` + Protocol *apisv1.ProtocolType `json:"protocol,omitempty"` TLS *GatewayTLSConfigApplyConfiguration `json:"tls,omitempty"` AllowedRoutes *AllowedRoutesApplyConfiguration `json:"allowedRoutes,omitempty"` } @@ -42,7 +42,7 @@ func Listener() *ListenerApplyConfiguration { // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *ListenerApplyConfiguration) WithName(value v1.SectionName) *ListenerApplyConfiguration { +func (b *ListenerApplyConfiguration) WithName(value apisv1.SectionName) *ListenerApplyConfiguration { b.Name = &value return b } @@ -50,7 +50,7 @@ func (b *ListenerApplyConfiguration) WithName(value v1.SectionName) *ListenerApp // WithHostname sets the Hostname field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Hostname field is set to the value of the last call. -func (b *ListenerApplyConfiguration) WithHostname(value v1.Hostname) *ListenerApplyConfiguration { +func (b *ListenerApplyConfiguration) WithHostname(value apisv1.Hostname) *ListenerApplyConfiguration { b.Hostname = &value return b } @@ -58,7 +58,7 @@ func (b *ListenerApplyConfiguration) WithHostname(value v1.Hostname) *ListenerAp // WithPort sets the Port field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Port field is set to the value of the last call. -func (b *ListenerApplyConfiguration) WithPort(value v1.PortNumber) *ListenerApplyConfiguration { +func (b *ListenerApplyConfiguration) WithPort(value apisv1.PortNumber) *ListenerApplyConfiguration { b.Port = &value return b } @@ -66,7 +66,7 @@ func (b *ListenerApplyConfiguration) WithPort(value v1.PortNumber) *ListenerAppl // WithProtocol sets the Protocol field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Protocol field is set to the value of the last call. -func (b *ListenerApplyConfiguration) WithProtocol(value v1.ProtocolType) *ListenerApplyConfiguration { +func (b *ListenerApplyConfiguration) WithProtocol(value apisv1.ProtocolType) *ListenerApplyConfiguration { b.Protocol = &value return b } diff --git a/applyconfiguration/apis/v1/listenernamespaces.go b/applyconfiguration/apis/v1/listenernamespaces.go index d6869648bb..bc44b1a259 100644 --- a/applyconfiguration/apis/v1/listenernamespaces.go +++ b/applyconfiguration/apis/v1/listenernamespaces.go @@ -20,13 +20,13 @@ package v1 import ( metav1 "k8s.io/client-go/applyconfigurations/meta/v1" - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // ListenerNamespacesApplyConfiguration represents a declarative configuration of the ListenerNamespaces type for use // with apply. type ListenerNamespacesApplyConfiguration struct { - From *v1.FromNamespaces `json:"from,omitempty"` + From *apisv1.FromNamespaces `json:"from,omitempty"` Selector *metav1.LabelSelectorApplyConfiguration `json:"selector,omitempty"` } @@ -39,7 +39,7 @@ func ListenerNamespaces() *ListenerNamespacesApplyConfiguration { // WithFrom sets the From field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the From field is set to the value of the last call. -func (b *ListenerNamespacesApplyConfiguration) WithFrom(value v1.FromNamespaces) *ListenerNamespacesApplyConfiguration { +func (b *ListenerNamespacesApplyConfiguration) WithFrom(value apisv1.FromNamespaces) *ListenerNamespacesApplyConfiguration { b.From = &value return b } diff --git a/applyconfiguration/apis/v1/listenerstatus.go b/applyconfiguration/apis/v1/listenerstatus.go index 88a877c6dc..16692c325a 100644 --- a/applyconfiguration/apis/v1/listenerstatus.go +++ b/applyconfiguration/apis/v1/listenerstatus.go @@ -20,13 +20,13 @@ package v1 import ( metav1 "k8s.io/client-go/applyconfigurations/meta/v1" - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // ListenerStatusApplyConfiguration represents a declarative configuration of the ListenerStatus type for use // with apply. type ListenerStatusApplyConfiguration struct { - Name *v1.SectionName `json:"name,omitempty"` + Name *apisv1.SectionName `json:"name,omitempty"` SupportedKinds []RouteGroupKindApplyConfiguration `json:"supportedKinds,omitempty"` AttachedRoutes *int32 `json:"attachedRoutes,omitempty"` Conditions []metav1.ConditionApplyConfiguration `json:"conditions,omitempty"` @@ -41,7 +41,7 @@ func ListenerStatus() *ListenerStatusApplyConfiguration { // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *ListenerStatusApplyConfiguration) WithName(value v1.SectionName) *ListenerStatusApplyConfiguration { +func (b *ListenerStatusApplyConfiguration) WithName(value apisv1.SectionName) *ListenerStatusApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1/localobjectreference.go b/applyconfiguration/apis/v1/localobjectreference.go index 7d7c7a121b..1c9ade9c32 100644 --- a/applyconfiguration/apis/v1/localobjectreference.go +++ b/applyconfiguration/apis/v1/localobjectreference.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // LocalObjectReferenceApplyConfiguration represents a declarative configuration of the LocalObjectReference type for use // with apply. type LocalObjectReferenceApplyConfiguration struct { - Group *v1.Group `json:"group,omitempty"` - Kind *v1.Kind `json:"kind,omitempty"` - Name *v1.ObjectName `json:"name,omitempty"` + Group *apisv1.Group `json:"group,omitempty"` + Kind *apisv1.Kind `json:"kind,omitempty"` + Name *apisv1.ObjectName `json:"name,omitempty"` } // LocalObjectReferenceApplyConfiguration constructs a declarative configuration of the LocalObjectReference type for use with @@ -39,7 +39,7 @@ func LocalObjectReference() *LocalObjectReferenceApplyConfiguration { // WithGroup sets the Group field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. -func (b *LocalObjectReferenceApplyConfiguration) WithGroup(value v1.Group) *LocalObjectReferenceApplyConfiguration { +func (b *LocalObjectReferenceApplyConfiguration) WithGroup(value apisv1.Group) *LocalObjectReferenceApplyConfiguration { b.Group = &value return b } @@ -47,7 +47,7 @@ func (b *LocalObjectReferenceApplyConfiguration) WithGroup(value v1.Group) *Loca // WithKind sets the Kind field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. -func (b *LocalObjectReferenceApplyConfiguration) WithKind(value v1.Kind) *LocalObjectReferenceApplyConfiguration { +func (b *LocalObjectReferenceApplyConfiguration) WithKind(value apisv1.Kind) *LocalObjectReferenceApplyConfiguration { b.Kind = &value return b } @@ -55,7 +55,7 @@ func (b *LocalObjectReferenceApplyConfiguration) WithKind(value v1.Kind) *LocalO // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *LocalObjectReferenceApplyConfiguration) WithName(value v1.ObjectName) *LocalObjectReferenceApplyConfiguration { +func (b *LocalObjectReferenceApplyConfiguration) WithName(value apisv1.ObjectName) *LocalObjectReferenceApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1/localparametersreference.go b/applyconfiguration/apis/v1/localparametersreference.go index cde618b044..a4e152dccf 100644 --- a/applyconfiguration/apis/v1/localparametersreference.go +++ b/applyconfiguration/apis/v1/localparametersreference.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // LocalParametersReferenceApplyConfiguration represents a declarative configuration of the LocalParametersReference type for use // with apply. type LocalParametersReferenceApplyConfiguration struct { - Group *v1.Group `json:"group,omitempty"` - Kind *v1.Kind `json:"kind,omitempty"` - Name *string `json:"name,omitempty"` + Group *apisv1.Group `json:"group,omitempty"` + Kind *apisv1.Kind `json:"kind,omitempty"` + Name *string `json:"name,omitempty"` } // LocalParametersReferenceApplyConfiguration constructs a declarative configuration of the LocalParametersReference type for use with @@ -39,7 +39,7 @@ func LocalParametersReference() *LocalParametersReferenceApplyConfiguration { // WithGroup sets the Group field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. -func (b *LocalParametersReferenceApplyConfiguration) WithGroup(value v1.Group) *LocalParametersReferenceApplyConfiguration { +func (b *LocalParametersReferenceApplyConfiguration) WithGroup(value apisv1.Group) *LocalParametersReferenceApplyConfiguration { b.Group = &value return b } @@ -47,7 +47,7 @@ func (b *LocalParametersReferenceApplyConfiguration) WithGroup(value v1.Group) * // WithKind sets the Kind field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. -func (b *LocalParametersReferenceApplyConfiguration) WithKind(value v1.Kind) *LocalParametersReferenceApplyConfiguration { +func (b *LocalParametersReferenceApplyConfiguration) WithKind(value apisv1.Kind) *LocalParametersReferenceApplyConfiguration { b.Kind = &value return b } diff --git a/applyconfiguration/apis/v1/objectreference.go b/applyconfiguration/apis/v1/objectreference.go index b35f2eaf02..155fb0f8d4 100644 --- a/applyconfiguration/apis/v1/objectreference.go +++ b/applyconfiguration/apis/v1/objectreference.go @@ -19,16 +19,16 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // ObjectReferenceApplyConfiguration represents a declarative configuration of the ObjectReference type for use // with apply. type ObjectReferenceApplyConfiguration struct { - Group *v1.Group `json:"group,omitempty"` - Kind *v1.Kind `json:"kind,omitempty"` - Name *v1.ObjectName `json:"name,omitempty"` - Namespace *v1.Namespace `json:"namespace,omitempty"` + Group *apisv1.Group `json:"group,omitempty"` + Kind *apisv1.Kind `json:"kind,omitempty"` + Name *apisv1.ObjectName `json:"name,omitempty"` + Namespace *apisv1.Namespace `json:"namespace,omitempty"` } // ObjectReferenceApplyConfiguration constructs a declarative configuration of the ObjectReference type for use with @@ -40,7 +40,7 @@ func ObjectReference() *ObjectReferenceApplyConfiguration { // WithGroup sets the Group field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. -func (b *ObjectReferenceApplyConfiguration) WithGroup(value v1.Group) *ObjectReferenceApplyConfiguration { +func (b *ObjectReferenceApplyConfiguration) WithGroup(value apisv1.Group) *ObjectReferenceApplyConfiguration { b.Group = &value return b } @@ -48,7 +48,7 @@ func (b *ObjectReferenceApplyConfiguration) WithGroup(value v1.Group) *ObjectRef // WithKind sets the Kind field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. -func (b *ObjectReferenceApplyConfiguration) WithKind(value v1.Kind) *ObjectReferenceApplyConfiguration { +func (b *ObjectReferenceApplyConfiguration) WithKind(value apisv1.Kind) *ObjectReferenceApplyConfiguration { b.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *ObjectReferenceApplyConfiguration) WithKind(value v1.Kind) *ObjectRefer // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *ObjectReferenceApplyConfiguration) WithName(value v1.ObjectName) *ObjectReferenceApplyConfiguration { +func (b *ObjectReferenceApplyConfiguration) WithName(value apisv1.ObjectName) *ObjectReferenceApplyConfiguration { b.Name = &value return b } @@ -64,7 +64,7 @@ func (b *ObjectReferenceApplyConfiguration) WithName(value v1.ObjectName) *Objec // WithNamespace sets the Namespace field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Namespace field is set to the value of the last call. -func (b *ObjectReferenceApplyConfiguration) WithNamespace(value v1.Namespace) *ObjectReferenceApplyConfiguration { +func (b *ObjectReferenceApplyConfiguration) WithNamespace(value apisv1.Namespace) *ObjectReferenceApplyConfiguration { b.Namespace = &value return b } diff --git a/applyconfiguration/apis/v1/parametersreference.go b/applyconfiguration/apis/v1/parametersreference.go index 2f245e5373..ea397a69ac 100644 --- a/applyconfiguration/apis/v1/parametersreference.go +++ b/applyconfiguration/apis/v1/parametersreference.go @@ -19,16 +19,16 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // ParametersReferenceApplyConfiguration represents a declarative configuration of the ParametersReference type for use // with apply. type ParametersReferenceApplyConfiguration struct { - Group *v1.Group `json:"group,omitempty"` - Kind *v1.Kind `json:"kind,omitempty"` - Name *string `json:"name,omitempty"` - Namespace *v1.Namespace `json:"namespace,omitempty"` + Group *apisv1.Group `json:"group,omitempty"` + Kind *apisv1.Kind `json:"kind,omitempty"` + Name *string `json:"name,omitempty"` + Namespace *apisv1.Namespace `json:"namespace,omitempty"` } // ParametersReferenceApplyConfiguration constructs a declarative configuration of the ParametersReference type for use with @@ -40,7 +40,7 @@ func ParametersReference() *ParametersReferenceApplyConfiguration { // WithGroup sets the Group field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. -func (b *ParametersReferenceApplyConfiguration) WithGroup(value v1.Group) *ParametersReferenceApplyConfiguration { +func (b *ParametersReferenceApplyConfiguration) WithGroup(value apisv1.Group) *ParametersReferenceApplyConfiguration { b.Group = &value return b } @@ -48,7 +48,7 @@ func (b *ParametersReferenceApplyConfiguration) WithGroup(value v1.Group) *Param // WithKind sets the Kind field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. -func (b *ParametersReferenceApplyConfiguration) WithKind(value v1.Kind) *ParametersReferenceApplyConfiguration { +func (b *ParametersReferenceApplyConfiguration) WithKind(value apisv1.Kind) *ParametersReferenceApplyConfiguration { b.Kind = &value return b } @@ -64,7 +64,7 @@ func (b *ParametersReferenceApplyConfiguration) WithName(value string) *Paramete // WithNamespace sets the Namespace field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Namespace field is set to the value of the last call. -func (b *ParametersReferenceApplyConfiguration) WithNamespace(value v1.Namespace) *ParametersReferenceApplyConfiguration { +func (b *ParametersReferenceApplyConfiguration) WithNamespace(value apisv1.Namespace) *ParametersReferenceApplyConfiguration { b.Namespace = &value return b } diff --git a/applyconfiguration/apis/v1/parentreference.go b/applyconfiguration/apis/v1/parentreference.go index 612dd2afab..b0cb0652b5 100644 --- a/applyconfiguration/apis/v1/parentreference.go +++ b/applyconfiguration/apis/v1/parentreference.go @@ -19,18 +19,18 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // ParentReferenceApplyConfiguration represents a declarative configuration of the ParentReference type for use // with apply. type ParentReferenceApplyConfiguration struct { - Group *v1.Group `json:"group,omitempty"` - Kind *v1.Kind `json:"kind,omitempty"` - Namespace *v1.Namespace `json:"namespace,omitempty"` - Name *v1.ObjectName `json:"name,omitempty"` - SectionName *v1.SectionName `json:"sectionName,omitempty"` - Port *v1.PortNumber `json:"port,omitempty"` + Group *apisv1.Group `json:"group,omitempty"` + Kind *apisv1.Kind `json:"kind,omitempty"` + Namespace *apisv1.Namespace `json:"namespace,omitempty"` + Name *apisv1.ObjectName `json:"name,omitempty"` + SectionName *apisv1.SectionName `json:"sectionName,omitempty"` + Port *apisv1.PortNumber `json:"port,omitempty"` } // ParentReferenceApplyConfiguration constructs a declarative configuration of the ParentReference type for use with @@ -42,7 +42,7 @@ func ParentReference() *ParentReferenceApplyConfiguration { // WithGroup sets the Group field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. -func (b *ParentReferenceApplyConfiguration) WithGroup(value v1.Group) *ParentReferenceApplyConfiguration { +func (b *ParentReferenceApplyConfiguration) WithGroup(value apisv1.Group) *ParentReferenceApplyConfiguration { b.Group = &value return b } @@ -50,7 +50,7 @@ func (b *ParentReferenceApplyConfiguration) WithGroup(value v1.Group) *ParentRef // WithKind sets the Kind field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. -func (b *ParentReferenceApplyConfiguration) WithKind(value v1.Kind) *ParentReferenceApplyConfiguration { +func (b *ParentReferenceApplyConfiguration) WithKind(value apisv1.Kind) *ParentReferenceApplyConfiguration { b.Kind = &value return b } @@ -58,7 +58,7 @@ func (b *ParentReferenceApplyConfiguration) WithKind(value v1.Kind) *ParentRefer // WithNamespace sets the Namespace field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Namespace field is set to the value of the last call. -func (b *ParentReferenceApplyConfiguration) WithNamespace(value v1.Namespace) *ParentReferenceApplyConfiguration { +func (b *ParentReferenceApplyConfiguration) WithNamespace(value apisv1.Namespace) *ParentReferenceApplyConfiguration { b.Namespace = &value return b } @@ -66,7 +66,7 @@ func (b *ParentReferenceApplyConfiguration) WithNamespace(value v1.Namespace) *P // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *ParentReferenceApplyConfiguration) WithName(value v1.ObjectName) *ParentReferenceApplyConfiguration { +func (b *ParentReferenceApplyConfiguration) WithName(value apisv1.ObjectName) *ParentReferenceApplyConfiguration { b.Name = &value return b } @@ -74,7 +74,7 @@ func (b *ParentReferenceApplyConfiguration) WithName(value v1.ObjectName) *Paren // WithSectionName sets the SectionName field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the SectionName field is set to the value of the last call. -func (b *ParentReferenceApplyConfiguration) WithSectionName(value v1.SectionName) *ParentReferenceApplyConfiguration { +func (b *ParentReferenceApplyConfiguration) WithSectionName(value apisv1.SectionName) *ParentReferenceApplyConfiguration { b.SectionName = &value return b } @@ -82,7 +82,7 @@ func (b *ParentReferenceApplyConfiguration) WithSectionName(value v1.SectionName // WithPort sets the Port field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Port field is set to the value of the last call. -func (b *ParentReferenceApplyConfiguration) WithPort(value v1.PortNumber) *ParentReferenceApplyConfiguration { +func (b *ParentReferenceApplyConfiguration) WithPort(value apisv1.PortNumber) *ParentReferenceApplyConfiguration { b.Port = &value return b } diff --git a/applyconfiguration/apis/v1/routegroupkind.go b/applyconfiguration/apis/v1/routegroupkind.go index 470ae4074f..cbaa6a9c15 100644 --- a/applyconfiguration/apis/v1/routegroupkind.go +++ b/applyconfiguration/apis/v1/routegroupkind.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // RouteGroupKindApplyConfiguration represents a declarative configuration of the RouteGroupKind type for use // with apply. type RouteGroupKindApplyConfiguration struct { - Group *v1.Group `json:"group,omitempty"` - Kind *v1.Kind `json:"kind,omitempty"` + Group *apisv1.Group `json:"group,omitempty"` + Kind *apisv1.Kind `json:"kind,omitempty"` } // RouteGroupKindApplyConfiguration constructs a declarative configuration of the RouteGroupKind type for use with @@ -38,7 +38,7 @@ func RouteGroupKind() *RouteGroupKindApplyConfiguration { // WithGroup sets the Group field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. -func (b *RouteGroupKindApplyConfiguration) WithGroup(value v1.Group) *RouteGroupKindApplyConfiguration { +func (b *RouteGroupKindApplyConfiguration) WithGroup(value apisv1.Group) *RouteGroupKindApplyConfiguration { b.Group = &value return b } @@ -46,7 +46,7 @@ func (b *RouteGroupKindApplyConfiguration) WithGroup(value v1.Group) *RouteGroup // WithKind sets the Kind field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. -func (b *RouteGroupKindApplyConfiguration) WithKind(value v1.Kind) *RouteGroupKindApplyConfiguration { +func (b *RouteGroupKindApplyConfiguration) WithKind(value apisv1.Kind) *RouteGroupKindApplyConfiguration { b.Kind = &value return b } diff --git a/applyconfiguration/apis/v1/routenamespaces.go b/applyconfiguration/apis/v1/routenamespaces.go index 33a172897c..98a26155eb 100644 --- a/applyconfiguration/apis/v1/routenamespaces.go +++ b/applyconfiguration/apis/v1/routenamespaces.go @@ -20,13 +20,13 @@ package v1 import ( metav1 "k8s.io/client-go/applyconfigurations/meta/v1" - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // RouteNamespacesApplyConfiguration represents a declarative configuration of the RouteNamespaces type for use // with apply. type RouteNamespacesApplyConfiguration struct { - From *v1.FromNamespaces `json:"from,omitempty"` + From *apisv1.FromNamespaces `json:"from,omitempty"` Selector *metav1.LabelSelectorApplyConfiguration `json:"selector,omitempty"` } @@ -39,7 +39,7 @@ func RouteNamespaces() *RouteNamespacesApplyConfiguration { // WithFrom sets the From field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the From field is set to the value of the last call. -func (b *RouteNamespacesApplyConfiguration) WithFrom(value v1.FromNamespaces) *RouteNamespacesApplyConfiguration { +func (b *RouteNamespacesApplyConfiguration) WithFrom(value apisv1.FromNamespaces) *RouteNamespacesApplyConfiguration { b.From = &value return b } diff --git a/applyconfiguration/apis/v1/secretobjectreference.go b/applyconfiguration/apis/v1/secretobjectreference.go index 654f898232..f69c947fe8 100644 --- a/applyconfiguration/apis/v1/secretobjectreference.go +++ b/applyconfiguration/apis/v1/secretobjectreference.go @@ -19,16 +19,16 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // SecretObjectReferenceApplyConfiguration represents a declarative configuration of the SecretObjectReference type for use // with apply. type SecretObjectReferenceApplyConfiguration struct { - Group *v1.Group `json:"group,omitempty"` - Kind *v1.Kind `json:"kind,omitempty"` - Name *v1.ObjectName `json:"name,omitempty"` - Namespace *v1.Namespace `json:"namespace,omitempty"` + Group *apisv1.Group `json:"group,omitempty"` + Kind *apisv1.Kind `json:"kind,omitempty"` + Name *apisv1.ObjectName `json:"name,omitempty"` + Namespace *apisv1.Namespace `json:"namespace,omitempty"` } // SecretObjectReferenceApplyConfiguration constructs a declarative configuration of the SecretObjectReference type for use with @@ -40,7 +40,7 @@ func SecretObjectReference() *SecretObjectReferenceApplyConfiguration { // WithGroup sets the Group field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. -func (b *SecretObjectReferenceApplyConfiguration) WithGroup(value v1.Group) *SecretObjectReferenceApplyConfiguration { +func (b *SecretObjectReferenceApplyConfiguration) WithGroup(value apisv1.Group) *SecretObjectReferenceApplyConfiguration { b.Group = &value return b } @@ -48,7 +48,7 @@ func (b *SecretObjectReferenceApplyConfiguration) WithGroup(value v1.Group) *Sec // WithKind sets the Kind field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. -func (b *SecretObjectReferenceApplyConfiguration) WithKind(value v1.Kind) *SecretObjectReferenceApplyConfiguration { +func (b *SecretObjectReferenceApplyConfiguration) WithKind(value apisv1.Kind) *SecretObjectReferenceApplyConfiguration { b.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *SecretObjectReferenceApplyConfiguration) WithKind(value v1.Kind) *Secre // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *SecretObjectReferenceApplyConfiguration) WithName(value v1.ObjectName) *SecretObjectReferenceApplyConfiguration { +func (b *SecretObjectReferenceApplyConfiguration) WithName(value apisv1.ObjectName) *SecretObjectReferenceApplyConfiguration { b.Name = &value return b } @@ -64,7 +64,7 @@ func (b *SecretObjectReferenceApplyConfiguration) WithName(value v1.ObjectName) // WithNamespace sets the Namespace field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Namespace field is set to the value of the last call. -func (b *SecretObjectReferenceApplyConfiguration) WithNamespace(value v1.Namespace) *SecretObjectReferenceApplyConfiguration { +func (b *SecretObjectReferenceApplyConfiguration) WithNamespace(value apisv1.Namespace) *SecretObjectReferenceApplyConfiguration { b.Namespace = &value return b } diff --git a/applyconfiguration/apis/v1/sessionpersistence.go b/applyconfiguration/apis/v1/sessionpersistence.go index b20b07ce86..9066e3018e 100644 --- a/applyconfiguration/apis/v1/sessionpersistence.go +++ b/applyconfiguration/apis/v1/sessionpersistence.go @@ -19,16 +19,16 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // SessionPersistenceApplyConfiguration represents a declarative configuration of the SessionPersistence type for use // with apply. type SessionPersistenceApplyConfiguration struct { SessionName *string `json:"sessionName,omitempty"` - AbsoluteTimeout *v1.Duration `json:"absoluteTimeout,omitempty"` - IdleTimeout *v1.Duration `json:"idleTimeout,omitempty"` - Type *v1.SessionPersistenceType `json:"type,omitempty"` + AbsoluteTimeout *apisv1.Duration `json:"absoluteTimeout,omitempty"` + IdleTimeout *apisv1.Duration `json:"idleTimeout,omitempty"` + Type *apisv1.SessionPersistenceType `json:"type,omitempty"` CookieConfig *CookieConfigApplyConfiguration `json:"cookieConfig,omitempty"` } @@ -49,7 +49,7 @@ func (b *SessionPersistenceApplyConfiguration) WithSessionName(value string) *Se // WithAbsoluteTimeout sets the AbsoluteTimeout field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the AbsoluteTimeout field is set to the value of the last call. -func (b *SessionPersistenceApplyConfiguration) WithAbsoluteTimeout(value v1.Duration) *SessionPersistenceApplyConfiguration { +func (b *SessionPersistenceApplyConfiguration) WithAbsoluteTimeout(value apisv1.Duration) *SessionPersistenceApplyConfiguration { b.AbsoluteTimeout = &value return b } @@ -57,7 +57,7 @@ func (b *SessionPersistenceApplyConfiguration) WithAbsoluteTimeout(value v1.Dura // WithIdleTimeout sets the IdleTimeout field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the IdleTimeout field is set to the value of the last call. -func (b *SessionPersistenceApplyConfiguration) WithIdleTimeout(value v1.Duration) *SessionPersistenceApplyConfiguration { +func (b *SessionPersistenceApplyConfiguration) WithIdleTimeout(value apisv1.Duration) *SessionPersistenceApplyConfiguration { b.IdleTimeout = &value return b } @@ -65,7 +65,7 @@ func (b *SessionPersistenceApplyConfiguration) WithIdleTimeout(value v1.Duration // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *SessionPersistenceApplyConfiguration) WithType(value v1.SessionPersistenceType) *SessionPersistenceApplyConfiguration { +func (b *SessionPersistenceApplyConfiguration) WithType(value apisv1.SessionPersistenceType) *SessionPersistenceApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1/supportedfeature.go b/applyconfiguration/apis/v1/supportedfeature.go index 90de05d24d..c59876bebd 100644 --- a/applyconfiguration/apis/v1/supportedfeature.go +++ b/applyconfiguration/apis/v1/supportedfeature.go @@ -19,13 +19,13 @@ limitations under the License. package v1 import ( - v1 "sigs.k8s.io/gateway-api/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // SupportedFeatureApplyConfiguration represents a declarative configuration of the SupportedFeature type for use // with apply. type SupportedFeatureApplyConfiguration struct { - Name *v1.FeatureName `json:"name,omitempty"` + Name *apisv1.FeatureName `json:"name,omitempty"` } // SupportedFeatureApplyConfiguration constructs a declarative configuration of the SupportedFeature type for use with @@ -37,7 +37,7 @@ func SupportedFeature() *SupportedFeatureApplyConfiguration { // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *SupportedFeatureApplyConfiguration) WithName(value v1.FeatureName) *SupportedFeatureApplyConfiguration { +func (b *SupportedFeatureApplyConfiguration) WithName(value apisv1.FeatureName) *SupportedFeatureApplyConfiguration { b.Name = &value return b } diff --git a/applyconfiguration/apis/v1alpha2/grpcroute.go b/applyconfiguration/apis/v1alpha2/grpcroute.go index b0896d92ff..89e1e21b3d 100644 --- a/applyconfiguration/apis/v1alpha2/grpcroute.go +++ b/applyconfiguration/apis/v1alpha2/grpcroute.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) @@ -59,18 +59,18 @@ func GRPCRoute(name, namespace string) *GRPCRouteApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractGRPCRoute(gRPCRoute *v1alpha2.GRPCRoute, fieldManager string) (*GRPCRouteApplyConfiguration, error) { +func ExtractGRPCRoute(gRPCRoute *apisv1alpha2.GRPCRoute, fieldManager string) (*GRPCRouteApplyConfiguration, error) { return extractGRPCRoute(gRPCRoute, fieldManager, "") } // ExtractGRPCRouteStatus is the same as ExtractGRPCRoute except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractGRPCRouteStatus(gRPCRoute *v1alpha2.GRPCRoute, fieldManager string) (*GRPCRouteApplyConfiguration, error) { +func ExtractGRPCRouteStatus(gRPCRoute *apisv1alpha2.GRPCRoute, fieldManager string) (*GRPCRouteApplyConfiguration, error) { return extractGRPCRoute(gRPCRoute, fieldManager, "status") } -func extractGRPCRoute(gRPCRoute *v1alpha2.GRPCRoute, fieldManager string, subresource string) (*GRPCRouteApplyConfiguration, error) { +func extractGRPCRoute(gRPCRoute *apisv1alpha2.GRPCRoute, fieldManager string, subresource string) (*GRPCRouteApplyConfiguration, error) { b := &GRPCRouteApplyConfiguration{} err := managedfields.ExtractInto(gRPCRoute, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1alpha2.GRPCRoute"), fieldManager, b, subresource) if err != nil { @@ -88,7 +88,7 @@ func extractGRPCRoute(gRPCRoute *v1alpha2.GRPCRoute, fieldManager string, subres // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithKind(value string) *GRPCRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -96,7 +96,7 @@ func (b *GRPCRouteApplyConfiguration) WithKind(value string) *GRPCRouteApplyConf // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithAPIVersion(value string) *GRPCRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -105,7 +105,7 @@ func (b *GRPCRouteApplyConfiguration) WithAPIVersion(value string) *GRPCRouteApp // If called multiple times, the Name field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithName(value string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -114,7 +114,7 @@ func (b *GRPCRouteApplyConfiguration) WithName(value string) *GRPCRouteApplyConf // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithGenerateName(value string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -123,7 +123,7 @@ func (b *GRPCRouteApplyConfiguration) WithGenerateName(value string) *GRPCRouteA // If called multiple times, the Namespace field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithNamespace(value string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -132,7 +132,7 @@ func (b *GRPCRouteApplyConfiguration) WithNamespace(value string) *GRPCRouteAppl // If called multiple times, the UID field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithUID(value types.UID) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -141,7 +141,7 @@ func (b *GRPCRouteApplyConfiguration) WithUID(value types.UID) *GRPCRouteApplyCo // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithResourceVersion(value string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -150,7 +150,7 @@ func (b *GRPCRouteApplyConfiguration) WithResourceVersion(value string) *GRPCRou // If called multiple times, the Generation field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithGeneration(value int64) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -159,7 +159,7 @@ func (b *GRPCRouteApplyConfiguration) WithGeneration(value int64) *GRPCRouteAppl // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -168,7 +168,7 @@ func (b *GRPCRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) * // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -177,7 +177,7 @@ func (b *GRPCRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) * // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GRPCRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -187,11 +187,11 @@ func (b *GRPCRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64 // overwriting an existing map entries in Labels field with the same key. func (b *GRPCRouteApplyConfiguration) WithLabels(entries map[string]string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -202,11 +202,11 @@ func (b *GRPCRouteApplyConfiguration) WithLabels(entries map[string]string) *GRP // overwriting an existing map entries in Annotations field with the same key. func (b *GRPCRouteApplyConfiguration) WithAnnotations(entries map[string]string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -220,7 +220,7 @@ func (b *GRPCRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -231,7 +231,7 @@ func (b *GRPCRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef func (b *GRPCRouteApplyConfiguration) WithFinalizers(values ...string) *GRPCRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -261,5 +261,5 @@ func (b *GRPCRouteApplyConfiguration) WithStatus(value *apisv1.GRPCRouteStatusAp // GetName retrieves the value of the Name field in the declarative configuration. func (b *GRPCRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1alpha2/localpolicytargetreferencewithsectionname.go b/applyconfiguration/apis/v1alpha2/localpolicytargetreferencewithsectionname.go index 72577d01c2..cac1a782e0 100644 --- a/applyconfiguration/apis/v1alpha2/localpolicytargetreferencewithsectionname.go +++ b/applyconfiguration/apis/v1alpha2/localpolicytargetreferencewithsectionname.go @@ -39,7 +39,7 @@ func LocalPolicyTargetReferenceWithSectionName() *LocalPolicyTargetReferenceWith // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. func (b *LocalPolicyTargetReferenceWithSectionNameApplyConfiguration) WithGroup(value v1.Group) *LocalPolicyTargetReferenceWithSectionNameApplyConfiguration { - b.Group = &value + b.LocalPolicyTargetReferenceApplyConfiguration.Group = &value return b } @@ -47,7 +47,7 @@ func (b *LocalPolicyTargetReferenceWithSectionNameApplyConfiguration) WithGroup( // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *LocalPolicyTargetReferenceWithSectionNameApplyConfiguration) WithKind(value v1.Kind) *LocalPolicyTargetReferenceWithSectionNameApplyConfiguration { - b.Kind = &value + b.LocalPolicyTargetReferenceApplyConfiguration.Kind = &value return b } @@ -55,7 +55,7 @@ func (b *LocalPolicyTargetReferenceWithSectionNameApplyConfiguration) WithKind(v // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. func (b *LocalPolicyTargetReferenceWithSectionNameApplyConfiguration) WithName(value v1.ObjectName) *LocalPolicyTargetReferenceWithSectionNameApplyConfiguration { - b.Name = &value + b.LocalPolicyTargetReferenceApplyConfiguration.Name = &value return b } diff --git a/applyconfiguration/apis/v1alpha2/referencegrant.go b/applyconfiguration/apis/v1alpha2/referencegrant.go index e8ea62c9aa..032cf3617c 100644 --- a/applyconfiguration/apis/v1alpha2/referencegrant.go +++ b/applyconfiguration/apis/v1alpha2/referencegrant.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" v1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) @@ -58,18 +58,18 @@ func ReferenceGrant(name, namespace string) *ReferenceGrantApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractReferenceGrant(referenceGrant *v1alpha2.ReferenceGrant, fieldManager string) (*ReferenceGrantApplyConfiguration, error) { +func ExtractReferenceGrant(referenceGrant *apisv1alpha2.ReferenceGrant, fieldManager string) (*ReferenceGrantApplyConfiguration, error) { return extractReferenceGrant(referenceGrant, fieldManager, "") } // ExtractReferenceGrantStatus is the same as ExtractReferenceGrant except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractReferenceGrantStatus(referenceGrant *v1alpha2.ReferenceGrant, fieldManager string) (*ReferenceGrantApplyConfiguration, error) { +func ExtractReferenceGrantStatus(referenceGrant *apisv1alpha2.ReferenceGrant, fieldManager string) (*ReferenceGrantApplyConfiguration, error) { return extractReferenceGrant(referenceGrant, fieldManager, "status") } -func extractReferenceGrant(referenceGrant *v1alpha2.ReferenceGrant, fieldManager string, subresource string) (*ReferenceGrantApplyConfiguration, error) { +func extractReferenceGrant(referenceGrant *apisv1alpha2.ReferenceGrant, fieldManager string, subresource string) (*ReferenceGrantApplyConfiguration, error) { b := &ReferenceGrantApplyConfiguration{} err := managedfields.ExtractInto(referenceGrant, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1alpha2.ReferenceGrant"), fieldManager, b, subresource) if err != nil { @@ -87,7 +87,7 @@ func extractReferenceGrant(referenceGrant *v1alpha2.ReferenceGrant, fieldManager // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithKind(value string) *ReferenceGrantApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -95,7 +95,7 @@ func (b *ReferenceGrantApplyConfiguration) WithKind(value string) *ReferenceGran // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithAPIVersion(value string) *ReferenceGrantApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -104,7 +104,7 @@ func (b *ReferenceGrantApplyConfiguration) WithAPIVersion(value string) *Referen // If called multiple times, the Name field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithName(value string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -113,7 +113,7 @@ func (b *ReferenceGrantApplyConfiguration) WithName(value string) *ReferenceGran // If called multiple times, the GenerateName field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithGenerateName(value string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -122,7 +122,7 @@ func (b *ReferenceGrantApplyConfiguration) WithGenerateName(value string) *Refer // If called multiple times, the Namespace field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithNamespace(value string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -131,7 +131,7 @@ func (b *ReferenceGrantApplyConfiguration) WithNamespace(value string) *Referenc // If called multiple times, the UID field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithUID(value types.UID) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -140,7 +140,7 @@ func (b *ReferenceGrantApplyConfiguration) WithUID(value types.UID) *ReferenceGr // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithResourceVersion(value string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -149,7 +149,7 @@ func (b *ReferenceGrantApplyConfiguration) WithResourceVersion(value string) *Re // If called multiple times, the Generation field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithGeneration(value int64) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -158,7 +158,7 @@ func (b *ReferenceGrantApplyConfiguration) WithGeneration(value int64) *Referenc // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -167,7 +167,7 @@ func (b *ReferenceGrantApplyConfiguration) WithCreationTimestamp(value metav1.Ti // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -176,7 +176,7 @@ func (b *ReferenceGrantApplyConfiguration) WithDeletionTimestamp(value metav1.Ti // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -186,11 +186,11 @@ func (b *ReferenceGrantApplyConfiguration) WithDeletionGracePeriodSeconds(value // overwriting an existing map entries in Labels field with the same key. func (b *ReferenceGrantApplyConfiguration) WithLabels(entries map[string]string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -201,11 +201,11 @@ func (b *ReferenceGrantApplyConfiguration) WithLabels(entries map[string]string) // overwriting an existing map entries in Annotations field with the same key. func (b *ReferenceGrantApplyConfiguration) WithAnnotations(entries map[string]string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -219,7 +219,7 @@ func (b *ReferenceGrantApplyConfiguration) WithOwnerReferences(values ...*v1.Own if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -230,7 +230,7 @@ func (b *ReferenceGrantApplyConfiguration) WithOwnerReferences(values ...*v1.Own func (b *ReferenceGrantApplyConfiguration) WithFinalizers(values ...string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -252,5 +252,5 @@ func (b *ReferenceGrantApplyConfiguration) WithSpec(value *v1beta1.ReferenceGran // GetName retrieves the value of the Name field in the declarative configuration. func (b *ReferenceGrantApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1alpha2/tcproute.go b/applyconfiguration/apis/v1alpha2/tcproute.go index b56a8198ba..1984f6f98d 100644 --- a/applyconfiguration/apis/v1alpha2/tcproute.go +++ b/applyconfiguration/apis/v1alpha2/tcproute.go @@ -87,7 +87,7 @@ func extractTCPRoute(tCPRoute *apisv1alpha2.TCPRoute, fieldManager string, subre // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithKind(value string) *TCPRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -95,7 +95,7 @@ func (b *TCPRouteApplyConfiguration) WithKind(value string) *TCPRouteApplyConfig // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithAPIVersion(value string) *TCPRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -104,7 +104,7 @@ func (b *TCPRouteApplyConfiguration) WithAPIVersion(value string) *TCPRouteApply // If called multiple times, the Name field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithName(value string) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -113,7 +113,7 @@ func (b *TCPRouteApplyConfiguration) WithName(value string) *TCPRouteApplyConfig // If called multiple times, the GenerateName field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithGenerateName(value string) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -122,7 +122,7 @@ func (b *TCPRouteApplyConfiguration) WithGenerateName(value string) *TCPRouteApp // If called multiple times, the Namespace field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithNamespace(value string) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -131,7 +131,7 @@ func (b *TCPRouteApplyConfiguration) WithNamespace(value string) *TCPRouteApplyC // If called multiple times, the UID field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithUID(value types.UID) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -140,7 +140,7 @@ func (b *TCPRouteApplyConfiguration) WithUID(value types.UID) *TCPRouteApplyConf // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithResourceVersion(value string) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -149,7 +149,7 @@ func (b *TCPRouteApplyConfiguration) WithResourceVersion(value string) *TCPRoute // If called multiple times, the Generation field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithGeneration(value int64) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -158,7 +158,7 @@ func (b *TCPRouteApplyConfiguration) WithGeneration(value int64) *TCPRouteApplyC // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -167,7 +167,7 @@ func (b *TCPRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *T // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -176,7 +176,7 @@ func (b *TCPRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *T // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *TCPRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -186,11 +186,11 @@ func (b *TCPRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *TCPRouteApplyConfiguration) WithLabels(entries map[string]string) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -201,11 +201,11 @@ func (b *TCPRouteApplyConfiguration) WithLabels(entries map[string]string) *TCPR // overwriting an existing map entries in Annotations field with the same key. func (b *TCPRouteApplyConfiguration) WithAnnotations(entries map[string]string) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -219,7 +219,7 @@ func (b *TCPRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefe if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -230,7 +230,7 @@ func (b *TCPRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefe func (b *TCPRouteApplyConfiguration) WithFinalizers(values ...string) *TCPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -260,5 +260,5 @@ func (b *TCPRouteApplyConfiguration) WithStatus(value *TCPRouteStatusApplyConfig // GetName retrieves the value of the Name field in the declarative configuration. func (b *TCPRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1alpha2/tcproutespec.go b/applyconfiguration/apis/v1alpha2/tcproutespec.go index c693e96c70..67b40cc776 100644 --- a/applyconfiguration/apis/v1alpha2/tcproutespec.go +++ b/applyconfiguration/apis/v1alpha2/tcproutespec.go @@ -43,7 +43,7 @@ func (b *TCPRouteSpecApplyConfiguration) WithParentRefs(values ...*v1.ParentRefe if values[i] == nil { panic("nil value passed to WithParentRefs") } - b.ParentRefs = append(b.ParentRefs, *values[i]) + b.CommonRouteSpecApplyConfiguration.ParentRefs = append(b.CommonRouteSpecApplyConfiguration.ParentRefs, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1alpha2/tcproutestatus.go b/applyconfiguration/apis/v1alpha2/tcproutestatus.go index 9094efd4d6..02e4912948 100644 --- a/applyconfiguration/apis/v1alpha2/tcproutestatus.go +++ b/applyconfiguration/apis/v1alpha2/tcproutestatus.go @@ -42,7 +42,7 @@ func (b *TCPRouteStatusApplyConfiguration) WithParents(values ...*v1.RouteParent if values[i] == nil { panic("nil value passed to WithParents") } - b.Parents = append(b.Parents, *values[i]) + b.RouteStatusApplyConfiguration.Parents = append(b.RouteStatusApplyConfiguration.Parents, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1alpha2/tlsroute.go b/applyconfiguration/apis/v1alpha2/tlsroute.go index 7dfe99da78..d427cde2b4 100644 --- a/applyconfiguration/apis/v1alpha2/tlsroute.go +++ b/applyconfiguration/apis/v1alpha2/tlsroute.go @@ -87,7 +87,7 @@ func extractTLSRoute(tLSRoute *apisv1alpha2.TLSRoute, fieldManager string, subre // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithKind(value string) *TLSRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -95,7 +95,7 @@ func (b *TLSRouteApplyConfiguration) WithKind(value string) *TLSRouteApplyConfig // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithAPIVersion(value string) *TLSRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -104,7 +104,7 @@ func (b *TLSRouteApplyConfiguration) WithAPIVersion(value string) *TLSRouteApply // If called multiple times, the Name field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithName(value string) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -113,7 +113,7 @@ func (b *TLSRouteApplyConfiguration) WithName(value string) *TLSRouteApplyConfig // If called multiple times, the GenerateName field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithGenerateName(value string) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -122,7 +122,7 @@ func (b *TLSRouteApplyConfiguration) WithGenerateName(value string) *TLSRouteApp // If called multiple times, the Namespace field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithNamespace(value string) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -131,7 +131,7 @@ func (b *TLSRouteApplyConfiguration) WithNamespace(value string) *TLSRouteApplyC // If called multiple times, the UID field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithUID(value types.UID) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -140,7 +140,7 @@ func (b *TLSRouteApplyConfiguration) WithUID(value types.UID) *TLSRouteApplyConf // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithResourceVersion(value string) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -149,7 +149,7 @@ func (b *TLSRouteApplyConfiguration) WithResourceVersion(value string) *TLSRoute // If called multiple times, the Generation field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithGeneration(value int64) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -158,7 +158,7 @@ func (b *TLSRouteApplyConfiguration) WithGeneration(value int64) *TLSRouteApplyC // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -167,7 +167,7 @@ func (b *TLSRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *T // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -176,7 +176,7 @@ func (b *TLSRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *T // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *TLSRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -186,11 +186,11 @@ func (b *TLSRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *TLSRouteApplyConfiguration) WithLabels(entries map[string]string) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -201,11 +201,11 @@ func (b *TLSRouteApplyConfiguration) WithLabels(entries map[string]string) *TLSR // overwriting an existing map entries in Annotations field with the same key. func (b *TLSRouteApplyConfiguration) WithAnnotations(entries map[string]string) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -219,7 +219,7 @@ func (b *TLSRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefe if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -230,7 +230,7 @@ func (b *TLSRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefe func (b *TLSRouteApplyConfiguration) WithFinalizers(values ...string) *TLSRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -260,5 +260,5 @@ func (b *TLSRouteApplyConfiguration) WithStatus(value *TLSRouteStatusApplyConfig // GetName retrieves the value of the Name field in the declarative configuration. func (b *TLSRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1alpha2/tlsroutespec.go b/applyconfiguration/apis/v1alpha2/tlsroutespec.go index 4fc149ec32..7a634a7863 100644 --- a/applyconfiguration/apis/v1alpha2/tlsroutespec.go +++ b/applyconfiguration/apis/v1alpha2/tlsroutespec.go @@ -45,7 +45,7 @@ func (b *TLSRouteSpecApplyConfiguration) WithParentRefs(values ...*v1.ParentRefe if values[i] == nil { panic("nil value passed to WithParentRefs") } - b.ParentRefs = append(b.ParentRefs, *values[i]) + b.CommonRouteSpecApplyConfiguration.ParentRefs = append(b.CommonRouteSpecApplyConfiguration.ParentRefs, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1alpha2/tlsroutestatus.go b/applyconfiguration/apis/v1alpha2/tlsroutestatus.go index 43a48f42d0..08d0c109f5 100644 --- a/applyconfiguration/apis/v1alpha2/tlsroutestatus.go +++ b/applyconfiguration/apis/v1alpha2/tlsroutestatus.go @@ -42,7 +42,7 @@ func (b *TLSRouteStatusApplyConfiguration) WithParents(values ...*v1.RouteParent if values[i] == nil { panic("nil value passed to WithParents") } - b.Parents = append(b.Parents, *values[i]) + b.RouteStatusApplyConfiguration.Parents = append(b.RouteStatusApplyConfiguration.Parents, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1alpha2/udproute.go b/applyconfiguration/apis/v1alpha2/udproute.go index 2ea4d5b460..2403b41fb7 100644 --- a/applyconfiguration/apis/v1alpha2/udproute.go +++ b/applyconfiguration/apis/v1alpha2/udproute.go @@ -87,7 +87,7 @@ func extractUDPRoute(uDPRoute *apisv1alpha2.UDPRoute, fieldManager string, subre // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithKind(value string) *UDPRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -95,7 +95,7 @@ func (b *UDPRouteApplyConfiguration) WithKind(value string) *UDPRouteApplyConfig // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithAPIVersion(value string) *UDPRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -104,7 +104,7 @@ func (b *UDPRouteApplyConfiguration) WithAPIVersion(value string) *UDPRouteApply // If called multiple times, the Name field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithName(value string) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -113,7 +113,7 @@ func (b *UDPRouteApplyConfiguration) WithName(value string) *UDPRouteApplyConfig // If called multiple times, the GenerateName field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithGenerateName(value string) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -122,7 +122,7 @@ func (b *UDPRouteApplyConfiguration) WithGenerateName(value string) *UDPRouteApp // If called multiple times, the Namespace field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithNamespace(value string) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -131,7 +131,7 @@ func (b *UDPRouteApplyConfiguration) WithNamespace(value string) *UDPRouteApplyC // If called multiple times, the UID field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithUID(value types.UID) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -140,7 +140,7 @@ func (b *UDPRouteApplyConfiguration) WithUID(value types.UID) *UDPRouteApplyConf // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithResourceVersion(value string) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -149,7 +149,7 @@ func (b *UDPRouteApplyConfiguration) WithResourceVersion(value string) *UDPRoute // If called multiple times, the Generation field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithGeneration(value int64) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -158,7 +158,7 @@ func (b *UDPRouteApplyConfiguration) WithGeneration(value int64) *UDPRouteApplyC // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -167,7 +167,7 @@ func (b *UDPRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *U // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -176,7 +176,7 @@ func (b *UDPRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *U // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *UDPRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -186,11 +186,11 @@ func (b *UDPRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *UDPRouteApplyConfiguration) WithLabels(entries map[string]string) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -201,11 +201,11 @@ func (b *UDPRouteApplyConfiguration) WithLabels(entries map[string]string) *UDPR // overwriting an existing map entries in Annotations field with the same key. func (b *UDPRouteApplyConfiguration) WithAnnotations(entries map[string]string) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -219,7 +219,7 @@ func (b *UDPRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefe if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -230,7 +230,7 @@ func (b *UDPRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefe func (b *UDPRouteApplyConfiguration) WithFinalizers(values ...string) *UDPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -260,5 +260,5 @@ func (b *UDPRouteApplyConfiguration) WithStatus(value *UDPRouteStatusApplyConfig // GetName retrieves the value of the Name field in the declarative configuration. func (b *UDPRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1alpha2/udproutespec.go b/applyconfiguration/apis/v1alpha2/udproutespec.go index c75a0b520f..2f07c51fce 100644 --- a/applyconfiguration/apis/v1alpha2/udproutespec.go +++ b/applyconfiguration/apis/v1alpha2/udproutespec.go @@ -43,7 +43,7 @@ func (b *UDPRouteSpecApplyConfiguration) WithParentRefs(values ...*v1.ParentRefe if values[i] == nil { panic("nil value passed to WithParentRefs") } - b.ParentRefs = append(b.ParentRefs, *values[i]) + b.CommonRouteSpecApplyConfiguration.ParentRefs = append(b.CommonRouteSpecApplyConfiguration.ParentRefs, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1alpha2/udproutestatus.go b/applyconfiguration/apis/v1alpha2/udproutestatus.go index ae17a28bb2..bdbb4e442d 100644 --- a/applyconfiguration/apis/v1alpha2/udproutestatus.go +++ b/applyconfiguration/apis/v1alpha2/udproutestatus.go @@ -42,7 +42,7 @@ func (b *UDPRouteStatusApplyConfiguration) WithParents(values ...*v1.RouteParent if values[i] == nil { panic("nil value passed to WithParents") } - b.Parents = append(b.Parents, *values[i]) + b.RouteStatusApplyConfiguration.Parents = append(b.RouteStatusApplyConfiguration.Parents, *values[i]) } return b } diff --git a/applyconfiguration/apis/v1alpha3/backendtlspolicy.go b/applyconfiguration/apis/v1alpha3/backendtlspolicy.go index ba89d4f2f3..2892af15db 100644 --- a/applyconfiguration/apis/v1alpha3/backendtlspolicy.go +++ b/applyconfiguration/apis/v1alpha3/backendtlspolicy.go @@ -88,7 +88,7 @@ func extractBackendTLSPolicy(backendTLSPolicy *apisv1alpha3.BackendTLSPolicy, fi // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithKind(value string) *BackendTLSPolicyApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -96,7 +96,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithKind(value string) *BackendTLSP // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithAPIVersion(value string) *BackendTLSPolicyApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -105,7 +105,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithAPIVersion(value string) *Backe // If called multiple times, the Name field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithName(value string) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -114,7 +114,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithName(value string) *BackendTLSP // If called multiple times, the GenerateName field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithGenerateName(value string) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -123,7 +123,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithGenerateName(value string) *Bac // If called multiple times, the Namespace field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithNamespace(value string) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -132,7 +132,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithNamespace(value string) *Backen // If called multiple times, the UID field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithUID(value types.UID) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -141,7 +141,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithUID(value types.UID) *BackendTL // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithResourceVersion(value string) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -150,7 +150,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithResourceVersion(value string) * // If called multiple times, the Generation field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithGeneration(value int64) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -159,7 +159,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithGeneration(value int64) *Backen // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithCreationTimestamp(value metav1.Time) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -168,7 +168,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithCreationTimestamp(value metav1. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -177,7 +177,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithDeletionTimestamp(value metav1. // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *BackendTLSPolicyApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -187,11 +187,11 @@ func (b *BackendTLSPolicyApplyConfiguration) WithDeletionGracePeriodSeconds(valu // overwriting an existing map entries in Labels field with the same key. func (b *BackendTLSPolicyApplyConfiguration) WithLabels(entries map[string]string) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -202,11 +202,11 @@ func (b *BackendTLSPolicyApplyConfiguration) WithLabels(entries map[string]strin // overwriting an existing map entries in Annotations field with the same key. func (b *BackendTLSPolicyApplyConfiguration) WithAnnotations(entries map[string]string) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -220,7 +220,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithOwnerReferences(values ...*v1.O if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -231,7 +231,7 @@ func (b *BackendTLSPolicyApplyConfiguration) WithOwnerReferences(values ...*v1.O func (b *BackendTLSPolicyApplyConfiguration) WithFinalizers(values ...string) *BackendTLSPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -261,5 +261,5 @@ func (b *BackendTLSPolicyApplyConfiguration) WithStatus(value *v1alpha2.PolicySt // GetName retrieves the value of the Name field in the declarative configuration. func (b *BackendTLSPolicyApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1alpha3/backendtlspolicyvalidation.go b/applyconfiguration/apis/v1alpha3/backendtlspolicyvalidation.go index 4f0f5d922b..b0cf5bfa88 100644 --- a/applyconfiguration/apis/v1alpha3/backendtlspolicyvalidation.go +++ b/applyconfiguration/apis/v1alpha3/backendtlspolicyvalidation.go @@ -20,7 +20,7 @@ package v1alpha3 import ( apisv1 "sigs.k8s.io/gateway-api/apis/v1" - v1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" + apisv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" v1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" ) @@ -28,7 +28,7 @@ import ( // with apply. type BackendTLSPolicyValidationApplyConfiguration struct { CACertificateRefs []v1.LocalObjectReferenceApplyConfiguration `json:"caCertificateRefs,omitempty"` - WellKnownCACertificates *v1alpha3.WellKnownCACertificatesType `json:"wellKnownCACertificates,omitempty"` + WellKnownCACertificates *apisv1alpha3.WellKnownCACertificatesType `json:"wellKnownCACertificates,omitempty"` Hostname *apisv1.PreciseHostname `json:"hostname,omitempty"` SubjectAltNames []SubjectAltNameApplyConfiguration `json:"subjectAltNames,omitempty"` } @@ -55,7 +55,7 @@ func (b *BackendTLSPolicyValidationApplyConfiguration) WithCACertificateRefs(val // WithWellKnownCACertificates sets the WellKnownCACertificates field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the WellKnownCACertificates field is set to the value of the last call. -func (b *BackendTLSPolicyValidationApplyConfiguration) WithWellKnownCACertificates(value v1alpha3.WellKnownCACertificatesType) *BackendTLSPolicyValidationApplyConfiguration { +func (b *BackendTLSPolicyValidationApplyConfiguration) WithWellKnownCACertificates(value apisv1alpha3.WellKnownCACertificatesType) *BackendTLSPolicyValidationApplyConfiguration { b.WellKnownCACertificates = &value return b } diff --git a/applyconfiguration/apis/v1alpha3/subjectaltname.go b/applyconfiguration/apis/v1alpha3/subjectaltname.go index ae71ef3137..42823831b8 100644 --- a/applyconfiguration/apis/v1alpha3/subjectaltname.go +++ b/applyconfiguration/apis/v1alpha3/subjectaltname.go @@ -20,15 +20,15 @@ package v1alpha3 import ( v1 "sigs.k8s.io/gateway-api/apis/v1" - v1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" + apisv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" ) // SubjectAltNameApplyConfiguration represents a declarative configuration of the SubjectAltName type for use // with apply. type SubjectAltNameApplyConfiguration struct { - Type *v1alpha3.SubjectAltNameType `json:"type,omitempty"` - Hostname *v1.Hostname `json:"hostname,omitempty"` - URI *v1.AbsoluteURI `json:"uri,omitempty"` + Type *apisv1alpha3.SubjectAltNameType `json:"type,omitempty"` + Hostname *v1.Hostname `json:"hostname,omitempty"` + URI *v1.AbsoluteURI `json:"uri,omitempty"` } // SubjectAltNameApplyConfiguration constructs a declarative configuration of the SubjectAltName type for use with @@ -40,7 +40,7 @@ func SubjectAltName() *SubjectAltNameApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *SubjectAltNameApplyConfiguration) WithType(value v1alpha3.SubjectAltNameType) *SubjectAltNameApplyConfiguration { +func (b *SubjectAltNameApplyConfiguration) WithType(value apisv1alpha3.SubjectAltNameType) *SubjectAltNameApplyConfiguration { b.Type = &value return b } diff --git a/applyconfiguration/apis/v1beta1/gateway.go b/applyconfiguration/apis/v1beta1/gateway.go index 49ec4b21ce..3b623558db 100644 --- a/applyconfiguration/apis/v1beta1/gateway.go +++ b/applyconfiguration/apis/v1beta1/gateway.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) @@ -59,18 +59,18 @@ func Gateway(name, namespace string) *GatewayApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractGateway(gateway *v1beta1.Gateway, fieldManager string) (*GatewayApplyConfiguration, error) { +func ExtractGateway(gateway *apisv1beta1.Gateway, fieldManager string) (*GatewayApplyConfiguration, error) { return extractGateway(gateway, fieldManager, "") } // ExtractGatewayStatus is the same as ExtractGateway except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractGatewayStatus(gateway *v1beta1.Gateway, fieldManager string) (*GatewayApplyConfiguration, error) { +func ExtractGatewayStatus(gateway *apisv1beta1.Gateway, fieldManager string) (*GatewayApplyConfiguration, error) { return extractGateway(gateway, fieldManager, "status") } -func extractGateway(gateway *v1beta1.Gateway, fieldManager string, subresource string) (*GatewayApplyConfiguration, error) { +func extractGateway(gateway *apisv1beta1.Gateway, fieldManager string, subresource string) (*GatewayApplyConfiguration, error) { b := &GatewayApplyConfiguration{} err := managedfields.ExtractInto(gateway, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1beta1.Gateway"), fieldManager, b, subresource) if err != nil { @@ -88,7 +88,7 @@ func extractGateway(gateway *v1beta1.Gateway, fieldManager string, subresource s // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithKind(value string) *GatewayApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -96,7 +96,7 @@ func (b *GatewayApplyConfiguration) WithKind(value string) *GatewayApplyConfigur // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithAPIVersion(value string) *GatewayApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -105,7 +105,7 @@ func (b *GatewayApplyConfiguration) WithAPIVersion(value string) *GatewayApplyCo // If called multiple times, the Name field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithName(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -114,7 +114,7 @@ func (b *GatewayApplyConfiguration) WithName(value string) *GatewayApplyConfigur // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithGenerateName(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -123,7 +123,7 @@ func (b *GatewayApplyConfiguration) WithGenerateName(value string) *GatewayApply // If called multiple times, the Namespace field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithNamespace(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -132,7 +132,7 @@ func (b *GatewayApplyConfiguration) WithNamespace(value string) *GatewayApplyCon // If called multiple times, the UID field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithUID(value types.UID) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -141,7 +141,7 @@ func (b *GatewayApplyConfiguration) WithUID(value types.UID) *GatewayApplyConfig // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithResourceVersion(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -150,7 +150,7 @@ func (b *GatewayApplyConfiguration) WithResourceVersion(value string) *GatewayAp // If called multiple times, the Generation field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithGeneration(value int64) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -159,7 +159,7 @@ func (b *GatewayApplyConfiguration) WithGeneration(value int64) *GatewayApplyCon // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -168,7 +168,7 @@ func (b *GatewayApplyConfiguration) WithCreationTimestamp(value metav1.Time) *Ga // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -177,7 +177,7 @@ func (b *GatewayApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *Ga // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -187,11 +187,11 @@ func (b *GatewayApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *GatewayApplyConfiguration) WithLabels(entries map[string]string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -202,11 +202,11 @@ func (b *GatewayApplyConfiguration) WithLabels(entries map[string]string) *Gatew // overwriting an existing map entries in Annotations field with the same key. func (b *GatewayApplyConfiguration) WithAnnotations(entries map[string]string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -220,7 +220,7 @@ func (b *GatewayApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefer if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -231,7 +231,7 @@ func (b *GatewayApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefer func (b *GatewayApplyConfiguration) WithFinalizers(values ...string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -261,5 +261,5 @@ func (b *GatewayApplyConfiguration) WithStatus(value *apisv1.GatewayStatusApplyC // GetName retrieves the value of the Name field in the declarative configuration. func (b *GatewayApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1beta1/gatewayclass.go b/applyconfiguration/apis/v1beta1/gatewayclass.go index 4ca42d5bd9..d7cecd62e7 100644 --- a/applyconfiguration/apis/v1beta1/gatewayclass.go +++ b/applyconfiguration/apis/v1beta1/gatewayclass.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) @@ -58,18 +58,18 @@ func GatewayClass(name string) *GatewayClassApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractGatewayClass(gatewayClass *v1beta1.GatewayClass, fieldManager string) (*GatewayClassApplyConfiguration, error) { +func ExtractGatewayClass(gatewayClass *apisv1beta1.GatewayClass, fieldManager string) (*GatewayClassApplyConfiguration, error) { return extractGatewayClass(gatewayClass, fieldManager, "") } // ExtractGatewayClassStatus is the same as ExtractGatewayClass except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractGatewayClassStatus(gatewayClass *v1beta1.GatewayClass, fieldManager string) (*GatewayClassApplyConfiguration, error) { +func ExtractGatewayClassStatus(gatewayClass *apisv1beta1.GatewayClass, fieldManager string) (*GatewayClassApplyConfiguration, error) { return extractGatewayClass(gatewayClass, fieldManager, "status") } -func extractGatewayClass(gatewayClass *v1beta1.GatewayClass, fieldManager string, subresource string) (*GatewayClassApplyConfiguration, error) { +func extractGatewayClass(gatewayClass *apisv1beta1.GatewayClass, fieldManager string, subresource string) (*GatewayClassApplyConfiguration, error) { b := &GatewayClassApplyConfiguration{} err := managedfields.ExtractInto(gatewayClass, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1beta1.GatewayClass"), fieldManager, b, subresource) if err != nil { @@ -86,7 +86,7 @@ func extractGatewayClass(gatewayClass *v1beta1.GatewayClass, fieldManager string // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithKind(value string) *GatewayClassApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -94,7 +94,7 @@ func (b *GatewayClassApplyConfiguration) WithKind(value string) *GatewayClassApp // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithAPIVersion(value string) *GatewayClassApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -103,7 +103,7 @@ func (b *GatewayClassApplyConfiguration) WithAPIVersion(value string) *GatewayCl // If called multiple times, the Name field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithName(value string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -112,7 +112,7 @@ func (b *GatewayClassApplyConfiguration) WithName(value string) *GatewayClassApp // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithGenerateName(value string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -121,7 +121,7 @@ func (b *GatewayClassApplyConfiguration) WithGenerateName(value string) *Gateway // If called multiple times, the Namespace field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithNamespace(value string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -130,7 +130,7 @@ func (b *GatewayClassApplyConfiguration) WithNamespace(value string) *GatewayCla // If called multiple times, the UID field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithUID(value types.UID) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -139,7 +139,7 @@ func (b *GatewayClassApplyConfiguration) WithUID(value types.UID) *GatewayClassA // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithResourceVersion(value string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -148,7 +148,7 @@ func (b *GatewayClassApplyConfiguration) WithResourceVersion(value string) *Gate // If called multiple times, the Generation field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithGeneration(value int64) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -157,7 +157,7 @@ func (b *GatewayClassApplyConfiguration) WithGeneration(value int64) *GatewayCla // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -166,7 +166,7 @@ func (b *GatewayClassApplyConfiguration) WithCreationTimestamp(value metav1.Time // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -175,7 +175,7 @@ func (b *GatewayClassApplyConfiguration) WithDeletionTimestamp(value metav1.Time // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GatewayClassApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -185,11 +185,11 @@ func (b *GatewayClassApplyConfiguration) WithDeletionGracePeriodSeconds(value in // overwriting an existing map entries in Labels field with the same key. func (b *GatewayClassApplyConfiguration) WithLabels(entries map[string]string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -200,11 +200,11 @@ func (b *GatewayClassApplyConfiguration) WithLabels(entries map[string]string) * // overwriting an existing map entries in Annotations field with the same key. func (b *GatewayClassApplyConfiguration) WithAnnotations(entries map[string]string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -218,7 +218,7 @@ func (b *GatewayClassApplyConfiguration) WithOwnerReferences(values ...*v1.Owner if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -229,7 +229,7 @@ func (b *GatewayClassApplyConfiguration) WithOwnerReferences(values ...*v1.Owner func (b *GatewayClassApplyConfiguration) WithFinalizers(values ...string) *GatewayClassApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -259,5 +259,5 @@ func (b *GatewayClassApplyConfiguration) WithStatus(value *apisv1.GatewayClassSt // GetName retrieves the value of the Name field in the declarative configuration. func (b *GatewayClassApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1beta1/httproute.go b/applyconfiguration/apis/v1beta1/httproute.go index aa85c30772..18e2ca9672 100644 --- a/applyconfiguration/apis/v1beta1/httproute.go +++ b/applyconfiguration/apis/v1beta1/httproute.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" internal "sigs.k8s.io/gateway-api/applyconfiguration/internal" ) @@ -59,18 +59,18 @@ func HTTPRoute(name, namespace string) *HTTPRouteApplyConfiguration { // Note that an extracted apply configuration will contain fewer fields than what the fieldManager previously // applied if another fieldManager has updated or force applied any of the previously applied fields. // Experimental! -func ExtractHTTPRoute(hTTPRoute *v1beta1.HTTPRoute, fieldManager string) (*HTTPRouteApplyConfiguration, error) { +func ExtractHTTPRoute(hTTPRoute *apisv1beta1.HTTPRoute, fieldManager string) (*HTTPRouteApplyConfiguration, error) { return extractHTTPRoute(hTTPRoute, fieldManager, "") } // ExtractHTTPRouteStatus is the same as ExtractHTTPRoute except // that it extracts the status subresource applied configuration. // Experimental! -func ExtractHTTPRouteStatus(hTTPRoute *v1beta1.HTTPRoute, fieldManager string) (*HTTPRouteApplyConfiguration, error) { +func ExtractHTTPRouteStatus(hTTPRoute *apisv1beta1.HTTPRoute, fieldManager string) (*HTTPRouteApplyConfiguration, error) { return extractHTTPRoute(hTTPRoute, fieldManager, "status") } -func extractHTTPRoute(hTTPRoute *v1beta1.HTTPRoute, fieldManager string, subresource string) (*HTTPRouteApplyConfiguration, error) { +func extractHTTPRoute(hTTPRoute *apisv1beta1.HTTPRoute, fieldManager string, subresource string) (*HTTPRouteApplyConfiguration, error) { b := &HTTPRouteApplyConfiguration{} err := managedfields.ExtractInto(hTTPRoute, internal.Parser().Type("io.k8s.sigs.gateway-api.apis.v1beta1.HTTPRoute"), fieldManager, b, subresource) if err != nil { @@ -88,7 +88,7 @@ func extractHTTPRoute(hTTPRoute *v1beta1.HTTPRoute, fieldManager string, subreso // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithKind(value string) *HTTPRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -96,7 +96,7 @@ func (b *HTTPRouteApplyConfiguration) WithKind(value string) *HTTPRouteApplyConf // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithAPIVersion(value string) *HTTPRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -105,7 +105,7 @@ func (b *HTTPRouteApplyConfiguration) WithAPIVersion(value string) *HTTPRouteApp // If called multiple times, the Name field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithName(value string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -114,7 +114,7 @@ func (b *HTTPRouteApplyConfiguration) WithName(value string) *HTTPRouteApplyConf // If called multiple times, the GenerateName field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithGenerateName(value string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -123,7 +123,7 @@ func (b *HTTPRouteApplyConfiguration) WithGenerateName(value string) *HTTPRouteA // If called multiple times, the Namespace field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithNamespace(value string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -132,7 +132,7 @@ func (b *HTTPRouteApplyConfiguration) WithNamespace(value string) *HTTPRouteAppl // If called multiple times, the UID field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithUID(value types.UID) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -141,7 +141,7 @@ func (b *HTTPRouteApplyConfiguration) WithUID(value types.UID) *HTTPRouteApplyCo // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithResourceVersion(value string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -150,7 +150,7 @@ func (b *HTTPRouteApplyConfiguration) WithResourceVersion(value string) *HTTPRou // If called multiple times, the Generation field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithGeneration(value int64) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -159,7 +159,7 @@ func (b *HTTPRouteApplyConfiguration) WithGeneration(value int64) *HTTPRouteAppl // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -168,7 +168,7 @@ func (b *HTTPRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) * // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -177,7 +177,7 @@ func (b *HTTPRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) * // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *HTTPRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -187,11 +187,11 @@ func (b *HTTPRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64 // overwriting an existing map entries in Labels field with the same key. func (b *HTTPRouteApplyConfiguration) WithLabels(entries map[string]string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -202,11 +202,11 @@ func (b *HTTPRouteApplyConfiguration) WithLabels(entries map[string]string) *HTT // overwriting an existing map entries in Annotations field with the same key. func (b *HTTPRouteApplyConfiguration) WithAnnotations(entries map[string]string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -220,7 +220,7 @@ func (b *HTTPRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -231,7 +231,7 @@ func (b *HTTPRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef func (b *HTTPRouteApplyConfiguration) WithFinalizers(values ...string) *HTTPRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -261,5 +261,5 @@ func (b *HTTPRouteApplyConfiguration) WithStatus(value *apisv1.HTTPRouteStatusAp // GetName retrieves the value of the Name field in the declarative configuration. func (b *HTTPRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apis/v1beta1/referencegrant.go b/applyconfiguration/apis/v1beta1/referencegrant.go index 79c19df83e..0ebd1cd168 100644 --- a/applyconfiguration/apis/v1beta1/referencegrant.go +++ b/applyconfiguration/apis/v1beta1/referencegrant.go @@ -86,7 +86,7 @@ func extractReferenceGrant(referenceGrant *apisv1beta1.ReferenceGrant, fieldMana // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithKind(value string) *ReferenceGrantApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -94,7 +94,7 @@ func (b *ReferenceGrantApplyConfiguration) WithKind(value string) *ReferenceGran // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithAPIVersion(value string) *ReferenceGrantApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -103,7 +103,7 @@ func (b *ReferenceGrantApplyConfiguration) WithAPIVersion(value string) *Referen // If called multiple times, the Name field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithName(value string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -112,7 +112,7 @@ func (b *ReferenceGrantApplyConfiguration) WithName(value string) *ReferenceGran // If called multiple times, the GenerateName field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithGenerateName(value string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -121,7 +121,7 @@ func (b *ReferenceGrantApplyConfiguration) WithGenerateName(value string) *Refer // If called multiple times, the Namespace field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithNamespace(value string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -130,7 +130,7 @@ func (b *ReferenceGrantApplyConfiguration) WithNamespace(value string) *Referenc // If called multiple times, the UID field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithUID(value types.UID) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -139,7 +139,7 @@ func (b *ReferenceGrantApplyConfiguration) WithUID(value types.UID) *ReferenceGr // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithResourceVersion(value string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -148,7 +148,7 @@ func (b *ReferenceGrantApplyConfiguration) WithResourceVersion(value string) *Re // If called multiple times, the Generation field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithGeneration(value int64) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -157,7 +157,7 @@ func (b *ReferenceGrantApplyConfiguration) WithGeneration(value int64) *Referenc // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -166,7 +166,7 @@ func (b *ReferenceGrantApplyConfiguration) WithCreationTimestamp(value metav1.Ti // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -175,7 +175,7 @@ func (b *ReferenceGrantApplyConfiguration) WithDeletionTimestamp(value metav1.Ti // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *ReferenceGrantApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -185,11 +185,11 @@ func (b *ReferenceGrantApplyConfiguration) WithDeletionGracePeriodSeconds(value // overwriting an existing map entries in Labels field with the same key. func (b *ReferenceGrantApplyConfiguration) WithLabels(entries map[string]string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -200,11 +200,11 @@ func (b *ReferenceGrantApplyConfiguration) WithLabels(entries map[string]string) // overwriting an existing map entries in Annotations field with the same key. func (b *ReferenceGrantApplyConfiguration) WithAnnotations(entries map[string]string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -218,7 +218,7 @@ func (b *ReferenceGrantApplyConfiguration) WithOwnerReferences(values ...*v1.Own if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -229,7 +229,7 @@ func (b *ReferenceGrantApplyConfiguration) WithOwnerReferences(values ...*v1.Own func (b *ReferenceGrantApplyConfiguration) WithFinalizers(values ...string) *ReferenceGrantApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -251,5 +251,5 @@ func (b *ReferenceGrantApplyConfiguration) WithSpec(value *ReferenceGrantSpecApp // GetName retrieves the value of the Name field in the declarative configuration. func (b *ReferenceGrantApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apisx/v1alpha1/xbackendtrafficpolicy.go b/applyconfiguration/apisx/v1alpha1/xbackendtrafficpolicy.go index 4599622695..427d596546 100644 --- a/applyconfiguration/apisx/v1alpha1/xbackendtrafficpolicy.go +++ b/applyconfiguration/apisx/v1alpha1/xbackendtrafficpolicy.go @@ -88,7 +88,7 @@ func extractXBackendTrafficPolicy(xBackendTrafficPolicy *apisxv1alpha1.XBackendT // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithKind(value string) *XBackendTrafficPolicyApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -96,7 +96,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithKind(value string) *XBacke // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithAPIVersion(value string) *XBackendTrafficPolicyApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -105,7 +105,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithAPIVersion(value string) * // If called multiple times, the Name field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithName(value string) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -114,7 +114,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithName(value string) *XBacke // If called multiple times, the GenerateName field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithGenerateName(value string) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -123,7 +123,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithGenerateName(value string) // If called multiple times, the Namespace field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithNamespace(value string) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -132,7 +132,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithNamespace(value string) *X // If called multiple times, the UID field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithUID(value types.UID) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -141,7 +141,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithUID(value types.UID) *XBac // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithResourceVersion(value string) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -150,7 +150,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithResourceVersion(value stri // If called multiple times, the Generation field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithGeneration(value int64) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -159,7 +159,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithGeneration(value int64) *X // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithCreationTimestamp(value metav1.Time) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -168,7 +168,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithCreationTimestamp(value me // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -177,7 +177,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithDeletionTimestamp(value me // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *XBackendTrafficPolicyApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -187,11 +187,11 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithDeletionGracePeriodSeconds // overwriting an existing map entries in Labels field with the same key. func (b *XBackendTrafficPolicyApplyConfiguration) WithLabels(entries map[string]string) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -202,11 +202,11 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithLabels(entries map[string] // overwriting an existing map entries in Annotations field with the same key. func (b *XBackendTrafficPolicyApplyConfiguration) WithAnnotations(entries map[string]string) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -220,7 +220,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithOwnerReferences(values ... if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -231,7 +231,7 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithOwnerReferences(values ... func (b *XBackendTrafficPolicyApplyConfiguration) WithFinalizers(values ...string) *XBackendTrafficPolicyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -261,5 +261,5 @@ func (b *XBackendTrafficPolicyApplyConfiguration) WithStatus(value *v1alpha2.Pol // GetName retrieves the value of the Name field in the declarative configuration. func (b *XBackendTrafficPolicyApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/apisx/v1alpha1/xlistenerset.go b/applyconfiguration/apisx/v1alpha1/xlistenerset.go index 7ab9f2c0b6..75519a1711 100644 --- a/applyconfiguration/apisx/v1alpha1/xlistenerset.go +++ b/applyconfiguration/apisx/v1alpha1/xlistenerset.go @@ -87,7 +87,7 @@ func extractXListenerSet(xListenerSet *apisxv1alpha1.XListenerSet, fieldManager // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithKind(value string) *XListenerSetApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -95,7 +95,7 @@ func (b *XListenerSetApplyConfiguration) WithKind(value string) *XListenerSetApp // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithAPIVersion(value string) *XListenerSetApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -104,7 +104,7 @@ func (b *XListenerSetApplyConfiguration) WithAPIVersion(value string) *XListener // If called multiple times, the Name field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithName(value string) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -113,7 +113,7 @@ func (b *XListenerSetApplyConfiguration) WithName(value string) *XListenerSetApp // If called multiple times, the GenerateName field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithGenerateName(value string) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -122,7 +122,7 @@ func (b *XListenerSetApplyConfiguration) WithGenerateName(value string) *XListen // If called multiple times, the Namespace field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithNamespace(value string) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -131,7 +131,7 @@ func (b *XListenerSetApplyConfiguration) WithNamespace(value string) *XListenerS // If called multiple times, the UID field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithUID(value types.UID) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -140,7 +140,7 @@ func (b *XListenerSetApplyConfiguration) WithUID(value types.UID) *XListenerSetA // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithResourceVersion(value string) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -149,7 +149,7 @@ func (b *XListenerSetApplyConfiguration) WithResourceVersion(value string) *XLis // If called multiple times, the Generation field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithGeneration(value int64) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -158,7 +158,7 @@ func (b *XListenerSetApplyConfiguration) WithGeneration(value int64) *XListenerS // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithCreationTimestamp(value metav1.Time) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -167,7 +167,7 @@ func (b *XListenerSetApplyConfiguration) WithCreationTimestamp(value metav1.Time // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -176,7 +176,7 @@ func (b *XListenerSetApplyConfiguration) WithDeletionTimestamp(value metav1.Time // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *XListenerSetApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -186,11 +186,11 @@ func (b *XListenerSetApplyConfiguration) WithDeletionGracePeriodSeconds(value in // overwriting an existing map entries in Labels field with the same key. func (b *XListenerSetApplyConfiguration) WithLabels(entries map[string]string) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -201,11 +201,11 @@ func (b *XListenerSetApplyConfiguration) WithLabels(entries map[string]string) * // overwriting an existing map entries in Annotations field with the same key. func (b *XListenerSetApplyConfiguration) WithAnnotations(entries map[string]string) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -219,7 +219,7 @@ func (b *XListenerSetApplyConfiguration) WithOwnerReferences(values ...*v1.Owner if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -230,7 +230,7 @@ func (b *XListenerSetApplyConfiguration) WithOwnerReferences(values ...*v1.Owner func (b *XListenerSetApplyConfiguration) WithFinalizers(values ...string) *XListenerSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -260,5 +260,5 @@ func (b *XListenerSetApplyConfiguration) WithStatus(value *ListenerSetStatusAppl // GetName retrieves the value of the Name field in the declarative configuration. func (b *XListenerSetApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/applyconfiguration/internal/internal.go b/applyconfiguration/internal/internal.go index ec2ab743c7..58971ef5e2 100644 --- a/applyconfiguration/internal/internal.go +++ b/applyconfiguration/internal/internal.go @@ -19,8 +19,8 @@ limitations under the License. package internal import ( - "fmt" - "sync" + fmt "fmt" + sync "sync" typed "sigs.k8s.io/structured-merge-diff/v4/typed" ) diff --git a/conformance/tests/httproute-request-percentage-mirror.go b/conformance/tests/httproute-request-percentage-mirror.go index 905753fedc..df826f5ca8 100644 --- a/conformance/tests/httproute-request-percentage-mirror.go +++ b/conformance/tests/httproute-request-percentage-mirror.go @@ -211,7 +211,7 @@ func testMirroredRequestsDistribution(t *testing.T, suite *suite.ConformanceTest mu.Unlock() return true - }, 60*time.Second, time.Millisecond*100, fmt.Sprintf(`Couldn't verify the logs for "%s/%s"`, mirrorPod.Namespace, mirrorPod.Name)) + }, 60*time.Second, time.Millisecond*100, `Couldn't verify the logs for "%s/%s"`, mirrorPod.Namespace, mirrorPod.Name) } var errs []error diff --git a/conformance/utils/http/mirror.go b/conformance/utils/http/mirror.go index 08633820ec..99d0621d26 100644 --- a/conformance/utils/http/mirror.go +++ b/conformance/utils/http/mirror.go @@ -62,7 +62,7 @@ func ExpectMirroredRequest(t *testing.T, client client.Client, clientset clients } } return false - }, 60*time.Second, time.Millisecond*100, fmt.Sprintf(`Couldn't find mirrored request in "%s/%s" logs`, mirrorPod.Namespace, mirrorPod.Name)) + }, 60*time.Second, time.Millisecond*100, `Couldn't find mirrored request in "%s/%s" logs`, mirrorPod.Namespace, mirrorPod.Name) }(mirrorPod) } diff --git a/crd-ref-docs.yaml b/crd-ref-docs.yaml new file mode 100644 index 0000000000..2a1c60fe61 --- /dev/null +++ b/crd-ref-docs.yaml @@ -0,0 +1,14 @@ +# This file contains configuration for our reference docs generation. For more +# information about the possible configuration, refer to +# https://github.com/elastic/crd-ref-docs. + +processor: + ignoreTypes: + - "()List$" + # RE2 regular expressions describing type fields that should be excluded from the generated documentation. + ignoreFields: + - "TypeMeta$" + +render: + # Version of Kubernetes to use when generating links to Kubernetes API documentation. + kubernetesVersion: 1.32 diff --git a/go.mod b/go.mod index 6b4994a103..ffb33fdd68 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module sigs.k8s.io/gateway-api -go 1.22.0 +go 1.24.0 require ( - github.com/ahmetb/gen-crd-api-reference-docs v0.3.0 + github.com/elastic/crd-ref-docs v0.1.0 github.com/miekg/dns v1.1.63 github.com/stretchr/testify v1.10.0 golang.org/x/net v0.35.0 @@ -11,23 +11,26 @@ require ( google.golang.org/grpc v1.71.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 google.golang.org/protobuf v1.36.5 - k8s.io/api v0.31.3 - k8s.io/apiextensions-apiserver v0.31.3 - k8s.io/apimachinery v0.31.3 - k8s.io/client-go v0.31.3 - k8s.io/code-generator v0.31.3 - k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - sigs.k8s.io/controller-runtime v0.19.4 - sigs.k8s.io/controller-tools v0.16.5 + k8s.io/api v0.32.2 + k8s.io/apiextensions-apiserver v0.32.2 + k8s.io/apimachinery v0.32.2 + k8s.io/client-go v0.32.2 + k8s.io/code-generator v0.32.2 + k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f + k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 + sigs.k8s.io/controller-runtime v0.20.3 + sigs.k8s.io/controller-tools v0.17.2 sigs.k8s.io/structured-merge-diff/v4 v4.5.0 sigs.k8s.io/yaml v1.4.0 ) require ( + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Masterminds/sprig v2.22.0+incompatible // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.0 // indirect - github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/fatih/color v1.18.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-logr/logr v1.4.2 // indirect @@ -35,6 +38,7 @@ require ( github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/gobuffalo/flect v1.0.3 // indirect + github.com/goccy/go-yaml v1.11.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect @@ -42,40 +46,43 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.1 // indirect - github.com/imdario/mergo v0.3.16 // indirect + github.com/huandu/xstrings v1.3.3 // indirect + github.com/imdario/mergo v0.3.11 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/moby/spdystream v0.4.0 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moby/spdystream v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spf13/cobra v1.8.1 // indirect - github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/pflag v1.0.6 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.21.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/crypto v0.33.0 // indirect + golang.org/x/mod v0.22.0 // indirect golang.org/x/oauth2 v0.25.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/term v0.29.0 // indirect golang.org/x/text v0.22.0 // indirect - golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.26.0 // indirect + golang.org/x/time v0.7.0 // indirect + golang.org/x/tools v0.29.0 // indirect + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect - k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect - k8s.io/klog v0.2.0 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/klog/v2 v2.130.1 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect ) diff --git a/go.sum b/go.sum index f1bb27b935..189e29b0c5 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,9 @@ -github.com/ahmetb/gen-crd-api-reference-docs v0.3.0 h1:+XfOU14S4bGuwyvCijJwhhBIjYN+YXS18jrCY2EzJaY= -github.com/ahmetb/gen-crd-api-reference-docs v0.3.0/go.mod h1:TdjdkYhlOifCQWPs1UdTma97kQQMozf5h26hTuG70u8= +github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= +github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= +github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -7,17 +11,18 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elastic/crd-ref-docs v0.1.0 h1:Cr5kz89QB3Iuuj7dhAfLMApCrChEGAaIBTxGk/xuRKw= +github.com/elastic/crd-ref-docs v0.1.0/go.mod h1:X83mMBdJt05heJUYiS3T0yJ/JkCuliuhSUNav5Gjo/U= github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk= github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= -github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU= +github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -30,32 +35,40 @@ github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4= github.com/gobuffalo/flect v1.0.3/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= +github.com/goccy/go-yaml v1.11.3 h1:B3W9IdWbvrUu2OYQGwvU1nZtvMQJPBKgBUuweJjLj6I= +github.com/goccy/go-yaml v1.11.3/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= -github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= -github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4= +github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -64,13 +77,12 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -80,8 +92,12 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY= github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs= -github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8= -github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= +github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -95,11 +111,10 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= -github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= +github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= +github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -107,14 +122,12 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -140,19 +153,21 @@ go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= -golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -179,19 +194,20 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= +golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= -golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg= @@ -201,7 +217,6 @@ google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zt google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= @@ -210,44 +225,37 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= -k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= -k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE= -k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4= -k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= -k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= -k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= -k8s.io/code-generator v0.31.3 h1:Pj0fYOBms+ZrsulLi4DMsCEx1jG8fWKRLy44onHsLBI= -k8s.io/code-generator v0.31.3/go.mod h1:/umCIlT84g1+Yu5ZXtP1KGSRTnGiIzzX5AzUAxsNlts= -k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks= -k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8= -k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c= -k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= +k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= +k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4= +k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA= +k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= +k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= +k8s.io/code-generator v0.32.2 h1:CIvyPrLWP7cMgrqval2qYT839YAwCDeSvGfXgWSNpHQ= +k8s.io/code-generator v0.32.2/go.mod h1:plh7bWk7JztAUkHM4zpbdy0KOMdrhsePcZL2HLWFH7Y= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 h1:Q8Z7VlGhcJgBHJHYugJ/K/7iB8a2eSxCyxdVjJp+lLY= -k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo= -sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= -sigs.k8s.io/controller-tools v0.16.5 h1:5k9FNRqziBPwqr17AMEPPV/En39ZBplLAdOwwQHruP4= -sigs.k8s.io/controller-tools v0.16.5/go.mod h1:8vztuRVzs8IuuJqKqbXCSlXcw+lkAv/M2sTpg55qjMY= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-runtime v0.20.3 h1:I6Ln8JfQjHH7JbtCD2HCYHoIzajoRxPNuvhvcDbZgkI= +sigs.k8s.io/controller-runtime v0.20.3/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= +sigs.k8s.io/controller-tools v0.17.2 h1:jNFOKps8WnaRKZU2R+4vRCHnXyJanVmXBWqkuUPFyFg= +sigs.k8s.io/controller-tools v0.17.2/go.mod h1:4q5tZG2JniS5M5bkiXY2/potOiXyhoZVw/U48vLkXk0= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk= sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/hack/api-docs/config.json b/hack/api-docs/config.json deleted file mode 100644 index b07c34de1c..0000000000 --- a/hack/api-docs/config.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "hideMemberFields": [ - "TypeMeta" - ], - "hideTypePatterns": [ - "ParseError$", - "List$", - "ReferencePolicy$" - ], - "externalPackages": [ - { - "typeMatchPrefix": "^k8s\\.io/apimachinery/pkg/apis/meta/v1\\.Duration$", - "docsURLTemplate": "https://godoc.org/k8s.io/apimachinery/pkg/apis/meta/v1#Duration" - }, - { - "typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/", - "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}" - }, - { - "typeMatchPrefix": "^github\\.com/knative/pkg/apis/duck/", - "docsURLTemplate": "https://godoc.org/github.com/knative/pkg/apis/duck/{{arrIndex .PackageSegments -1}}#{{.TypeIdentifier}}" - } - ], - "typeDisplayNamePrefixOverrides": { - "k8s.io/api/": "Kubernetes ", - "k8s.io/apimachinery/pkg/apis/": "Kubernetes " - }, - "markdownDisabled": false -} diff --git a/hack/api-docs/members.tpl b/hack/api-docs/members.tpl deleted file mode 100644 index 9f08d1aa5b..0000000000 --- a/hack/api-docs/members.tpl +++ /dev/null @@ -1,48 +0,0 @@ -{{ define "members" }} - -{{ range .Members }} -{{ if not (hiddenMember .)}} - - - {{ fieldName . }}
- - {{ if linkForType .Type }} - - {{ typeDisplayName .Type }} - - {{ else }} - {{ typeDisplayName .Type }} - {{ end }} - - - - {{ if fieldEmbedded . }} -

- (Members of {{ fieldName . }} are embedded into this type.) -

- {{ end}} - - {{ if isOptionalMember .}} - (Optional) - {{ end }} - - {{ safe (renderComments .CommentLines) }} - - {{ if and (eq (.Type.Name.Name) "ObjectMeta") }} - Refer to the Kubernetes API documentation for the fields of the - metadata field. - {{ end }} - - {{ if or (eq (fieldName .) "spec") }} -
-
- - {{ template "members" .Type }} -
- {{ end }} - - -{{ end }} -{{ end }} - -{{ end }} diff --git a/hack/api-docs/pkg.tpl b/hack/api-docs/pkg.tpl deleted file mode 100644 index 059e6dc50b..0000000000 --- a/hack/api-docs/pkg.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{{ define "link" }} -
  • - {{ packageDisplayName . }} -
    • -{{ end }} - -{{ define "package" }} -

    - {{- packageDisplayName . -}} -

    - -{{ with (index .GoPackages 0 )}} - {{ with .DocComments }} -

    - {{ safe (renderComments .) }} -

    - {{ end }} -{{ end }} - -Resource Types: - - -{{ range (visibleTypes (sortedTypes .Types))}} - {{ template "type" . }} -{{ end }} -
    -{{ end }} - - -{{ define "packages" }} - -{{/* we manually iterate the packages slice so that we feature beta before alpha */}} - -

    Packages:

    - - -{{ template "package" index .packages 0 }} -{{ template "package" index .packages 3 }} -{{ template "package" index .packages 2 }} -{{ template "package" index .packages 1 }} - -

    - Generated with gen-crd-api-reference-docs. -

    - -{{ end }} diff --git a/hack/api-docs/type.tpl b/hack/api-docs/type.tpl deleted file mode 100644 index 51a759d612..0000000000 --- a/hack/api-docs/type.tpl +++ /dev/null @@ -1,80 +0,0 @@ -{{ define "type" }} - -

    - {{- .Name.Name }} - {{ if eq .Kind "Alias" }}({{.Underlying}} alias){{ end -}} - ¶ -

    -{{ with (typeReferences .) }} -

    - (Appears on: - {{- $prev := "" -}} - {{- range . -}} - {{- if $prev -}}, {{ end -}} - {{ $prev = . }} - {{ typeDisplayName . }} - {{- end -}} - ) -

    -{{ end }} - - -

    - {{ safe (renderComments .CommentLines) }} -

    - -{{ with (constantsOfType .) }} - - - - - - - - - {{- range . -}} - - {{- /* renderComments implicitly creates a

    element, so we do the - same here to make the value line up nicely. */ -}} -

    - - - {{- end -}} - -
    ValueDescription

    {{ typeDisplayName . }}

    		{{ safe (renderComments .CommentLines) }}
    -{{ end }} - -{{ if .Members }} - - - - - - - - - {{ if isExportedType . }} - - - - - - - - - {{ end }} - {{ template "members" .}} - -
    FieldDescription
    - apiVersion
    - string    		 - - {{apiGroup .}} - -
    - kind
    - string -     		{{.Name.Name}}
    -{{ end }} - -{{ end }} diff --git a/hack/api-docs/generate.sh b/hack/mkdocs/generate.sh similarity index 59% rename from hack/api-docs/generate.sh rename to hack/mkdocs/generate.sh index f7a3e76db9..04436d3769 100755 --- a/hack/api-docs/generate.sh +++ b/hack/mkdocs/generate.sh @@ -25,29 +25,12 @@ GOPATH=${GOPATH:-$(go env GOPATH)} GOBIN=${GOBIN:-$(go env GOBIN)} GOBIN=${GOBIN:-${GOPATH}/bin} -readonly HERE=$(cd $(dirname $0) && pwd) -readonly REPO=$(cd ${HERE}/../.. && pwd) +echo $GOBIN -gendoc::build() { - go install github.com/ahmetb/gen-crd-api-reference-docs -} +go install github.com/elastic/crd-ref-docs -# Exec the doc generator. -gendoc::exec() { - local readonly confdir="${REPO}/hack/api-docs" - - ${GOBIN}/gen-crd-api-reference-docs \ - -template-dir ${confdir} \ - -config ${confdir}/config.json \ - "$@" -} - -if [ "$#" != "1" ]; then - echo "usage: generate.sh OUTFILE" - exit 2 -fi - -gendoc::build -gendoc::exec \ - -api-dir "sigs.k8s.io/gateway-api/apis/" \ - -out-file "${1}" +${GOBIN}/crd-ref-docs \ + --source-path=${PWD}/apis \ + --config=crd-ref-docs.yaml \ + --renderer=markdown \ + --output-path=${PWD}/site-src/reference/spec.md diff --git a/hack/mkdocs/image/Dockerfile b/hack/mkdocs/image/Dockerfile new file mode 100644 index 0000000000..e4f76e11ff --- /dev/null +++ b/hack/mkdocs/image/Dockerfile @@ -0,0 +1,26 @@ +# Copyright 2019 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. + +FROM python:3.12 + +COPY requirements.txt /requirements.txt +RUN pip install -r /requirements.txt + +WORKDIR /docs + +EXPOSE 3000 + +COPY entrypoint.sh / + +ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/hack/mkdocs/image/entrypoint.sh b/hack/mkdocs/image/entrypoint.sh new file mode 100755 index 0000000000..6b3fd33866 --- /dev/null +++ b/hack/mkdocs/image/entrypoint.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +# Copyright 2019 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. + +set -o errexit + +CMD=$1 + +if [ "$CMD" == "build" ]; +then + mkdocs build + exit 0; +fi + +mkdocs serve --dev-addr=0.0.0.0:3000 --livereload \ No newline at end of file diff --git a/requirements.txt b/hack/mkdocs/image/requirements.txt similarity index 97% rename from requirements.txt rename to hack/mkdocs/image/requirements.txt index 25a1beee92..c8ac1bc42e 100644 --- a/requirements.txt +++ b/hack/mkdocs/image/requirements.txt @@ -20,4 +20,4 @@ pymdown-extensions==10.14.3 PyYAML==6.0.2 six==1.17.0 tabulate==0.9.0 -tornado==6.4.2 +tornado==6.4.2 \ No newline at end of file diff --git a/hack/update-clientset.sh b/hack/update-clientset.sh index d36dbd8f1d..d7498bfeec 100755 --- a/hack/update-clientset.sh +++ b/hack/update-clientset.sh @@ -42,16 +42,20 @@ readonly API_PATHS=(apis apisx) GATEWAY_INPUT_DIRS_SPACE="" GATEWAY_INPUT_DIRS_COMMA="" +GATEWAY_API_DIRS_COMMA="" for API_PATH in "${API_PATHS[@]}"; do VERSIONS=($(find ./${API_PATH} -maxdepth 1 -name "v*" -exec bash -c 'basename {}' \; | LC_ALL=C sort -u)) for VERSION in "${VERSIONS[@]}"; do GATEWAY_INPUT_DIRS_SPACE+="${APIS_PKG}/${API_PATH}/${VERSION} " GATEWAY_INPUT_DIRS_COMMA+="${APIS_PKG}/${API_PATH}/${VERSION}," + GATEWAY_API_DIRS_COMMA+="${API_PATH}/${VERSION}," done done + GATEWAY_INPUT_DIRS_SPACE="${GATEWAY_INPUT_DIRS_SPACE%,}" # drop trailing space GATEWAY_INPUT_DIRS_COMMA="${GATEWAY_INPUT_DIRS_COMMA%,}" # drop trailing comma +GATEWAY_API_DIRS_COMMA="${GATEWAY_API_DIRS_COMMA%,}" # drop trailing comma # throw away new_report="$(mktemp -t "$(basename "$0").api_violations.XXXXXX")" @@ -109,6 +113,12 @@ go run k8s.io/code-generator/cmd/register-gen \ ${COMMON_FLAGS} \ ${GATEWAY_INPUT_DIRS_SPACE} +# This is an awful hack to make up for a deficiency in register-gen in k8s v1.32 +for input_dir in ${GATEWAY_API_DIRS_COMMA//,/ } +do + sed -z -i 's|v1 "k8s.io/apimachinery/pkg/apis/meta/v1"\n|v1 "k8s.io/apimachinery/pkg/apis/meta/v1"\n\t"k8s.io/apimachinery/pkg/runtime"\n\t"k8s.io/apimachinery/pkg/runtime/schema"\n|' ${input_dir}/zz_generated.register.go +done + echo "Generating deepcopy" go run sigs.k8s.io/controller-tools/cmd/controller-gen \ object:headerFile=${SCRIPT_ROOT}/hack/boilerplate/boilerplate.generatego.txt \ diff --git a/hack/verify-golint.sh b/hack/verify-golint.sh index 584bfe9b16..66a5279c20 100755 --- a/hack/verify-golint.sh +++ b/hack/verify-golint.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -readonly VERSION="v1.60.3" +readonly VERSION="v1.64.8" readonly KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. cd "${KUBE_ROOT}" diff --git a/netlify.toml b/netlify.toml index b8b4bfb6d4..1612b103f7 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,10 +1,10 @@ # Netlify build instructions [build] - command = "make docs" + command = "make build-docs-netlify" publish = "site" [build.environment] PYTHON_VERSION = "3.12" - GO_VERSION = "1.22.8" + GO_VERSION = "1.24.1" # Standard Netlify redirects [[redirects]] diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index c65cf8f516..bf774f1907 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - "fmt" - "net/http" + fmt "fmt" + http "net/http" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" diff --git a/pkg/client/clientset/versioned/typed/apis/v1/apis_client.go b/pkg/client/clientset/versioned/typed/apis/v1/apis_client.go index 99dfe9e006..1742ff45eb 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/apis_client.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/apis_client.go @@ -19,11 +19,11 @@ limitations under the License. package v1 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1 "sigs.k8s.io/gateway-api/apis/v1" - "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" + scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) type GatewayV1Interface interface { @@ -100,10 +100,10 @@ func New(c rest.Interface) *GatewayV1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion + gv := apisv1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_apis_client.go b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_apis_client.go index 1563d4cfd4..0b68bad3c8 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_apis_client.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_apis_client.go @@ -29,19 +29,19 @@ type FakeGatewayV1 struct { } func (c *FakeGatewayV1) GRPCRoutes(namespace string) v1.GRPCRouteInterface { - return &FakeGRPCRoutes{c, namespace} + return newFakeGRPCRoutes(c, namespace) } func (c *FakeGatewayV1) Gateways(namespace string) v1.GatewayInterface { - return &FakeGateways{c, namespace} + return newFakeGateways(c, namespace) } func (c *FakeGatewayV1) GatewayClasses() v1.GatewayClassInterface { - return &FakeGatewayClasses{c} + return newFakeGatewayClasses(c) } func (c *FakeGatewayV1) HTTPRoutes(namespace string) v1.HTTPRouteInterface { - return &FakeHTTPRoutes{c, namespace} + return newFakeHTTPRoutes(c, namespace) } // RESTClient returns a RESTClient that is used to communicate diff --git a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_gateway.go b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_gateway.go index 7c85aa8ede..f38ec7ce12 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_gateway.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_gateway.go @@ -19,179 +19,31 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1 "sigs.k8s.io/gateway-api/apis/v1" apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" + typedapisv1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1" ) -// FakeGateways implements GatewayInterface -type FakeGateways struct { +// fakeGateways implements GatewayInterface +type fakeGateways struct { + *gentype.FakeClientWithListAndApply[*v1.Gateway, *v1.GatewayList, *apisv1.GatewayApplyConfiguration] Fake *FakeGatewayV1 - ns string -} - -var gatewaysResource = v1.SchemeGroupVersion.WithResource("gateways") - -var gatewaysKind = v1.SchemeGroupVersion.WithKind("Gateway") - -// Get takes name of the gateway, and returns the corresponding gateway object, and an error if there is any. -func (c *FakeGateways) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(gatewaysResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// List takes label and field selectors, and returns the list of Gateways that match those selectors. -func (c *FakeGateways) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GatewayList, err error) { - emptyResult := &v1.GatewayList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(gatewaysResource, gatewaysKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GatewayList{ListMeta: obj.(*v1.GatewayList).ListMeta} - for _, item := range obj.(*v1.GatewayList).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 gateways. -func (c *FakeGateways) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(gatewaysResource, c.ns, opts)) - -} - -// Create takes the representation of a gateway and creates it. Returns the server's representation of the gateway, and an error, if there is any. -func (c *FakeGateways) Create(ctx context.Context, gateway *v1.Gateway, opts metav1.CreateOptions) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(gatewaysResource, c.ns, gateway, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// Update takes the representation of a gateway and updates it. Returns the server's representation of the gateway, and an error, if there is any. -func (c *FakeGateways) Update(ctx context.Context, gateway *v1.Gateway, opts metav1.UpdateOptions) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(gatewaysResource, c.ns, gateway, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), 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 *FakeGateways) UpdateStatus(ctx context.Context, gateway *v1.Gateway, opts metav1.UpdateOptions) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(gatewaysResource, "status", c.ns, gateway, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// Delete takes name of the gateway and deletes it. Returns an error if one occurs. -func (c *FakeGateways) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(gatewaysResource, c.ns, name, opts), &v1.Gateway{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGateways) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(gatewaysResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GatewayList{}) - return err -} - -// Patch applies the patch and returns the patched gateway. -func (c *FakeGateways) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewaysResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied gateway. -func (c *FakeGateways) Apply(ctx context.Context, gateway *apisv1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Gateway, err error) { - if gateway == nil { - return nil, fmt.Errorf("gateway provided to Apply must not be nil") - } - data, err := json.Marshal(gateway) - if err != nil { - return nil, err - } - name := gateway.Name - if name == nil { - return nil, fmt.Errorf("gateway.Name must be provided to Apply") - } - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewaysResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeGateways) ApplyStatus(ctx context.Context, gateway *apisv1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Gateway, err error) { - if gateway == nil { - return nil, fmt.Errorf("gateway provided to Apply must not be nil") - } - data, err := json.Marshal(gateway) - if err != nil { - return nil, err - } - name := gateway.Name - if name == nil { - return nil, fmt.Errorf("gateway.Name must be provided to Apply") - } - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewaysResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeGateways(fake *FakeGatewayV1, namespace string) typedapisv1.GatewayInterface { + return &fakeGateways{ + gentype.NewFakeClientWithListAndApply[*v1.Gateway, *v1.GatewayList, *apisv1.GatewayApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("gateways"), + v1.SchemeGroupVersion.WithKind("Gateway"), + func() *v1.Gateway { return &v1.Gateway{} }, + func() *v1.GatewayList { return &v1.GatewayList{} }, + func(dst, src *v1.GatewayList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GatewayList) []*v1.Gateway { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.GatewayList, items []*v1.Gateway) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.Gateway), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_gatewayclass.go b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_gatewayclass.go index 02e9b84773..c7d6be5277 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_gatewayclass.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_gatewayclass.go @@ -19,168 +19,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1 "sigs.k8s.io/gateway-api/apis/v1" apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" + typedapisv1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1" ) -// FakeGatewayClasses implements GatewayClassInterface -type FakeGatewayClasses struct { +// fakeGatewayClasses implements GatewayClassInterface +type fakeGatewayClasses struct { + *gentype.FakeClientWithListAndApply[*v1.GatewayClass, *v1.GatewayClassList, *apisv1.GatewayClassApplyConfiguration] Fake *FakeGatewayV1 } -var gatewayclassesResource = v1.SchemeGroupVersion.WithResource("gatewayclasses") - -var gatewayclassesKind = v1.SchemeGroupVersion.WithKind("GatewayClass") - -// Get takes name of the gatewayClass, and returns the corresponding gatewayClass object, and an error if there is any. -func (c *FakeGatewayClasses) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.GatewayClass, err error) { - emptyResult := &v1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(gatewayclassesResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayClass), err -} - -// List takes label and field selectors, and returns the list of GatewayClasses that match those selectors. -func (c *FakeGatewayClasses) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GatewayClassList, err error) { - emptyResult := &v1.GatewayClassList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(gatewayclassesResource, gatewayclassesKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GatewayClassList{ListMeta: obj.(*v1.GatewayClassList).ListMeta} - for _, item := range obj.(*v1.GatewayClassList).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 gatewayClasses. -func (c *FakeGatewayClasses) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(gatewayclassesResource, opts)) -} - -// Create takes the representation of a gatewayClass and creates it. Returns the server's representation of the gatewayClass, and an error, if there is any. -func (c *FakeGatewayClasses) Create(ctx context.Context, gatewayClass *v1.GatewayClass, opts metav1.CreateOptions) (result *v1.GatewayClass, err error) { - emptyResult := &v1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(gatewayclassesResource, gatewayClass, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayClass), err -} - -// Update takes the representation of a gatewayClass and updates it. Returns the server's representation of the gatewayClass, and an error, if there is any. -func (c *FakeGatewayClasses) Update(ctx context.Context, gatewayClass *v1.GatewayClass, opts metav1.UpdateOptions) (result *v1.GatewayClass, err error) { - emptyResult := &v1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(gatewayclassesResource, gatewayClass, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayClass), 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 *FakeGatewayClasses) UpdateStatus(ctx context.Context, gatewayClass *v1.GatewayClass, opts metav1.UpdateOptions) (result *v1.GatewayClass, err error) { - emptyResult := &v1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(gatewayclassesResource, "status", gatewayClass, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayClass), err -} - -// Delete takes name of the gatewayClass and deletes it. Returns an error if one occurs. -func (c *FakeGatewayClasses) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(gatewayclassesResource, name, opts), &v1.GatewayClass{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGatewayClasses) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(gatewayclassesResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GatewayClassList{}) - return err -} - -// Patch applies the patch and returns the patched gatewayClass. -func (c *FakeGatewayClasses) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GatewayClass, err error) { - emptyResult := &v1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(gatewayclassesResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayClass), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied gatewayClass. -func (c *FakeGatewayClasses) Apply(ctx context.Context, gatewayClass *apisv1.GatewayClassApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GatewayClass, err error) { - if gatewayClass == nil { - return nil, fmt.Errorf("gatewayClass provided to Apply must not be nil") - } - data, err := json.Marshal(gatewayClass) - if err != nil { - return nil, err - } - name := gatewayClass.Name - if name == nil { - return nil, fmt.Errorf("gatewayClass.Name must be provided to Apply") - } - emptyResult := &v1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(gatewayclassesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayClass), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeGatewayClasses) ApplyStatus(ctx context.Context, gatewayClass *apisv1.GatewayClassApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GatewayClass, err error) { - if gatewayClass == nil { - return nil, fmt.Errorf("gatewayClass provided to Apply must not be nil") - } - data, err := json.Marshal(gatewayClass) - if err != nil { - return nil, err - } - name := gatewayClass.Name - if name == nil { - return nil, fmt.Errorf("gatewayClass.Name must be provided to Apply") - } - emptyResult := &v1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(gatewayclassesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeGatewayClasses(fake *FakeGatewayV1) typedapisv1.GatewayClassInterface { + return &fakeGatewayClasses{ + gentype.NewFakeClientWithListAndApply[*v1.GatewayClass, *v1.GatewayClassList, *apisv1.GatewayClassApplyConfiguration]( + fake.Fake, + "", + v1.SchemeGroupVersion.WithResource("gatewayclasses"), + v1.SchemeGroupVersion.WithKind("GatewayClass"), + func() *v1.GatewayClass { return &v1.GatewayClass{} }, + func() *v1.GatewayClassList { return &v1.GatewayClassList{} }, + func(dst, src *v1.GatewayClassList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GatewayClassList) []*v1.GatewayClass { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.GatewayClassList, items []*v1.GatewayClass) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.GatewayClass), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_grpcroute.go b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_grpcroute.go index bda7bc36e4..bb99245159 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_grpcroute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_grpcroute.go @@ -19,179 +19,31 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1 "sigs.k8s.io/gateway-api/apis/v1" apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" + typedapisv1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1" ) -// FakeGRPCRoutes implements GRPCRouteInterface -type FakeGRPCRoutes struct { +// fakeGRPCRoutes implements GRPCRouteInterface +type fakeGRPCRoutes struct { + *gentype.FakeClientWithListAndApply[*v1.GRPCRoute, *v1.GRPCRouteList, *apisv1.GRPCRouteApplyConfiguration] Fake *FakeGatewayV1 - ns string -} - -var grpcroutesResource = v1.SchemeGroupVersion.WithResource("grpcroutes") - -var grpcroutesKind = v1.SchemeGroupVersion.WithKind("GRPCRoute") - -// Get takes name of the gRPCRoute, and returns the corresponding gRPCRoute object, and an error if there is any. -func (c *FakeGRPCRoutes) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.GRPCRoute, err error) { - emptyResult := &v1.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(grpcroutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GRPCRoute), err -} - -// List takes label and field selectors, and returns the list of GRPCRoutes that match those selectors. -func (c *FakeGRPCRoutes) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GRPCRouteList, err error) { - emptyResult := &v1.GRPCRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(grpcroutesResource, grpcroutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GRPCRouteList{ListMeta: obj.(*v1.GRPCRouteList).ListMeta} - for _, item := range obj.(*v1.GRPCRouteList).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 gRPCRoutes. -func (c *FakeGRPCRoutes) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(grpcroutesResource, c.ns, opts)) - -} - -// Create takes the representation of a gRPCRoute and creates it. Returns the server's representation of the gRPCRoute, and an error, if there is any. -func (c *FakeGRPCRoutes) Create(ctx context.Context, gRPCRoute *v1.GRPCRoute, opts metav1.CreateOptions) (result *v1.GRPCRoute, err error) { - emptyResult := &v1.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(grpcroutesResource, c.ns, gRPCRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GRPCRoute), err -} - -// Update takes the representation of a gRPCRoute and updates it. Returns the server's representation of the gRPCRoute, and an error, if there is any. -func (c *FakeGRPCRoutes) Update(ctx context.Context, gRPCRoute *v1.GRPCRoute, opts metav1.UpdateOptions) (result *v1.GRPCRoute, err error) { - emptyResult := &v1.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(grpcroutesResource, c.ns, gRPCRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GRPCRoute), 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 *FakeGRPCRoutes) UpdateStatus(ctx context.Context, gRPCRoute *v1.GRPCRoute, opts metav1.UpdateOptions) (result *v1.GRPCRoute, err error) { - emptyResult := &v1.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(grpcroutesResource, "status", c.ns, gRPCRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GRPCRoute), err -} - -// Delete takes name of the gRPCRoute and deletes it. Returns an error if one occurs. -func (c *FakeGRPCRoutes) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(grpcroutesResource, c.ns, name, opts), &v1.GRPCRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGRPCRoutes) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(grpcroutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GRPCRouteList{}) - return err -} - -// Patch applies the patch and returns the patched gRPCRoute. -func (c *FakeGRPCRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GRPCRoute, err error) { - emptyResult := &v1.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(grpcroutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GRPCRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied gRPCRoute. -func (c *FakeGRPCRoutes) Apply(ctx context.Context, gRPCRoute *apisv1.GRPCRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GRPCRoute, err error) { - if gRPCRoute == nil { - return nil, fmt.Errorf("gRPCRoute provided to Apply must not be nil") - } - data, err := json.Marshal(gRPCRoute) - if err != nil { - return nil, err - } - name := gRPCRoute.Name - if name == nil { - return nil, fmt.Errorf("gRPCRoute.Name must be provided to Apply") - } - emptyResult := &v1.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(grpcroutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GRPCRoute), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeGRPCRoutes) ApplyStatus(ctx context.Context, gRPCRoute *apisv1.GRPCRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GRPCRoute, err error) { - if gRPCRoute == nil { - return nil, fmt.Errorf("gRPCRoute provided to Apply must not be nil") - } - data, err := json.Marshal(gRPCRoute) - if err != nil { - return nil, err - } - name := gRPCRoute.Name - if name == nil { - return nil, fmt.Errorf("gRPCRoute.Name must be provided to Apply") - } - emptyResult := &v1.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(grpcroutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeGRPCRoutes(fake *FakeGatewayV1, namespace string) typedapisv1.GRPCRouteInterface { + return &fakeGRPCRoutes{ + gentype.NewFakeClientWithListAndApply[*v1.GRPCRoute, *v1.GRPCRouteList, *apisv1.GRPCRouteApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("grpcroutes"), + v1.SchemeGroupVersion.WithKind("GRPCRoute"), + func() *v1.GRPCRoute { return &v1.GRPCRoute{} }, + func() *v1.GRPCRouteList { return &v1.GRPCRouteList{} }, + func(dst, src *v1.GRPCRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GRPCRouteList) []*v1.GRPCRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.GRPCRouteList, items []*v1.GRPCRoute) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.GRPCRoute), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_httproute.go b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_httproute.go index 468b1e2dc3..1975567804 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_httproute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/fake/fake_httproute.go @@ -19,179 +19,31 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1 "sigs.k8s.io/gateway-api/apis/v1" apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" + typedapisv1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1" ) -// FakeHTTPRoutes implements HTTPRouteInterface -type FakeHTTPRoutes struct { +// fakeHTTPRoutes implements HTTPRouteInterface +type fakeHTTPRoutes struct { + *gentype.FakeClientWithListAndApply[*v1.HTTPRoute, *v1.HTTPRouteList, *apisv1.HTTPRouteApplyConfiguration] Fake *FakeGatewayV1 - ns string -} - -var httproutesResource = v1.SchemeGroupVersion.WithResource("httproutes") - -var httproutesKind = v1.SchemeGroupVersion.WithKind("HTTPRoute") - -// Get takes name of the hTTPRoute, and returns the corresponding hTTPRoute object, and an error if there is any. -func (c *FakeHTTPRoutes) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.HTTPRoute, err error) { - emptyResult := &v1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(httproutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.HTTPRoute), err -} - -// List takes label and field selectors, and returns the list of HTTPRoutes that match those selectors. -func (c *FakeHTTPRoutes) List(ctx context.Context, opts metav1.ListOptions) (result *v1.HTTPRouteList, err error) { - emptyResult := &v1.HTTPRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(httproutesResource, httproutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.HTTPRouteList{ListMeta: obj.(*v1.HTTPRouteList).ListMeta} - for _, item := range obj.(*v1.HTTPRouteList).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 hTTPRoutes. -func (c *FakeHTTPRoutes) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(httproutesResource, c.ns, opts)) - -} - -// Create takes the representation of a hTTPRoute and creates it. Returns the server's representation of the hTTPRoute, and an error, if there is any. -func (c *FakeHTTPRoutes) Create(ctx context.Context, hTTPRoute *v1.HTTPRoute, opts metav1.CreateOptions) (result *v1.HTTPRoute, err error) { - emptyResult := &v1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(httproutesResource, c.ns, hTTPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.HTTPRoute), err -} - -// Update takes the representation of a hTTPRoute and updates it. Returns the server's representation of the hTTPRoute, and an error, if there is any. -func (c *FakeHTTPRoutes) Update(ctx context.Context, hTTPRoute *v1.HTTPRoute, opts metav1.UpdateOptions) (result *v1.HTTPRoute, err error) { - emptyResult := &v1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(httproutesResource, c.ns, hTTPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.HTTPRoute), 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 *FakeHTTPRoutes) UpdateStatus(ctx context.Context, hTTPRoute *v1.HTTPRoute, opts metav1.UpdateOptions) (result *v1.HTTPRoute, err error) { - emptyResult := &v1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(httproutesResource, "status", c.ns, hTTPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.HTTPRoute), err -} - -// Delete takes name of the hTTPRoute and deletes it. Returns an error if one occurs. -func (c *FakeHTTPRoutes) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(httproutesResource, c.ns, name, opts), &v1.HTTPRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeHTTPRoutes) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(httproutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.HTTPRouteList{}) - return err -} - -// Patch applies the patch and returns the patched hTTPRoute. -func (c *FakeHTTPRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.HTTPRoute, err error) { - emptyResult := &v1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(httproutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.HTTPRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied hTTPRoute. -func (c *FakeHTTPRoutes) Apply(ctx context.Context, hTTPRoute *apisv1.HTTPRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.HTTPRoute, err error) { - if hTTPRoute == nil { - return nil, fmt.Errorf("hTTPRoute provided to Apply must not be nil") - } - data, err := json.Marshal(hTTPRoute) - if err != nil { - return nil, err - } - name := hTTPRoute.Name - if name == nil { - return nil, fmt.Errorf("hTTPRoute.Name must be provided to Apply") - } - emptyResult := &v1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(httproutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.HTTPRoute), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeHTTPRoutes) ApplyStatus(ctx context.Context, hTTPRoute *apisv1.HTTPRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.HTTPRoute, err error) { - if hTTPRoute == nil { - return nil, fmt.Errorf("hTTPRoute provided to Apply must not be nil") - } - data, err := json.Marshal(hTTPRoute) - if err != nil { - return nil, err - } - name := hTTPRoute.Name - if name == nil { - return nil, fmt.Errorf("hTTPRoute.Name must be provided to Apply") - } - emptyResult := &v1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(httproutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeHTTPRoutes(fake *FakeGatewayV1, namespace string) typedapisv1.HTTPRouteInterface { + return &fakeHTTPRoutes{ + gentype.NewFakeClientWithListAndApply[*v1.HTTPRoute, *v1.HTTPRouteList, *apisv1.HTTPRouteApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("httproutes"), + v1.SchemeGroupVersion.WithKind("HTTPRoute"), + func() *v1.HTTPRoute { return &v1.HTTPRoute{} }, + func() *v1.HTTPRouteList { return &v1.HTTPRouteList{} }, + func(dst, src *v1.HTTPRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1.HTTPRouteList) []*v1.HTTPRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.HTTPRouteList, items []*v1.HTTPRoute) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.HTTPRoute), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1/gateway.go b/pkg/client/clientset/versioned/typed/apis/v1/gateway.go index 44e612b65a..4b45900a58 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/gateway.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/gateway.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - "context" + context "context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1 "sigs.k8s.io/gateway-api/apis/v1" - apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" + applyconfigurationapisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type GatewaysGetter interface { // GatewayInterface has methods to work with Gateway resources. type GatewayInterface interface { - Create(ctx context.Context, gateway *v1.Gateway, opts metav1.CreateOptions) (*v1.Gateway, error) - Update(ctx context.Context, gateway *v1.Gateway, opts metav1.UpdateOptions) (*v1.Gateway, error) + Create(ctx context.Context, gateway *apisv1.Gateway, opts metav1.CreateOptions) (*apisv1.Gateway, error) + Update(ctx context.Context, gateway *apisv1.Gateway, opts metav1.UpdateOptions) (*apisv1.Gateway, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, gateway *v1.Gateway, opts metav1.UpdateOptions) (*v1.Gateway, error) + UpdateStatus(ctx context.Context, gateway *apisv1.Gateway, opts metav1.UpdateOptions) (*apisv1.Gateway, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.Gateway, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GatewayList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*apisv1.Gateway, error) + List(ctx context.Context, opts metav1.ListOptions) (*apisv1.GatewayList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Gateway, err error) - Apply(ctx context.Context, gateway *apisv1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Gateway, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *apisv1.Gateway, err error) + Apply(ctx context.Context, gateway *applyconfigurationapisv1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *apisv1.Gateway, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, gateway *apisv1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Gateway, err error) + ApplyStatus(ctx context.Context, gateway *applyconfigurationapisv1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *apisv1.Gateway, err error) GatewayExpansion } // gateways implements GatewayInterface type gateways struct { - *gentype.ClientWithListAndApply[*v1.Gateway, *v1.GatewayList, *apisv1.GatewayApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1.Gateway, *apisv1.GatewayList, *applyconfigurationapisv1.GatewayApplyConfiguration] } // newGateways returns a Gateways func newGateways(c *GatewayV1Client, namespace string) *gateways { return &gateways{ - gentype.NewClientWithListAndApply[*v1.Gateway, *v1.GatewayList, *apisv1.GatewayApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1.Gateway, *apisv1.GatewayList, *applyconfigurationapisv1.GatewayApplyConfiguration]( "gateways", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.Gateway { return &v1.Gateway{} }, - func() *v1.GatewayList { return &v1.GatewayList{} }), + func() *apisv1.Gateway { return &apisv1.Gateway{} }, + func() *apisv1.GatewayList { return &apisv1.GatewayList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1/gatewayclass.go b/pkg/client/clientset/versioned/typed/apis/v1/gatewayclass.go index 7f68e5f038..b4bd78f313 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/gatewayclass.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/gatewayclass.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - "context" + context "context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1 "sigs.k8s.io/gateway-api/apis/v1" - apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" + applyconfigurationapisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type GatewayClassesGetter interface { // GatewayClassInterface has methods to work with GatewayClass resources. type GatewayClassInterface interface { - Create(ctx context.Context, gatewayClass *v1.GatewayClass, opts metav1.CreateOptions) (*v1.GatewayClass, error) - Update(ctx context.Context, gatewayClass *v1.GatewayClass, opts metav1.UpdateOptions) (*v1.GatewayClass, error) + Create(ctx context.Context, gatewayClass *apisv1.GatewayClass, opts metav1.CreateOptions) (*apisv1.GatewayClass, error) + Update(ctx context.Context, gatewayClass *apisv1.GatewayClass, opts metav1.UpdateOptions) (*apisv1.GatewayClass, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, gatewayClass *v1.GatewayClass, opts metav1.UpdateOptions) (*v1.GatewayClass, error) + UpdateStatus(ctx context.Context, gatewayClass *apisv1.GatewayClass, opts metav1.UpdateOptions) (*apisv1.GatewayClass, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.GatewayClass, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GatewayClassList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*apisv1.GatewayClass, error) + List(ctx context.Context, opts metav1.ListOptions) (*apisv1.GatewayClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GatewayClass, err error) - Apply(ctx context.Context, gatewayClass *apisv1.GatewayClassApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GatewayClass, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *apisv1.GatewayClass, err error) + Apply(ctx context.Context, gatewayClass *applyconfigurationapisv1.GatewayClassApplyConfiguration, opts metav1.ApplyOptions) (result *apisv1.GatewayClass, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, gatewayClass *apisv1.GatewayClassApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GatewayClass, err error) + ApplyStatus(ctx context.Context, gatewayClass *applyconfigurationapisv1.GatewayClassApplyConfiguration, opts metav1.ApplyOptions) (result *apisv1.GatewayClass, err error) GatewayClassExpansion } // gatewayClasses implements GatewayClassInterface type gatewayClasses struct { - *gentype.ClientWithListAndApply[*v1.GatewayClass, *v1.GatewayClassList, *apisv1.GatewayClassApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1.GatewayClass, *apisv1.GatewayClassList, *applyconfigurationapisv1.GatewayClassApplyConfiguration] } // newGatewayClasses returns a GatewayClasses func newGatewayClasses(c *GatewayV1Client) *gatewayClasses { return &gatewayClasses{ - gentype.NewClientWithListAndApply[*v1.GatewayClass, *v1.GatewayClassList, *apisv1.GatewayClassApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1.GatewayClass, *apisv1.GatewayClassList, *applyconfigurationapisv1.GatewayClassApplyConfiguration]( "gatewayclasses", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1.GatewayClass { return &v1.GatewayClass{} }, - func() *v1.GatewayClassList { return &v1.GatewayClassList{} }), + func() *apisv1.GatewayClass { return &apisv1.GatewayClass{} }, + func() *apisv1.GatewayClassList { return &apisv1.GatewayClassList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1/grpcroute.go b/pkg/client/clientset/versioned/typed/apis/v1/grpcroute.go index 37d7406dc4..e57f53658c 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/grpcroute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/grpcroute.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - "context" + context "context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1 "sigs.k8s.io/gateway-api/apis/v1" - apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" + applyconfigurationapisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type GRPCRoutesGetter interface { // GRPCRouteInterface has methods to work with GRPCRoute resources. type GRPCRouteInterface interface { - Create(ctx context.Context, gRPCRoute *v1.GRPCRoute, opts metav1.CreateOptions) (*v1.GRPCRoute, error) - Update(ctx context.Context, gRPCRoute *v1.GRPCRoute, opts metav1.UpdateOptions) (*v1.GRPCRoute, error) + Create(ctx context.Context, gRPCRoute *apisv1.GRPCRoute, opts metav1.CreateOptions) (*apisv1.GRPCRoute, error) + Update(ctx context.Context, gRPCRoute *apisv1.GRPCRoute, opts metav1.UpdateOptions) (*apisv1.GRPCRoute, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, gRPCRoute *v1.GRPCRoute, opts metav1.UpdateOptions) (*v1.GRPCRoute, error) + UpdateStatus(ctx context.Context, gRPCRoute *apisv1.GRPCRoute, opts metav1.UpdateOptions) (*apisv1.GRPCRoute, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.GRPCRoute, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GRPCRouteList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*apisv1.GRPCRoute, error) + List(ctx context.Context, opts metav1.ListOptions) (*apisv1.GRPCRouteList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GRPCRoute, err error) - Apply(ctx context.Context, gRPCRoute *apisv1.GRPCRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GRPCRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *apisv1.GRPCRoute, err error) + Apply(ctx context.Context, gRPCRoute *applyconfigurationapisv1.GRPCRouteApplyConfiguration, opts metav1.ApplyOptions) (result *apisv1.GRPCRoute, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, gRPCRoute *apisv1.GRPCRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GRPCRoute, err error) + ApplyStatus(ctx context.Context, gRPCRoute *applyconfigurationapisv1.GRPCRouteApplyConfiguration, opts metav1.ApplyOptions) (result *apisv1.GRPCRoute, err error) GRPCRouteExpansion } // gRPCRoutes implements GRPCRouteInterface type gRPCRoutes struct { - *gentype.ClientWithListAndApply[*v1.GRPCRoute, *v1.GRPCRouteList, *apisv1.GRPCRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1.GRPCRoute, *apisv1.GRPCRouteList, *applyconfigurationapisv1.GRPCRouteApplyConfiguration] } // newGRPCRoutes returns a GRPCRoutes func newGRPCRoutes(c *GatewayV1Client, namespace string) *gRPCRoutes { return &gRPCRoutes{ - gentype.NewClientWithListAndApply[*v1.GRPCRoute, *v1.GRPCRouteList, *apisv1.GRPCRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1.GRPCRoute, *apisv1.GRPCRouteList, *applyconfigurationapisv1.GRPCRouteApplyConfiguration]( "grpcroutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.GRPCRoute { return &v1.GRPCRoute{} }, - func() *v1.GRPCRouteList { return &v1.GRPCRouteList{} }), + func() *apisv1.GRPCRoute { return &apisv1.GRPCRoute{} }, + func() *apisv1.GRPCRouteList { return &apisv1.GRPCRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1/httproute.go b/pkg/client/clientset/versioned/typed/apis/v1/httproute.go index d62867faba..07b0b843a2 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1/httproute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1/httproute.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - "context" + context "context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1 "sigs.k8s.io/gateway-api/apis/v1" - apisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" + applyconfigurationapisv1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type HTTPRoutesGetter interface { // HTTPRouteInterface has methods to work with HTTPRoute resources. type HTTPRouteInterface interface { - Create(ctx context.Context, hTTPRoute *v1.HTTPRoute, opts metav1.CreateOptions) (*v1.HTTPRoute, error) - Update(ctx context.Context, hTTPRoute *v1.HTTPRoute, opts metav1.UpdateOptions) (*v1.HTTPRoute, error) + Create(ctx context.Context, hTTPRoute *apisv1.HTTPRoute, opts metav1.CreateOptions) (*apisv1.HTTPRoute, error) + Update(ctx context.Context, hTTPRoute *apisv1.HTTPRoute, opts metav1.UpdateOptions) (*apisv1.HTTPRoute, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, hTTPRoute *v1.HTTPRoute, opts metav1.UpdateOptions) (*v1.HTTPRoute, error) + UpdateStatus(ctx context.Context, hTTPRoute *apisv1.HTTPRoute, opts metav1.UpdateOptions) (*apisv1.HTTPRoute, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.HTTPRoute, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.HTTPRouteList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*apisv1.HTTPRoute, error) + List(ctx context.Context, opts metav1.ListOptions) (*apisv1.HTTPRouteList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.HTTPRoute, err error) - Apply(ctx context.Context, hTTPRoute *apisv1.HTTPRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.HTTPRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *apisv1.HTTPRoute, err error) + Apply(ctx context.Context, hTTPRoute *applyconfigurationapisv1.HTTPRouteApplyConfiguration, opts metav1.ApplyOptions) (result *apisv1.HTTPRoute, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, hTTPRoute *apisv1.HTTPRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.HTTPRoute, err error) + ApplyStatus(ctx context.Context, hTTPRoute *applyconfigurationapisv1.HTTPRouteApplyConfiguration, opts metav1.ApplyOptions) (result *apisv1.HTTPRoute, err error) HTTPRouteExpansion } // hTTPRoutes implements HTTPRouteInterface type hTTPRoutes struct { - *gentype.ClientWithListAndApply[*v1.HTTPRoute, *v1.HTTPRouteList, *apisv1.HTTPRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1.HTTPRoute, *apisv1.HTTPRouteList, *applyconfigurationapisv1.HTTPRouteApplyConfiguration] } // newHTTPRoutes returns a HTTPRoutes func newHTTPRoutes(c *GatewayV1Client, namespace string) *hTTPRoutes { return &hTTPRoutes{ - gentype.NewClientWithListAndApply[*v1.HTTPRoute, *v1.HTTPRouteList, *apisv1.HTTPRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1.HTTPRoute, *apisv1.HTTPRouteList, *applyconfigurationapisv1.HTTPRouteApplyConfiguration]( "httproutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.HTTPRoute { return &v1.HTTPRoute{} }, - func() *v1.HTTPRouteList { return &v1.HTTPRouteList{} }), + func() *apisv1.HTTPRoute { return &apisv1.HTTPRoute{} }, + func() *apisv1.HTTPRouteList { return &apisv1.HTTPRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/apis_client.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/apis_client.go index ff577d35e2..97b6ad062f 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/apis_client.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/apis_client.go @@ -19,11 +19,11 @@ limitations under the License. package v1alpha2 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) type GatewayV1alpha2Interface interface { @@ -105,10 +105,10 @@ func New(c rest.Interface) *GatewayV1alpha2Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha2.SchemeGroupVersion + gv := apisv1alpha2.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_apis_client.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_apis_client.go index a2e69883a0..8fa03db593 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_apis_client.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_apis_client.go @@ -29,23 +29,23 @@ type FakeGatewayV1alpha2 struct { } func (c *FakeGatewayV1alpha2) GRPCRoutes(namespace string) v1alpha2.GRPCRouteInterface { - return &FakeGRPCRoutes{c, namespace} + return newFakeGRPCRoutes(c, namespace) } func (c *FakeGatewayV1alpha2) ReferenceGrants(namespace string) v1alpha2.ReferenceGrantInterface { - return &FakeReferenceGrants{c, namespace} + return newFakeReferenceGrants(c, namespace) } func (c *FakeGatewayV1alpha2) TCPRoutes(namespace string) v1alpha2.TCPRouteInterface { - return &FakeTCPRoutes{c, namespace} + return newFakeTCPRoutes(c, namespace) } func (c *FakeGatewayV1alpha2) TLSRoutes(namespace string) v1alpha2.TLSRouteInterface { - return &FakeTLSRoutes{c, namespace} + return newFakeTLSRoutes(c, namespace) } func (c *FakeGatewayV1alpha2) UDPRoutes(namespace string) v1alpha2.UDPRouteInterface { - return &FakeUDPRoutes{c, namespace} + return newFakeUDPRoutes(c, namespace) } // RESTClient returns a RESTClient that is used to communicate diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_grpcroute.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_grpcroute.go index dbe6013e73..111d8e6960 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_grpcroute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_grpcroute.go @@ -19,179 +19,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + typedapisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1alpha2" ) -// FakeGRPCRoutes implements GRPCRouteInterface -type FakeGRPCRoutes struct { +// fakeGRPCRoutes implements GRPCRouteInterface +type fakeGRPCRoutes struct { + *gentype.FakeClientWithListAndApply[*v1alpha2.GRPCRoute, *v1alpha2.GRPCRouteList, *apisv1alpha2.GRPCRouteApplyConfiguration] Fake *FakeGatewayV1alpha2 - ns string -} - -var grpcroutesResource = v1alpha2.SchemeGroupVersion.WithResource("grpcroutes") - -var grpcroutesKind = v1alpha2.SchemeGroupVersion.WithKind("GRPCRoute") - -// Get takes name of the gRPCRoute, and returns the corresponding gRPCRoute object, and an error if there is any. -func (c *FakeGRPCRoutes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha2.GRPCRoute, err error) { - emptyResult := &v1alpha2.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(grpcroutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.GRPCRoute), err -} - -// List takes label and field selectors, and returns the list of GRPCRoutes that match those selectors. -func (c *FakeGRPCRoutes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha2.GRPCRouteList, err error) { - emptyResult := &v1alpha2.GRPCRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(grpcroutesResource, grpcroutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha2.GRPCRouteList{ListMeta: obj.(*v1alpha2.GRPCRouteList).ListMeta} - for _, item := range obj.(*v1alpha2.GRPCRouteList).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 gRPCRoutes. -func (c *FakeGRPCRoutes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(grpcroutesResource, c.ns, opts)) - -} - -// Create takes the representation of a gRPCRoute and creates it. Returns the server's representation of the gRPCRoute, and an error, if there is any. -func (c *FakeGRPCRoutes) Create(ctx context.Context, gRPCRoute *v1alpha2.GRPCRoute, opts v1.CreateOptions) (result *v1alpha2.GRPCRoute, err error) { - emptyResult := &v1alpha2.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(grpcroutesResource, c.ns, gRPCRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.GRPCRoute), err -} - -// Update takes the representation of a gRPCRoute and updates it. Returns the server's representation of the gRPCRoute, and an error, if there is any. -func (c *FakeGRPCRoutes) Update(ctx context.Context, gRPCRoute *v1alpha2.GRPCRoute, opts v1.UpdateOptions) (result *v1alpha2.GRPCRoute, err error) { - emptyResult := &v1alpha2.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(grpcroutesResource, c.ns, gRPCRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.GRPCRoute), 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 *FakeGRPCRoutes) UpdateStatus(ctx context.Context, gRPCRoute *v1alpha2.GRPCRoute, opts v1.UpdateOptions) (result *v1alpha2.GRPCRoute, err error) { - emptyResult := &v1alpha2.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(grpcroutesResource, "status", c.ns, gRPCRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.GRPCRoute), err -} - -// Delete takes name of the gRPCRoute and deletes it. Returns an error if one occurs. -func (c *FakeGRPCRoutes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(grpcroutesResource, c.ns, name, opts), &v1alpha2.GRPCRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGRPCRoutes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(grpcroutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha2.GRPCRouteList{}) - return err -} - -// Patch applies the patch and returns the patched gRPCRoute. -func (c *FakeGRPCRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.GRPCRoute, err error) { - emptyResult := &v1alpha2.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(grpcroutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.GRPCRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied gRPCRoute. -func (c *FakeGRPCRoutes) Apply(ctx context.Context, gRPCRoute *apisv1alpha2.GRPCRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.GRPCRoute, err error) { - if gRPCRoute == nil { - return nil, fmt.Errorf("gRPCRoute provided to Apply must not be nil") - } - data, err := json.Marshal(gRPCRoute) - if err != nil { - return nil, err - } - name := gRPCRoute.Name - if name == nil { - return nil, fmt.Errorf("gRPCRoute.Name must be provided to Apply") - } - emptyResult := &v1alpha2.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(grpcroutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.GRPCRoute), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeGRPCRoutes) ApplyStatus(ctx context.Context, gRPCRoute *apisv1alpha2.GRPCRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.GRPCRoute, err error) { - if gRPCRoute == nil { - return nil, fmt.Errorf("gRPCRoute provided to Apply must not be nil") - } - data, err := json.Marshal(gRPCRoute) - if err != nil { - return nil, err - } - name := gRPCRoute.Name - if name == nil { - return nil, fmt.Errorf("gRPCRoute.Name must be provided to Apply") - } - emptyResult := &v1alpha2.GRPCRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(grpcroutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeGRPCRoutes(fake *FakeGatewayV1alpha2, namespace string) typedapisv1alpha2.GRPCRouteInterface { + return &fakeGRPCRoutes{ + gentype.NewFakeClientWithListAndApply[*v1alpha2.GRPCRoute, *v1alpha2.GRPCRouteList, *apisv1alpha2.GRPCRouteApplyConfiguration]( + fake.Fake, + namespace, + v1alpha2.SchemeGroupVersion.WithResource("grpcroutes"), + v1alpha2.SchemeGroupVersion.WithKind("GRPCRoute"), + func() *v1alpha2.GRPCRoute { return &v1alpha2.GRPCRoute{} }, + func() *v1alpha2.GRPCRouteList { return &v1alpha2.GRPCRouteList{} }, + func(dst, src *v1alpha2.GRPCRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha2.GRPCRouteList) []*v1alpha2.GRPCRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha2.GRPCRouteList, items []*v1alpha2.GRPCRoute) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha2.GRPCRoute), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_referencegrant.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_referencegrant.go index 4268d0b074..1b57120c31 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_referencegrant.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_referencegrant.go @@ -19,142 +19,35 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + typedapisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1alpha2" ) -// FakeReferenceGrants implements ReferenceGrantInterface -type FakeReferenceGrants struct { +// fakeReferenceGrants implements ReferenceGrantInterface +type fakeReferenceGrants struct { + *gentype.FakeClientWithListAndApply[*v1alpha2.ReferenceGrant, *v1alpha2.ReferenceGrantList, *apisv1alpha2.ReferenceGrantApplyConfiguration] Fake *FakeGatewayV1alpha2 - ns string -} - -var referencegrantsResource = v1alpha2.SchemeGroupVersion.WithResource("referencegrants") - -var referencegrantsKind = v1alpha2.SchemeGroupVersion.WithKind("ReferenceGrant") - -// Get takes name of the referenceGrant, and returns the corresponding referenceGrant object, and an error if there is any. -func (c *FakeReferenceGrants) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha2.ReferenceGrant, err error) { - emptyResult := &v1alpha2.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(referencegrantsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.ReferenceGrant), err -} - -// List takes label and field selectors, and returns the list of ReferenceGrants that match those selectors. -func (c *FakeReferenceGrants) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha2.ReferenceGrantList, err error) { - emptyResult := &v1alpha2.ReferenceGrantList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(referencegrantsResource, referencegrantsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha2.ReferenceGrantList{ListMeta: obj.(*v1alpha2.ReferenceGrantList).ListMeta} - for _, item := range obj.(*v1alpha2.ReferenceGrantList).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 referenceGrants. -func (c *FakeReferenceGrants) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(referencegrantsResource, c.ns, opts)) - } -// Create takes the representation of a referenceGrant and creates it. Returns the server's representation of the referenceGrant, and an error, if there is any. -func (c *FakeReferenceGrants) Create(ctx context.Context, referenceGrant *v1alpha2.ReferenceGrant, opts v1.CreateOptions) (result *v1alpha2.ReferenceGrant, err error) { - emptyResult := &v1alpha2.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(referencegrantsResource, c.ns, referenceGrant, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.ReferenceGrant), err -} - -// Update takes the representation of a referenceGrant and updates it. Returns the server's representation of the referenceGrant, and an error, if there is any. -func (c *FakeReferenceGrants) Update(ctx context.Context, referenceGrant *v1alpha2.ReferenceGrant, opts v1.UpdateOptions) (result *v1alpha2.ReferenceGrant, err error) { - emptyResult := &v1alpha2.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(referencegrantsResource, c.ns, referenceGrant, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.ReferenceGrant), err -} - -// Delete takes name of the referenceGrant and deletes it. Returns an error if one occurs. -func (c *FakeReferenceGrants) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(referencegrantsResource, c.ns, name, opts), &v1alpha2.ReferenceGrant{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeReferenceGrants) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(referencegrantsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha2.ReferenceGrantList{}) - return err -} - -// Patch applies the patch and returns the patched referenceGrant. -func (c *FakeReferenceGrants) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.ReferenceGrant, err error) { - emptyResult := &v1alpha2.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(referencegrantsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.ReferenceGrant), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied referenceGrant. -func (c *FakeReferenceGrants) Apply(ctx context.Context, referenceGrant *apisv1alpha2.ReferenceGrantApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.ReferenceGrant, err error) { - if referenceGrant == nil { - return nil, fmt.Errorf("referenceGrant provided to Apply must not be nil") - } - data, err := json.Marshal(referenceGrant) - if err != nil { - return nil, err - } - name := referenceGrant.Name - if name == nil { - return nil, fmt.Errorf("referenceGrant.Name must be provided to Apply") - } - emptyResult := &v1alpha2.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(referencegrantsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeReferenceGrants(fake *FakeGatewayV1alpha2, namespace string) typedapisv1alpha2.ReferenceGrantInterface { + return &fakeReferenceGrants{ + gentype.NewFakeClientWithListAndApply[*v1alpha2.ReferenceGrant, *v1alpha2.ReferenceGrantList, *apisv1alpha2.ReferenceGrantApplyConfiguration]( + fake.Fake, + namespace, + v1alpha2.SchemeGroupVersion.WithResource("referencegrants"), + v1alpha2.SchemeGroupVersion.WithKind("ReferenceGrant"), + func() *v1alpha2.ReferenceGrant { return &v1alpha2.ReferenceGrant{} }, + func() *v1alpha2.ReferenceGrantList { return &v1alpha2.ReferenceGrantList{} }, + func(dst, src *v1alpha2.ReferenceGrantList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha2.ReferenceGrantList) []*v1alpha2.ReferenceGrant { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha2.ReferenceGrantList, items []*v1alpha2.ReferenceGrant) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha2.ReferenceGrant), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_tcproute.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_tcproute.go index bb90b445ca..180357c6c5 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_tcproute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_tcproute.go @@ -19,179 +19,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + typedapisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1alpha2" ) -// FakeTCPRoutes implements TCPRouteInterface -type FakeTCPRoutes struct { +// fakeTCPRoutes implements TCPRouteInterface +type fakeTCPRoutes struct { + *gentype.FakeClientWithListAndApply[*v1alpha2.TCPRoute, *v1alpha2.TCPRouteList, *apisv1alpha2.TCPRouteApplyConfiguration] Fake *FakeGatewayV1alpha2 - ns string -} - -var tcproutesResource = v1alpha2.SchemeGroupVersion.WithResource("tcproutes") - -var tcproutesKind = v1alpha2.SchemeGroupVersion.WithKind("TCPRoute") - -// Get takes name of the tCPRoute, and returns the corresponding tCPRoute object, and an error if there is any. -func (c *FakeTCPRoutes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha2.TCPRoute, err error) { - emptyResult := &v1alpha2.TCPRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(tcproutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TCPRoute), err -} - -// List takes label and field selectors, and returns the list of TCPRoutes that match those selectors. -func (c *FakeTCPRoutes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha2.TCPRouteList, err error) { - emptyResult := &v1alpha2.TCPRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(tcproutesResource, tcproutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha2.TCPRouteList{ListMeta: obj.(*v1alpha2.TCPRouteList).ListMeta} - for _, item := range obj.(*v1alpha2.TCPRouteList).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 tCPRoutes. -func (c *FakeTCPRoutes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(tcproutesResource, c.ns, opts)) - -} - -// Create takes the representation of a tCPRoute and creates it. Returns the server's representation of the tCPRoute, and an error, if there is any. -func (c *FakeTCPRoutes) Create(ctx context.Context, tCPRoute *v1alpha2.TCPRoute, opts v1.CreateOptions) (result *v1alpha2.TCPRoute, err error) { - emptyResult := &v1alpha2.TCPRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(tcproutesResource, c.ns, tCPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TCPRoute), err -} - -// Update takes the representation of a tCPRoute and updates it. Returns the server's representation of the tCPRoute, and an error, if there is any. -func (c *FakeTCPRoutes) Update(ctx context.Context, tCPRoute *v1alpha2.TCPRoute, opts v1.UpdateOptions) (result *v1alpha2.TCPRoute, err error) { - emptyResult := &v1alpha2.TCPRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(tcproutesResource, c.ns, tCPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TCPRoute), 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 *FakeTCPRoutes) UpdateStatus(ctx context.Context, tCPRoute *v1alpha2.TCPRoute, opts v1.UpdateOptions) (result *v1alpha2.TCPRoute, err error) { - emptyResult := &v1alpha2.TCPRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(tcproutesResource, "status", c.ns, tCPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TCPRoute), err -} - -// Delete takes name of the tCPRoute and deletes it. Returns an error if one occurs. -func (c *FakeTCPRoutes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(tcproutesResource, c.ns, name, opts), &v1alpha2.TCPRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeTCPRoutes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(tcproutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha2.TCPRouteList{}) - return err -} - -// Patch applies the patch and returns the patched tCPRoute. -func (c *FakeTCPRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.TCPRoute, err error) { - emptyResult := &v1alpha2.TCPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(tcproutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TCPRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied tCPRoute. -func (c *FakeTCPRoutes) Apply(ctx context.Context, tCPRoute *apisv1alpha2.TCPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.TCPRoute, err error) { - if tCPRoute == nil { - return nil, fmt.Errorf("tCPRoute provided to Apply must not be nil") - } - data, err := json.Marshal(tCPRoute) - if err != nil { - return nil, err - } - name := tCPRoute.Name - if name == nil { - return nil, fmt.Errorf("tCPRoute.Name must be provided to Apply") - } - emptyResult := &v1alpha2.TCPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(tcproutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TCPRoute), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeTCPRoutes) ApplyStatus(ctx context.Context, tCPRoute *apisv1alpha2.TCPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.TCPRoute, err error) { - if tCPRoute == nil { - return nil, fmt.Errorf("tCPRoute provided to Apply must not be nil") - } - data, err := json.Marshal(tCPRoute) - if err != nil { - return nil, err - } - name := tCPRoute.Name - if name == nil { - return nil, fmt.Errorf("tCPRoute.Name must be provided to Apply") - } - emptyResult := &v1alpha2.TCPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(tcproutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeTCPRoutes(fake *FakeGatewayV1alpha2, namespace string) typedapisv1alpha2.TCPRouteInterface { + return &fakeTCPRoutes{ + gentype.NewFakeClientWithListAndApply[*v1alpha2.TCPRoute, *v1alpha2.TCPRouteList, *apisv1alpha2.TCPRouteApplyConfiguration]( + fake.Fake, + namespace, + v1alpha2.SchemeGroupVersion.WithResource("tcproutes"), + v1alpha2.SchemeGroupVersion.WithKind("TCPRoute"), + func() *v1alpha2.TCPRoute { return &v1alpha2.TCPRoute{} }, + func() *v1alpha2.TCPRouteList { return &v1alpha2.TCPRouteList{} }, + func(dst, src *v1alpha2.TCPRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha2.TCPRouteList) []*v1alpha2.TCPRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha2.TCPRouteList, items []*v1alpha2.TCPRoute) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha2.TCPRoute), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_tlsroute.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_tlsroute.go index 360a9ae175..5242c25fdf 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_tlsroute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_tlsroute.go @@ -19,179 +19,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + typedapisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1alpha2" ) -// FakeTLSRoutes implements TLSRouteInterface -type FakeTLSRoutes struct { +// fakeTLSRoutes implements TLSRouteInterface +type fakeTLSRoutes struct { + *gentype.FakeClientWithListAndApply[*v1alpha2.TLSRoute, *v1alpha2.TLSRouteList, *apisv1alpha2.TLSRouteApplyConfiguration] Fake *FakeGatewayV1alpha2 - ns string -} - -var tlsroutesResource = v1alpha2.SchemeGroupVersion.WithResource("tlsroutes") - -var tlsroutesKind = v1alpha2.SchemeGroupVersion.WithKind("TLSRoute") - -// Get takes name of the tLSRoute, and returns the corresponding tLSRoute object, and an error if there is any. -func (c *FakeTLSRoutes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha2.TLSRoute, err error) { - emptyResult := &v1alpha2.TLSRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(tlsroutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TLSRoute), err -} - -// List takes label and field selectors, and returns the list of TLSRoutes that match those selectors. -func (c *FakeTLSRoutes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha2.TLSRouteList, err error) { - emptyResult := &v1alpha2.TLSRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(tlsroutesResource, tlsroutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha2.TLSRouteList{ListMeta: obj.(*v1alpha2.TLSRouteList).ListMeta} - for _, item := range obj.(*v1alpha2.TLSRouteList).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 tLSRoutes. -func (c *FakeTLSRoutes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(tlsroutesResource, c.ns, opts)) - -} - -// Create takes the representation of a tLSRoute and creates it. Returns the server's representation of the tLSRoute, and an error, if there is any. -func (c *FakeTLSRoutes) Create(ctx context.Context, tLSRoute *v1alpha2.TLSRoute, opts v1.CreateOptions) (result *v1alpha2.TLSRoute, err error) { - emptyResult := &v1alpha2.TLSRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(tlsroutesResource, c.ns, tLSRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TLSRoute), err -} - -// Update takes the representation of a tLSRoute and updates it. Returns the server's representation of the tLSRoute, and an error, if there is any. -func (c *FakeTLSRoutes) Update(ctx context.Context, tLSRoute *v1alpha2.TLSRoute, opts v1.UpdateOptions) (result *v1alpha2.TLSRoute, err error) { - emptyResult := &v1alpha2.TLSRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(tlsroutesResource, c.ns, tLSRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TLSRoute), 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 *FakeTLSRoutes) UpdateStatus(ctx context.Context, tLSRoute *v1alpha2.TLSRoute, opts v1.UpdateOptions) (result *v1alpha2.TLSRoute, err error) { - emptyResult := &v1alpha2.TLSRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(tlsroutesResource, "status", c.ns, tLSRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TLSRoute), err -} - -// Delete takes name of the tLSRoute and deletes it. Returns an error if one occurs. -func (c *FakeTLSRoutes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(tlsroutesResource, c.ns, name, opts), &v1alpha2.TLSRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeTLSRoutes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(tlsroutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha2.TLSRouteList{}) - return err -} - -// Patch applies the patch and returns the patched tLSRoute. -func (c *FakeTLSRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.TLSRoute, err error) { - emptyResult := &v1alpha2.TLSRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(tlsroutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TLSRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied tLSRoute. -func (c *FakeTLSRoutes) Apply(ctx context.Context, tLSRoute *apisv1alpha2.TLSRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.TLSRoute, err error) { - if tLSRoute == nil { - return nil, fmt.Errorf("tLSRoute provided to Apply must not be nil") - } - data, err := json.Marshal(tLSRoute) - if err != nil { - return nil, err - } - name := tLSRoute.Name - if name == nil { - return nil, fmt.Errorf("tLSRoute.Name must be provided to Apply") - } - emptyResult := &v1alpha2.TLSRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(tlsroutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.TLSRoute), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeTLSRoutes) ApplyStatus(ctx context.Context, tLSRoute *apisv1alpha2.TLSRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.TLSRoute, err error) { - if tLSRoute == nil { - return nil, fmt.Errorf("tLSRoute provided to Apply must not be nil") - } - data, err := json.Marshal(tLSRoute) - if err != nil { - return nil, err - } - name := tLSRoute.Name - if name == nil { - return nil, fmt.Errorf("tLSRoute.Name must be provided to Apply") - } - emptyResult := &v1alpha2.TLSRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(tlsroutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeTLSRoutes(fake *FakeGatewayV1alpha2, namespace string) typedapisv1alpha2.TLSRouteInterface { + return &fakeTLSRoutes{ + gentype.NewFakeClientWithListAndApply[*v1alpha2.TLSRoute, *v1alpha2.TLSRouteList, *apisv1alpha2.TLSRouteApplyConfiguration]( + fake.Fake, + namespace, + v1alpha2.SchemeGroupVersion.WithResource("tlsroutes"), + v1alpha2.SchemeGroupVersion.WithKind("TLSRoute"), + func() *v1alpha2.TLSRoute { return &v1alpha2.TLSRoute{} }, + func() *v1alpha2.TLSRouteList { return &v1alpha2.TLSRouteList{} }, + func(dst, src *v1alpha2.TLSRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha2.TLSRouteList) []*v1alpha2.TLSRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha2.TLSRouteList, items []*v1alpha2.TLSRoute) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha2.TLSRoute), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_udproute.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_udproute.go index 2defe25c8a..423d5bbd2d 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_udproute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/fake/fake_udproute.go @@ -19,179 +19,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + typedapisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1alpha2" ) -// FakeUDPRoutes implements UDPRouteInterface -type FakeUDPRoutes struct { +// fakeUDPRoutes implements UDPRouteInterface +type fakeUDPRoutes struct { + *gentype.FakeClientWithListAndApply[*v1alpha2.UDPRoute, *v1alpha2.UDPRouteList, *apisv1alpha2.UDPRouteApplyConfiguration] Fake *FakeGatewayV1alpha2 - ns string -} - -var udproutesResource = v1alpha2.SchemeGroupVersion.WithResource("udproutes") - -var udproutesKind = v1alpha2.SchemeGroupVersion.WithKind("UDPRoute") - -// Get takes name of the uDPRoute, and returns the corresponding uDPRoute object, and an error if there is any. -func (c *FakeUDPRoutes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha2.UDPRoute, err error) { - emptyResult := &v1alpha2.UDPRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(udproutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.UDPRoute), err -} - -// List takes label and field selectors, and returns the list of UDPRoutes that match those selectors. -func (c *FakeUDPRoutes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha2.UDPRouteList, err error) { - emptyResult := &v1alpha2.UDPRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(udproutesResource, udproutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha2.UDPRouteList{ListMeta: obj.(*v1alpha2.UDPRouteList).ListMeta} - for _, item := range obj.(*v1alpha2.UDPRouteList).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 uDPRoutes. -func (c *FakeUDPRoutes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(udproutesResource, c.ns, opts)) - -} - -// Create takes the representation of a uDPRoute and creates it. Returns the server's representation of the uDPRoute, and an error, if there is any. -func (c *FakeUDPRoutes) Create(ctx context.Context, uDPRoute *v1alpha2.UDPRoute, opts v1.CreateOptions) (result *v1alpha2.UDPRoute, err error) { - emptyResult := &v1alpha2.UDPRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(udproutesResource, c.ns, uDPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.UDPRoute), err -} - -// Update takes the representation of a uDPRoute and updates it. Returns the server's representation of the uDPRoute, and an error, if there is any. -func (c *FakeUDPRoutes) Update(ctx context.Context, uDPRoute *v1alpha2.UDPRoute, opts v1.UpdateOptions) (result *v1alpha2.UDPRoute, err error) { - emptyResult := &v1alpha2.UDPRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(udproutesResource, c.ns, uDPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.UDPRoute), 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 *FakeUDPRoutes) UpdateStatus(ctx context.Context, uDPRoute *v1alpha2.UDPRoute, opts v1.UpdateOptions) (result *v1alpha2.UDPRoute, err error) { - emptyResult := &v1alpha2.UDPRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(udproutesResource, "status", c.ns, uDPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.UDPRoute), err -} - -// Delete takes name of the uDPRoute and deletes it. Returns an error if one occurs. -func (c *FakeUDPRoutes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(udproutesResource, c.ns, name, opts), &v1alpha2.UDPRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeUDPRoutes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(udproutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha2.UDPRouteList{}) - return err -} - -// Patch applies the patch and returns the patched uDPRoute. -func (c *FakeUDPRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.UDPRoute, err error) { - emptyResult := &v1alpha2.UDPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(udproutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.UDPRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied uDPRoute. -func (c *FakeUDPRoutes) Apply(ctx context.Context, uDPRoute *apisv1alpha2.UDPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.UDPRoute, err error) { - if uDPRoute == nil { - return nil, fmt.Errorf("uDPRoute provided to Apply must not be nil") - } - data, err := json.Marshal(uDPRoute) - if err != nil { - return nil, err - } - name := uDPRoute.Name - if name == nil { - return nil, fmt.Errorf("uDPRoute.Name must be provided to Apply") - } - emptyResult := &v1alpha2.UDPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(udproutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha2.UDPRoute), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeUDPRoutes) ApplyStatus(ctx context.Context, uDPRoute *apisv1alpha2.UDPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.UDPRoute, err error) { - if uDPRoute == nil { - return nil, fmt.Errorf("uDPRoute provided to Apply must not be nil") - } - data, err := json.Marshal(uDPRoute) - if err != nil { - return nil, err - } - name := uDPRoute.Name - if name == nil { - return nil, fmt.Errorf("uDPRoute.Name must be provided to Apply") - } - emptyResult := &v1alpha2.UDPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(udproutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeUDPRoutes(fake *FakeGatewayV1alpha2, namespace string) typedapisv1alpha2.UDPRouteInterface { + return &fakeUDPRoutes{ + gentype.NewFakeClientWithListAndApply[*v1alpha2.UDPRoute, *v1alpha2.UDPRouteList, *apisv1alpha2.UDPRouteApplyConfiguration]( + fake.Fake, + namespace, + v1alpha2.SchemeGroupVersion.WithResource("udproutes"), + v1alpha2.SchemeGroupVersion.WithKind("UDPRoute"), + func() *v1alpha2.UDPRoute { return &v1alpha2.UDPRoute{} }, + func() *v1alpha2.UDPRouteList { return &v1alpha2.UDPRouteList{} }, + func(dst, src *v1alpha2.UDPRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha2.UDPRouteList) []*v1alpha2.UDPRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha2.UDPRouteList, items []*v1alpha2.UDPRoute) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha2.UDPRoute), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/grpcroute.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/grpcroute.go index aa10accc48..ce972fa804 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/grpcroute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/grpcroute.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + applyconfigurationapisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type GRPCRoutesGetter interface { // GRPCRouteInterface has methods to work with GRPCRoute resources. type GRPCRouteInterface interface { - Create(ctx context.Context, gRPCRoute *v1alpha2.GRPCRoute, opts v1.CreateOptions) (*v1alpha2.GRPCRoute, error) - Update(ctx context.Context, gRPCRoute *v1alpha2.GRPCRoute, opts v1.UpdateOptions) (*v1alpha2.GRPCRoute, error) + Create(ctx context.Context, gRPCRoute *apisv1alpha2.GRPCRoute, opts v1.CreateOptions) (*apisv1alpha2.GRPCRoute, error) + Update(ctx context.Context, gRPCRoute *apisv1alpha2.GRPCRoute, opts v1.UpdateOptions) (*apisv1alpha2.GRPCRoute, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, gRPCRoute *v1alpha2.GRPCRoute, opts v1.UpdateOptions) (*v1alpha2.GRPCRoute, error) + UpdateStatus(ctx context.Context, gRPCRoute *apisv1alpha2.GRPCRoute, opts v1.UpdateOptions) (*apisv1alpha2.GRPCRoute, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha2.GRPCRoute, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha2.GRPCRouteList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha2.GRPCRoute, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha2.GRPCRouteList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.GRPCRoute, err error) - Apply(ctx context.Context, gRPCRoute *apisv1alpha2.GRPCRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.GRPCRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha2.GRPCRoute, err error) + Apply(ctx context.Context, gRPCRoute *applyconfigurationapisv1alpha2.GRPCRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.GRPCRoute, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, gRPCRoute *apisv1alpha2.GRPCRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.GRPCRoute, err error) + ApplyStatus(ctx context.Context, gRPCRoute *applyconfigurationapisv1alpha2.GRPCRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.GRPCRoute, err error) GRPCRouteExpansion } // gRPCRoutes implements GRPCRouteInterface type gRPCRoutes struct { - *gentype.ClientWithListAndApply[*v1alpha2.GRPCRoute, *v1alpha2.GRPCRouteList, *apisv1alpha2.GRPCRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha2.GRPCRoute, *apisv1alpha2.GRPCRouteList, *applyconfigurationapisv1alpha2.GRPCRouteApplyConfiguration] } // newGRPCRoutes returns a GRPCRoutes func newGRPCRoutes(c *GatewayV1alpha2Client, namespace string) *gRPCRoutes { return &gRPCRoutes{ - gentype.NewClientWithListAndApply[*v1alpha2.GRPCRoute, *v1alpha2.GRPCRouteList, *apisv1alpha2.GRPCRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha2.GRPCRoute, *apisv1alpha2.GRPCRouteList, *applyconfigurationapisv1alpha2.GRPCRouteApplyConfiguration]( "grpcroutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha2.GRPCRoute { return &v1alpha2.GRPCRoute{} }, - func() *v1alpha2.GRPCRouteList { return &v1alpha2.GRPCRouteList{} }), + func() *apisv1alpha2.GRPCRoute { return &apisv1alpha2.GRPCRoute{} }, + func() *apisv1alpha2.GRPCRouteList { return &apisv1alpha2.GRPCRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/referencegrant.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/referencegrant.go index d0154afd8f..131013e314 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/referencegrant.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/referencegrant.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + applyconfigurationapisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,32 +38,33 @@ type ReferenceGrantsGetter interface { // ReferenceGrantInterface has methods to work with ReferenceGrant resources. type ReferenceGrantInterface interface { - Create(ctx context.Context, referenceGrant *v1alpha2.ReferenceGrant, opts v1.CreateOptions) (*v1alpha2.ReferenceGrant, error) - Update(ctx context.Context, referenceGrant *v1alpha2.ReferenceGrant, opts v1.UpdateOptions) (*v1alpha2.ReferenceGrant, error) + Create(ctx context.Context, referenceGrant *apisv1alpha2.ReferenceGrant, opts v1.CreateOptions) (*apisv1alpha2.ReferenceGrant, error) + Update(ctx context.Context, referenceGrant *apisv1alpha2.ReferenceGrant, opts v1.UpdateOptions) (*apisv1alpha2.ReferenceGrant, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha2.ReferenceGrant, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha2.ReferenceGrantList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha2.ReferenceGrant, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha2.ReferenceGrantList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.ReferenceGrant, err error) - Apply(ctx context.Context, referenceGrant *apisv1alpha2.ReferenceGrantApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.ReferenceGrant, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha2.ReferenceGrant, err error) + Apply(ctx context.Context, referenceGrant *applyconfigurationapisv1alpha2.ReferenceGrantApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.ReferenceGrant, err error) ReferenceGrantExpansion } // referenceGrants implements ReferenceGrantInterface type referenceGrants struct { - *gentype.ClientWithListAndApply[*v1alpha2.ReferenceGrant, *v1alpha2.ReferenceGrantList, *apisv1alpha2.ReferenceGrantApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha2.ReferenceGrant, *apisv1alpha2.ReferenceGrantList, *applyconfigurationapisv1alpha2.ReferenceGrantApplyConfiguration] } // newReferenceGrants returns a ReferenceGrants func newReferenceGrants(c *GatewayV1alpha2Client, namespace string) *referenceGrants { return &referenceGrants{ - gentype.NewClientWithListAndApply[*v1alpha2.ReferenceGrant, *v1alpha2.ReferenceGrantList, *apisv1alpha2.ReferenceGrantApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha2.ReferenceGrant, *apisv1alpha2.ReferenceGrantList, *applyconfigurationapisv1alpha2.ReferenceGrantApplyConfiguration]( "referencegrants", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha2.ReferenceGrant { return &v1alpha2.ReferenceGrant{} }, - func() *v1alpha2.ReferenceGrantList { return &v1alpha2.ReferenceGrantList{} }), + func() *apisv1alpha2.ReferenceGrant { return &apisv1alpha2.ReferenceGrant{} }, + func() *apisv1alpha2.ReferenceGrantList { return &apisv1alpha2.ReferenceGrantList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/tcproute.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/tcproute.go index b46cc0c5d2..d85ccca173 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/tcproute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/tcproute.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + applyconfigurationapisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type TCPRoutesGetter interface { // TCPRouteInterface has methods to work with TCPRoute resources. type TCPRouteInterface interface { - Create(ctx context.Context, tCPRoute *v1alpha2.TCPRoute, opts v1.CreateOptions) (*v1alpha2.TCPRoute, error) - Update(ctx context.Context, tCPRoute *v1alpha2.TCPRoute, opts v1.UpdateOptions) (*v1alpha2.TCPRoute, error) + Create(ctx context.Context, tCPRoute *apisv1alpha2.TCPRoute, opts v1.CreateOptions) (*apisv1alpha2.TCPRoute, error) + Update(ctx context.Context, tCPRoute *apisv1alpha2.TCPRoute, opts v1.UpdateOptions) (*apisv1alpha2.TCPRoute, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, tCPRoute *v1alpha2.TCPRoute, opts v1.UpdateOptions) (*v1alpha2.TCPRoute, error) + UpdateStatus(ctx context.Context, tCPRoute *apisv1alpha2.TCPRoute, opts v1.UpdateOptions) (*apisv1alpha2.TCPRoute, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha2.TCPRoute, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha2.TCPRouteList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha2.TCPRoute, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha2.TCPRouteList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.TCPRoute, err error) - Apply(ctx context.Context, tCPRoute *apisv1alpha2.TCPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.TCPRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha2.TCPRoute, err error) + Apply(ctx context.Context, tCPRoute *applyconfigurationapisv1alpha2.TCPRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.TCPRoute, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, tCPRoute *apisv1alpha2.TCPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.TCPRoute, err error) + ApplyStatus(ctx context.Context, tCPRoute *applyconfigurationapisv1alpha2.TCPRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.TCPRoute, err error) TCPRouteExpansion } // tCPRoutes implements TCPRouteInterface type tCPRoutes struct { - *gentype.ClientWithListAndApply[*v1alpha2.TCPRoute, *v1alpha2.TCPRouteList, *apisv1alpha2.TCPRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha2.TCPRoute, *apisv1alpha2.TCPRouteList, *applyconfigurationapisv1alpha2.TCPRouteApplyConfiguration] } // newTCPRoutes returns a TCPRoutes func newTCPRoutes(c *GatewayV1alpha2Client, namespace string) *tCPRoutes { return &tCPRoutes{ - gentype.NewClientWithListAndApply[*v1alpha2.TCPRoute, *v1alpha2.TCPRouteList, *apisv1alpha2.TCPRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha2.TCPRoute, *apisv1alpha2.TCPRouteList, *applyconfigurationapisv1alpha2.TCPRouteApplyConfiguration]( "tcproutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha2.TCPRoute { return &v1alpha2.TCPRoute{} }, - func() *v1alpha2.TCPRouteList { return &v1alpha2.TCPRouteList{} }), + func() *apisv1alpha2.TCPRoute { return &apisv1alpha2.TCPRoute{} }, + func() *apisv1alpha2.TCPRouteList { return &apisv1alpha2.TCPRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/tlsroute.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/tlsroute.go index e73625bbcb..908ef81163 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/tlsroute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/tlsroute.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + applyconfigurationapisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type TLSRoutesGetter interface { // TLSRouteInterface has methods to work with TLSRoute resources. type TLSRouteInterface interface { - Create(ctx context.Context, tLSRoute *v1alpha2.TLSRoute, opts v1.CreateOptions) (*v1alpha2.TLSRoute, error) - Update(ctx context.Context, tLSRoute *v1alpha2.TLSRoute, opts v1.UpdateOptions) (*v1alpha2.TLSRoute, error) + Create(ctx context.Context, tLSRoute *apisv1alpha2.TLSRoute, opts v1.CreateOptions) (*apisv1alpha2.TLSRoute, error) + Update(ctx context.Context, tLSRoute *apisv1alpha2.TLSRoute, opts v1.UpdateOptions) (*apisv1alpha2.TLSRoute, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, tLSRoute *v1alpha2.TLSRoute, opts v1.UpdateOptions) (*v1alpha2.TLSRoute, error) + UpdateStatus(ctx context.Context, tLSRoute *apisv1alpha2.TLSRoute, opts v1.UpdateOptions) (*apisv1alpha2.TLSRoute, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha2.TLSRoute, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha2.TLSRouteList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha2.TLSRoute, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha2.TLSRouteList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.TLSRoute, err error) - Apply(ctx context.Context, tLSRoute *apisv1alpha2.TLSRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.TLSRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha2.TLSRoute, err error) + Apply(ctx context.Context, tLSRoute *applyconfigurationapisv1alpha2.TLSRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.TLSRoute, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, tLSRoute *apisv1alpha2.TLSRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.TLSRoute, err error) + ApplyStatus(ctx context.Context, tLSRoute *applyconfigurationapisv1alpha2.TLSRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.TLSRoute, err error) TLSRouteExpansion } // tLSRoutes implements TLSRouteInterface type tLSRoutes struct { - *gentype.ClientWithListAndApply[*v1alpha2.TLSRoute, *v1alpha2.TLSRouteList, *apisv1alpha2.TLSRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha2.TLSRoute, *apisv1alpha2.TLSRouteList, *applyconfigurationapisv1alpha2.TLSRouteApplyConfiguration] } // newTLSRoutes returns a TLSRoutes func newTLSRoutes(c *GatewayV1alpha2Client, namespace string) *tLSRoutes { return &tLSRoutes{ - gentype.NewClientWithListAndApply[*v1alpha2.TLSRoute, *v1alpha2.TLSRouteList, *apisv1alpha2.TLSRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha2.TLSRoute, *apisv1alpha2.TLSRouteList, *applyconfigurationapisv1alpha2.TLSRouteApplyConfiguration]( "tlsroutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha2.TLSRoute { return &v1alpha2.TLSRoute{} }, - func() *v1alpha2.TLSRouteList { return &v1alpha2.TLSRouteList{} }), + func() *apisv1alpha2.TLSRoute { return &apisv1alpha2.TLSRoute{} }, + func() *apisv1alpha2.TLSRouteList { return &apisv1alpha2.TLSRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha2/udproute.go b/pkg/client/clientset/versioned/typed/apis/v1alpha2/udproute.go index 128a861c29..236e52014f 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha2/udproute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha2/udproute.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - apisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + applyconfigurationapisv1alpha2 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha2" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type UDPRoutesGetter interface { // UDPRouteInterface has methods to work with UDPRoute resources. type UDPRouteInterface interface { - Create(ctx context.Context, uDPRoute *v1alpha2.UDPRoute, opts v1.CreateOptions) (*v1alpha2.UDPRoute, error) - Update(ctx context.Context, uDPRoute *v1alpha2.UDPRoute, opts v1.UpdateOptions) (*v1alpha2.UDPRoute, error) + Create(ctx context.Context, uDPRoute *apisv1alpha2.UDPRoute, opts v1.CreateOptions) (*apisv1alpha2.UDPRoute, error) + Update(ctx context.Context, uDPRoute *apisv1alpha2.UDPRoute, opts v1.UpdateOptions) (*apisv1alpha2.UDPRoute, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, uDPRoute *v1alpha2.UDPRoute, opts v1.UpdateOptions) (*v1alpha2.UDPRoute, error) + UpdateStatus(ctx context.Context, uDPRoute *apisv1alpha2.UDPRoute, opts v1.UpdateOptions) (*apisv1alpha2.UDPRoute, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha2.UDPRoute, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha2.UDPRouteList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha2.UDPRoute, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha2.UDPRouteList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.UDPRoute, err error) - Apply(ctx context.Context, uDPRoute *apisv1alpha2.UDPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.UDPRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha2.UDPRoute, err error) + Apply(ctx context.Context, uDPRoute *applyconfigurationapisv1alpha2.UDPRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.UDPRoute, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, uDPRoute *apisv1alpha2.UDPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha2.UDPRoute, err error) + ApplyStatus(ctx context.Context, uDPRoute *applyconfigurationapisv1alpha2.UDPRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha2.UDPRoute, err error) UDPRouteExpansion } // uDPRoutes implements UDPRouteInterface type uDPRoutes struct { - *gentype.ClientWithListAndApply[*v1alpha2.UDPRoute, *v1alpha2.UDPRouteList, *apisv1alpha2.UDPRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha2.UDPRoute, *apisv1alpha2.UDPRouteList, *applyconfigurationapisv1alpha2.UDPRouteApplyConfiguration] } // newUDPRoutes returns a UDPRoutes func newUDPRoutes(c *GatewayV1alpha2Client, namespace string) *uDPRoutes { return &uDPRoutes{ - gentype.NewClientWithListAndApply[*v1alpha2.UDPRoute, *v1alpha2.UDPRouteList, *apisv1alpha2.UDPRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha2.UDPRoute, *apisv1alpha2.UDPRouteList, *applyconfigurationapisv1alpha2.UDPRouteApplyConfiguration]( "udproutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha2.UDPRoute { return &v1alpha2.UDPRoute{} }, - func() *v1alpha2.UDPRouteList { return &v1alpha2.UDPRouteList{} }), + func() *apisv1alpha2.UDPRoute { return &apisv1alpha2.UDPRoute{} }, + func() *apisv1alpha2.UDPRouteList { return &apisv1alpha2.UDPRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha3/apis_client.go b/pkg/client/clientset/versioned/typed/apis/v1alpha3/apis_client.go index cdb327c3b7..0a546b5538 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha3/apis_client.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha3/apis_client.go @@ -19,11 +19,11 @@ limitations under the License. package v1alpha3 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" - "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" + apisv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" + scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) type GatewayV1alpha3Interface interface { @@ -85,10 +85,10 @@ func New(c rest.Interface) *GatewayV1alpha3Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha3.SchemeGroupVersion + gv := apisv1alpha3.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha3/backendtlspolicy.go b/pkg/client/clientset/versioned/typed/apis/v1alpha3/backendtlspolicy.go index 3cb0b1285f..ca0286d85d 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha3/backendtlspolicy.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha3/backendtlspolicy.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha3 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" - apisv1alpha3 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha3" + apisv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" + applyconfigurationapisv1alpha3 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha3" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type BackendTLSPoliciesGetter interface { // BackendTLSPolicyInterface has methods to work with BackendTLSPolicy resources. type BackendTLSPolicyInterface interface { - Create(ctx context.Context, backendTLSPolicy *v1alpha3.BackendTLSPolicy, opts v1.CreateOptions) (*v1alpha3.BackendTLSPolicy, error) - Update(ctx context.Context, backendTLSPolicy *v1alpha3.BackendTLSPolicy, opts v1.UpdateOptions) (*v1alpha3.BackendTLSPolicy, error) + Create(ctx context.Context, backendTLSPolicy *apisv1alpha3.BackendTLSPolicy, opts v1.CreateOptions) (*apisv1alpha3.BackendTLSPolicy, error) + Update(ctx context.Context, backendTLSPolicy *apisv1alpha3.BackendTLSPolicy, opts v1.UpdateOptions) (*apisv1alpha3.BackendTLSPolicy, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, backendTLSPolicy *v1alpha3.BackendTLSPolicy, opts v1.UpdateOptions) (*v1alpha3.BackendTLSPolicy, error) + UpdateStatus(ctx context.Context, backendTLSPolicy *apisv1alpha3.BackendTLSPolicy, opts v1.UpdateOptions) (*apisv1alpha3.BackendTLSPolicy, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha3.BackendTLSPolicy, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha3.BackendTLSPolicyList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha3.BackendTLSPolicy, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha3.BackendTLSPolicyList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha3.BackendTLSPolicy, err error) - Apply(ctx context.Context, backendTLSPolicy *apisv1alpha3.BackendTLSPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha3.BackendTLSPolicy, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha3.BackendTLSPolicy, err error) + Apply(ctx context.Context, backendTLSPolicy *applyconfigurationapisv1alpha3.BackendTLSPolicyApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha3.BackendTLSPolicy, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, backendTLSPolicy *apisv1alpha3.BackendTLSPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha3.BackendTLSPolicy, err error) + ApplyStatus(ctx context.Context, backendTLSPolicy *applyconfigurationapisv1alpha3.BackendTLSPolicyApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha3.BackendTLSPolicy, err error) BackendTLSPolicyExpansion } // backendTLSPolicies implements BackendTLSPolicyInterface type backendTLSPolicies struct { - *gentype.ClientWithListAndApply[*v1alpha3.BackendTLSPolicy, *v1alpha3.BackendTLSPolicyList, *apisv1alpha3.BackendTLSPolicyApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha3.BackendTLSPolicy, *apisv1alpha3.BackendTLSPolicyList, *applyconfigurationapisv1alpha3.BackendTLSPolicyApplyConfiguration] } // newBackendTLSPolicies returns a BackendTLSPolicies func newBackendTLSPolicies(c *GatewayV1alpha3Client, namespace string) *backendTLSPolicies { return &backendTLSPolicies{ - gentype.NewClientWithListAndApply[*v1alpha3.BackendTLSPolicy, *v1alpha3.BackendTLSPolicyList, *apisv1alpha3.BackendTLSPolicyApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha3.BackendTLSPolicy, *apisv1alpha3.BackendTLSPolicyList, *applyconfigurationapisv1alpha3.BackendTLSPolicyApplyConfiguration]( "backendtlspolicies", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha3.BackendTLSPolicy { return &v1alpha3.BackendTLSPolicy{} }, - func() *v1alpha3.BackendTLSPolicyList { return &v1alpha3.BackendTLSPolicyList{} }), + func() *apisv1alpha3.BackendTLSPolicy { return &apisv1alpha3.BackendTLSPolicy{} }, + func() *apisv1alpha3.BackendTLSPolicyList { return &apisv1alpha3.BackendTLSPolicyList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha3/fake/fake_apis_client.go b/pkg/client/clientset/versioned/typed/apis/v1alpha3/fake/fake_apis_client.go index 76f13e27e7..0ab453c2a8 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha3/fake/fake_apis_client.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha3/fake/fake_apis_client.go @@ -29,7 +29,7 @@ type FakeGatewayV1alpha3 struct { } func (c *FakeGatewayV1alpha3) BackendTLSPolicies(namespace string) v1alpha3.BackendTLSPolicyInterface { - return &FakeBackendTLSPolicies{c, namespace} + return newFakeBackendTLSPolicies(c, namespace) } // RESTClient returns a RESTClient that is used to communicate diff --git a/pkg/client/clientset/versioned/typed/apis/v1alpha3/fake/fake_backendtlspolicy.go b/pkg/client/clientset/versioned/typed/apis/v1alpha3/fake/fake_backendtlspolicy.go index fbddc3173f..215cd900b2 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1alpha3/fake/fake_backendtlspolicy.go +++ b/pkg/client/clientset/versioned/typed/apis/v1alpha3/fake/fake_backendtlspolicy.go @@ -19,179 +19,35 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" apisv1alpha3 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1alpha3" + typedapisv1alpha3 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1alpha3" ) -// FakeBackendTLSPolicies implements BackendTLSPolicyInterface -type FakeBackendTLSPolicies struct { +// fakeBackendTLSPolicies implements BackendTLSPolicyInterface +type fakeBackendTLSPolicies struct { + *gentype.FakeClientWithListAndApply[*v1alpha3.BackendTLSPolicy, *v1alpha3.BackendTLSPolicyList, *apisv1alpha3.BackendTLSPolicyApplyConfiguration] Fake *FakeGatewayV1alpha3 - ns string -} - -var backendtlspoliciesResource = v1alpha3.SchemeGroupVersion.WithResource("backendtlspolicies") - -var backendtlspoliciesKind = v1alpha3.SchemeGroupVersion.WithKind("BackendTLSPolicy") - -// Get takes name of the backendTLSPolicy, and returns the corresponding backendTLSPolicy object, and an error if there is any. -func (c *FakeBackendTLSPolicies) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha3.BackendTLSPolicy, err error) { - emptyResult := &v1alpha3.BackendTLSPolicy{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(backendtlspoliciesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha3.BackendTLSPolicy), err -} - -// List takes label and field selectors, and returns the list of BackendTLSPolicies that match those selectors. -func (c *FakeBackendTLSPolicies) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha3.BackendTLSPolicyList, err error) { - emptyResult := &v1alpha3.BackendTLSPolicyList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(backendtlspoliciesResource, backendtlspoliciesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha3.BackendTLSPolicyList{ListMeta: obj.(*v1alpha3.BackendTLSPolicyList).ListMeta} - for _, item := range obj.(*v1alpha3.BackendTLSPolicyList).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 backendTLSPolicies. -func (c *FakeBackendTLSPolicies) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(backendtlspoliciesResource, c.ns, opts)) - -} - -// Create takes the representation of a backendTLSPolicy and creates it. Returns the server's representation of the backendTLSPolicy, and an error, if there is any. -func (c *FakeBackendTLSPolicies) Create(ctx context.Context, backendTLSPolicy *v1alpha3.BackendTLSPolicy, opts v1.CreateOptions) (result *v1alpha3.BackendTLSPolicy, err error) { - emptyResult := &v1alpha3.BackendTLSPolicy{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(backendtlspoliciesResource, c.ns, backendTLSPolicy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha3.BackendTLSPolicy), err -} - -// Update takes the representation of a backendTLSPolicy and updates it. Returns the server's representation of the backendTLSPolicy, and an error, if there is any. -func (c *FakeBackendTLSPolicies) Update(ctx context.Context, backendTLSPolicy *v1alpha3.BackendTLSPolicy, opts v1.UpdateOptions) (result *v1alpha3.BackendTLSPolicy, err error) { - emptyResult := &v1alpha3.BackendTLSPolicy{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(backendtlspoliciesResource, c.ns, backendTLSPolicy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha3.BackendTLSPolicy), 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 *FakeBackendTLSPolicies) UpdateStatus(ctx context.Context, backendTLSPolicy *v1alpha3.BackendTLSPolicy, opts v1.UpdateOptions) (result *v1alpha3.BackendTLSPolicy, err error) { - emptyResult := &v1alpha3.BackendTLSPolicy{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(backendtlspoliciesResource, "status", c.ns, backendTLSPolicy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha3.BackendTLSPolicy), err -} - -// Delete takes name of the backendTLSPolicy and deletes it. Returns an error if one occurs. -func (c *FakeBackendTLSPolicies) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(backendtlspoliciesResource, c.ns, name, opts), &v1alpha3.BackendTLSPolicy{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeBackendTLSPolicies) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(backendtlspoliciesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha3.BackendTLSPolicyList{}) - return err -} - -// Patch applies the patch and returns the patched backendTLSPolicy. -func (c *FakeBackendTLSPolicies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha3.BackendTLSPolicy, err error) { - emptyResult := &v1alpha3.BackendTLSPolicy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(backendtlspoliciesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha3.BackendTLSPolicy), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied backendTLSPolicy. -func (c *FakeBackendTLSPolicies) Apply(ctx context.Context, backendTLSPolicy *apisv1alpha3.BackendTLSPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha3.BackendTLSPolicy, err error) { - if backendTLSPolicy == nil { - return nil, fmt.Errorf("backendTLSPolicy provided to Apply must not be nil") - } - data, err := json.Marshal(backendTLSPolicy) - if err != nil { - return nil, err - } - name := backendTLSPolicy.Name - if name == nil { - return nil, fmt.Errorf("backendTLSPolicy.Name must be provided to Apply") - } - emptyResult := &v1alpha3.BackendTLSPolicy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(backendtlspoliciesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha3.BackendTLSPolicy), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeBackendTLSPolicies) ApplyStatus(ctx context.Context, backendTLSPolicy *apisv1alpha3.BackendTLSPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha3.BackendTLSPolicy, err error) { - if backendTLSPolicy == nil { - return nil, fmt.Errorf("backendTLSPolicy provided to Apply must not be nil") - } - data, err := json.Marshal(backendTLSPolicy) - if err != nil { - return nil, err - } - name := backendTLSPolicy.Name - if name == nil { - return nil, fmt.Errorf("backendTLSPolicy.Name must be provided to Apply") - } - emptyResult := &v1alpha3.BackendTLSPolicy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(backendtlspoliciesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeBackendTLSPolicies(fake *FakeGatewayV1alpha3, namespace string) typedapisv1alpha3.BackendTLSPolicyInterface { + return &fakeBackendTLSPolicies{ + gentype.NewFakeClientWithListAndApply[*v1alpha3.BackendTLSPolicy, *v1alpha3.BackendTLSPolicyList, *apisv1alpha3.BackendTLSPolicyApplyConfiguration]( + fake.Fake, + namespace, + v1alpha3.SchemeGroupVersion.WithResource("backendtlspolicies"), + v1alpha3.SchemeGroupVersion.WithKind("BackendTLSPolicy"), + func() *v1alpha3.BackendTLSPolicy { return &v1alpha3.BackendTLSPolicy{} }, + func() *v1alpha3.BackendTLSPolicyList { return &v1alpha3.BackendTLSPolicyList{} }, + func(dst, src *v1alpha3.BackendTLSPolicyList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha3.BackendTLSPolicyList) []*v1alpha3.BackendTLSPolicy { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha3.BackendTLSPolicyList, items []*v1alpha3.BackendTLSPolicy) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha3.BackendTLSPolicy), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/apis_client.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/apis_client.go index ef8e0e2977..d9b158d567 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/apis_client.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/apis_client.go @@ -19,11 +19,11 @@ limitations under the License. package v1beta1 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) type GatewayV1beta1Interface interface { @@ -100,10 +100,10 @@ func New(c rest.Interface) *GatewayV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1beta1.SchemeGroupVersion + gv := apisv1beta1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_apis_client.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_apis_client.go index 418e8161ad..4c4261d00d 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_apis_client.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_apis_client.go @@ -29,19 +29,19 @@ type FakeGatewayV1beta1 struct { } func (c *FakeGatewayV1beta1) Gateways(namespace string) v1beta1.GatewayInterface { - return &FakeGateways{c, namespace} + return newFakeGateways(c, namespace) } func (c *FakeGatewayV1beta1) GatewayClasses() v1beta1.GatewayClassInterface { - return &FakeGatewayClasses{c} + return newFakeGatewayClasses(c) } func (c *FakeGatewayV1beta1) HTTPRoutes(namespace string) v1beta1.HTTPRouteInterface { - return &FakeHTTPRoutes{c, namespace} + return newFakeHTTPRoutes(c, namespace) } func (c *FakeGatewayV1beta1) ReferenceGrants(namespace string) v1beta1.ReferenceGrantInterface { - return &FakeReferenceGrants{c, namespace} + return newFakeReferenceGrants(c, namespace) } // RESTClient returns a RESTClient that is used to communicate diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_gateway.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_gateway.go index 2f309e4d9a..50d0c5253e 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_gateway.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_gateway.go @@ -19,179 +19,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" apisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" + typedapisv1beta1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1beta1" ) -// FakeGateways implements GatewayInterface -type FakeGateways struct { +// fakeGateways implements GatewayInterface +type fakeGateways struct { + *gentype.FakeClientWithListAndApply[*v1beta1.Gateway, *v1beta1.GatewayList, *apisv1beta1.GatewayApplyConfiguration] Fake *FakeGatewayV1beta1 - ns string -} - -var gatewaysResource = v1beta1.SchemeGroupVersion.WithResource("gateways") - -var gatewaysKind = v1beta1.SchemeGroupVersion.WithKind("Gateway") - -// Get takes name of the gateway, and returns the corresponding gateway object, and an error if there is any. -func (c *FakeGateways) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.Gateway, err error) { - emptyResult := &v1beta1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(gatewaysResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.Gateway), err -} - -// List takes label and field selectors, and returns the list of Gateways that match those selectors. -func (c *FakeGateways) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.GatewayList, err error) { - emptyResult := &v1beta1.GatewayList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(gatewaysResource, gatewaysKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1beta1.GatewayList{ListMeta: obj.(*v1beta1.GatewayList).ListMeta} - for _, item := range obj.(*v1beta1.GatewayList).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 gateways. -func (c *FakeGateways) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(gatewaysResource, c.ns, opts)) - -} - -// Create takes the representation of a gateway and creates it. Returns the server's representation of the gateway, and an error, if there is any. -func (c *FakeGateways) Create(ctx context.Context, gateway *v1beta1.Gateway, opts v1.CreateOptions) (result *v1beta1.Gateway, err error) { - emptyResult := &v1beta1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(gatewaysResource, c.ns, gateway, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.Gateway), err -} - -// Update takes the representation of a gateway and updates it. Returns the server's representation of the gateway, and an error, if there is any. -func (c *FakeGateways) Update(ctx context.Context, gateway *v1beta1.Gateway, opts v1.UpdateOptions) (result *v1beta1.Gateway, err error) { - emptyResult := &v1beta1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(gatewaysResource, c.ns, gateway, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.Gateway), 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 *FakeGateways) UpdateStatus(ctx context.Context, gateway *v1beta1.Gateway, opts v1.UpdateOptions) (result *v1beta1.Gateway, err error) { - emptyResult := &v1beta1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(gatewaysResource, "status", c.ns, gateway, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.Gateway), err -} - -// Delete takes name of the gateway and deletes it. Returns an error if one occurs. -func (c *FakeGateways) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(gatewaysResource, c.ns, name, opts), &v1beta1.Gateway{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGateways) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(gatewaysResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1beta1.GatewayList{}) - return err -} - -// Patch applies the patch and returns the patched gateway. -func (c *FakeGateways) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.Gateway, err error) { - emptyResult := &v1beta1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewaysResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.Gateway), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied gateway. -func (c *FakeGateways) Apply(ctx context.Context, gateway *apisv1beta1.GatewayApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.Gateway, err error) { - if gateway == nil { - return nil, fmt.Errorf("gateway provided to Apply must not be nil") - } - data, err := json.Marshal(gateway) - if err != nil { - return nil, err - } - name := gateway.Name - if name == nil { - return nil, fmt.Errorf("gateway.Name must be provided to Apply") - } - emptyResult := &v1beta1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewaysResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.Gateway), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeGateways) ApplyStatus(ctx context.Context, gateway *apisv1beta1.GatewayApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.Gateway, err error) { - if gateway == nil { - return nil, fmt.Errorf("gateway provided to Apply must not be nil") - } - data, err := json.Marshal(gateway) - if err != nil { - return nil, err - } - name := gateway.Name - if name == nil { - return nil, fmt.Errorf("gateway.Name must be provided to Apply") - } - emptyResult := &v1beta1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewaysResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeGateways(fake *FakeGatewayV1beta1, namespace string) typedapisv1beta1.GatewayInterface { + return &fakeGateways{ + gentype.NewFakeClientWithListAndApply[*v1beta1.Gateway, *v1beta1.GatewayList, *apisv1beta1.GatewayApplyConfiguration]( + fake.Fake, + namespace, + v1beta1.SchemeGroupVersion.WithResource("gateways"), + v1beta1.SchemeGroupVersion.WithKind("Gateway"), + func() *v1beta1.Gateway { return &v1beta1.Gateway{} }, + func() *v1beta1.GatewayList { return &v1beta1.GatewayList{} }, + func(dst, src *v1beta1.GatewayList) { dst.ListMeta = src.ListMeta }, + func(list *v1beta1.GatewayList) []*v1beta1.Gateway { return gentype.ToPointerSlice(list.Items) }, + func(list *v1beta1.GatewayList, items []*v1beta1.Gateway) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1beta1.Gateway), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_gatewayclass.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_gatewayclass.go index d18395c20b..9ce931a756 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_gatewayclass.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_gatewayclass.go @@ -19,168 +19,35 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" apisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" + typedapisv1beta1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1beta1" ) -// FakeGatewayClasses implements GatewayClassInterface -type FakeGatewayClasses struct { +// fakeGatewayClasses implements GatewayClassInterface +type fakeGatewayClasses struct { + *gentype.FakeClientWithListAndApply[*v1beta1.GatewayClass, *v1beta1.GatewayClassList, *apisv1beta1.GatewayClassApplyConfiguration] Fake *FakeGatewayV1beta1 } -var gatewayclassesResource = v1beta1.SchemeGroupVersion.WithResource("gatewayclasses") - -var gatewayclassesKind = v1beta1.SchemeGroupVersion.WithKind("GatewayClass") - -// Get takes name of the gatewayClass, and returns the corresponding gatewayClass object, and an error if there is any. -func (c *FakeGatewayClasses) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.GatewayClass, err error) { - emptyResult := &v1beta1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(gatewayclassesResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.GatewayClass), err -} - -// List takes label and field selectors, and returns the list of GatewayClasses that match those selectors. -func (c *FakeGatewayClasses) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.GatewayClassList, err error) { - emptyResult := &v1beta1.GatewayClassList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(gatewayclassesResource, gatewayclassesKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1beta1.GatewayClassList{ListMeta: obj.(*v1beta1.GatewayClassList).ListMeta} - for _, item := range obj.(*v1beta1.GatewayClassList).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 gatewayClasses. -func (c *FakeGatewayClasses) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(gatewayclassesResource, opts)) -} - -// Create takes the representation of a gatewayClass and creates it. Returns the server's representation of the gatewayClass, and an error, if there is any. -func (c *FakeGatewayClasses) Create(ctx context.Context, gatewayClass *v1beta1.GatewayClass, opts v1.CreateOptions) (result *v1beta1.GatewayClass, err error) { - emptyResult := &v1beta1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(gatewayclassesResource, gatewayClass, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.GatewayClass), err -} - -// Update takes the representation of a gatewayClass and updates it. Returns the server's representation of the gatewayClass, and an error, if there is any. -func (c *FakeGatewayClasses) Update(ctx context.Context, gatewayClass *v1beta1.GatewayClass, opts v1.UpdateOptions) (result *v1beta1.GatewayClass, err error) { - emptyResult := &v1beta1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(gatewayclassesResource, gatewayClass, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.GatewayClass), 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 *FakeGatewayClasses) UpdateStatus(ctx context.Context, gatewayClass *v1beta1.GatewayClass, opts v1.UpdateOptions) (result *v1beta1.GatewayClass, err error) { - emptyResult := &v1beta1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(gatewayclassesResource, "status", gatewayClass, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.GatewayClass), err -} - -// Delete takes name of the gatewayClass and deletes it. Returns an error if one occurs. -func (c *FakeGatewayClasses) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(gatewayclassesResource, name, opts), &v1beta1.GatewayClass{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGatewayClasses) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(gatewayclassesResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1beta1.GatewayClassList{}) - return err -} - -// Patch applies the patch and returns the patched gatewayClass. -func (c *FakeGatewayClasses) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.GatewayClass, err error) { - emptyResult := &v1beta1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(gatewayclassesResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.GatewayClass), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied gatewayClass. -func (c *FakeGatewayClasses) Apply(ctx context.Context, gatewayClass *apisv1beta1.GatewayClassApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.GatewayClass, err error) { - if gatewayClass == nil { - return nil, fmt.Errorf("gatewayClass provided to Apply must not be nil") - } - data, err := json.Marshal(gatewayClass) - if err != nil { - return nil, err - } - name := gatewayClass.Name - if name == nil { - return nil, fmt.Errorf("gatewayClass.Name must be provided to Apply") - } - emptyResult := &v1beta1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(gatewayclassesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.GatewayClass), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeGatewayClasses) ApplyStatus(ctx context.Context, gatewayClass *apisv1beta1.GatewayClassApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.GatewayClass, err error) { - if gatewayClass == nil { - return nil, fmt.Errorf("gatewayClass provided to Apply must not be nil") - } - data, err := json.Marshal(gatewayClass) - if err != nil { - return nil, err - } - name := gatewayClass.Name - if name == nil { - return nil, fmt.Errorf("gatewayClass.Name must be provided to Apply") - } - emptyResult := &v1beta1.GatewayClass{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(gatewayclassesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeGatewayClasses(fake *FakeGatewayV1beta1) typedapisv1beta1.GatewayClassInterface { + return &fakeGatewayClasses{ + gentype.NewFakeClientWithListAndApply[*v1beta1.GatewayClass, *v1beta1.GatewayClassList, *apisv1beta1.GatewayClassApplyConfiguration]( + fake.Fake, + "", + v1beta1.SchemeGroupVersion.WithResource("gatewayclasses"), + v1beta1.SchemeGroupVersion.WithKind("GatewayClass"), + func() *v1beta1.GatewayClass { return &v1beta1.GatewayClass{} }, + func() *v1beta1.GatewayClassList { return &v1beta1.GatewayClassList{} }, + func(dst, src *v1beta1.GatewayClassList) { dst.ListMeta = src.ListMeta }, + func(list *v1beta1.GatewayClassList) []*v1beta1.GatewayClass { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1beta1.GatewayClassList, items []*v1beta1.GatewayClass) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1beta1.GatewayClass), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_httproute.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_httproute.go index 6ec049f836..ad54a2ac91 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_httproute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_httproute.go @@ -19,179 +19,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" apisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" + typedapisv1beta1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1beta1" ) -// FakeHTTPRoutes implements HTTPRouteInterface -type FakeHTTPRoutes struct { +// fakeHTTPRoutes implements HTTPRouteInterface +type fakeHTTPRoutes struct { + *gentype.FakeClientWithListAndApply[*v1beta1.HTTPRoute, *v1beta1.HTTPRouteList, *apisv1beta1.HTTPRouteApplyConfiguration] Fake *FakeGatewayV1beta1 - ns string -} - -var httproutesResource = v1beta1.SchemeGroupVersion.WithResource("httproutes") - -var httproutesKind = v1beta1.SchemeGroupVersion.WithKind("HTTPRoute") - -// Get takes name of the hTTPRoute, and returns the corresponding hTTPRoute object, and an error if there is any. -func (c *FakeHTTPRoutes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.HTTPRoute, err error) { - emptyResult := &v1beta1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(httproutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.HTTPRoute), err -} - -// List takes label and field selectors, and returns the list of HTTPRoutes that match those selectors. -func (c *FakeHTTPRoutes) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.HTTPRouteList, err error) { - emptyResult := &v1beta1.HTTPRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(httproutesResource, httproutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1beta1.HTTPRouteList{ListMeta: obj.(*v1beta1.HTTPRouteList).ListMeta} - for _, item := range obj.(*v1beta1.HTTPRouteList).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 hTTPRoutes. -func (c *FakeHTTPRoutes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(httproutesResource, c.ns, opts)) - -} - -// Create takes the representation of a hTTPRoute and creates it. Returns the server's representation of the hTTPRoute, and an error, if there is any. -func (c *FakeHTTPRoutes) Create(ctx context.Context, hTTPRoute *v1beta1.HTTPRoute, opts v1.CreateOptions) (result *v1beta1.HTTPRoute, err error) { - emptyResult := &v1beta1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(httproutesResource, c.ns, hTTPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.HTTPRoute), err -} - -// Update takes the representation of a hTTPRoute and updates it. Returns the server's representation of the hTTPRoute, and an error, if there is any. -func (c *FakeHTTPRoutes) Update(ctx context.Context, hTTPRoute *v1beta1.HTTPRoute, opts v1.UpdateOptions) (result *v1beta1.HTTPRoute, err error) { - emptyResult := &v1beta1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(httproutesResource, c.ns, hTTPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.HTTPRoute), 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 *FakeHTTPRoutes) UpdateStatus(ctx context.Context, hTTPRoute *v1beta1.HTTPRoute, opts v1.UpdateOptions) (result *v1beta1.HTTPRoute, err error) { - emptyResult := &v1beta1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(httproutesResource, "status", c.ns, hTTPRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.HTTPRoute), err -} - -// Delete takes name of the hTTPRoute and deletes it. Returns an error if one occurs. -func (c *FakeHTTPRoutes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(httproutesResource, c.ns, name, opts), &v1beta1.HTTPRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeHTTPRoutes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(httproutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1beta1.HTTPRouteList{}) - return err -} - -// Patch applies the patch and returns the patched hTTPRoute. -func (c *FakeHTTPRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.HTTPRoute, err error) { - emptyResult := &v1beta1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(httproutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.HTTPRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied hTTPRoute. -func (c *FakeHTTPRoutes) Apply(ctx context.Context, hTTPRoute *apisv1beta1.HTTPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.HTTPRoute, err error) { - if hTTPRoute == nil { - return nil, fmt.Errorf("hTTPRoute provided to Apply must not be nil") - } - data, err := json.Marshal(hTTPRoute) - if err != nil { - return nil, err - } - name := hTTPRoute.Name - if name == nil { - return nil, fmt.Errorf("hTTPRoute.Name must be provided to Apply") - } - emptyResult := &v1beta1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(httproutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.HTTPRoute), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeHTTPRoutes) ApplyStatus(ctx context.Context, hTTPRoute *apisv1beta1.HTTPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.HTTPRoute, err error) { - if hTTPRoute == nil { - return nil, fmt.Errorf("hTTPRoute provided to Apply must not be nil") - } - data, err := json.Marshal(hTTPRoute) - if err != nil { - return nil, err - } - name := hTTPRoute.Name - if name == nil { - return nil, fmt.Errorf("hTTPRoute.Name must be provided to Apply") - } - emptyResult := &v1beta1.HTTPRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(httproutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeHTTPRoutes(fake *FakeGatewayV1beta1, namespace string) typedapisv1beta1.HTTPRouteInterface { + return &fakeHTTPRoutes{ + gentype.NewFakeClientWithListAndApply[*v1beta1.HTTPRoute, *v1beta1.HTTPRouteList, *apisv1beta1.HTTPRouteApplyConfiguration]( + fake.Fake, + namespace, + v1beta1.SchemeGroupVersion.WithResource("httproutes"), + v1beta1.SchemeGroupVersion.WithKind("HTTPRoute"), + func() *v1beta1.HTTPRoute { return &v1beta1.HTTPRoute{} }, + func() *v1beta1.HTTPRouteList { return &v1beta1.HTTPRouteList{} }, + func(dst, src *v1beta1.HTTPRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1beta1.HTTPRouteList) []*v1beta1.HTTPRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1beta1.HTTPRouteList, items []*v1beta1.HTTPRoute) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1beta1.HTTPRoute), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_referencegrant.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_referencegrant.go index 610c6a968e..5489087f80 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_referencegrant.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/fake/fake_referencegrant.go @@ -19,142 +19,35 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" apisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" + typedapisv1beta1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1beta1" ) -// FakeReferenceGrants implements ReferenceGrantInterface -type FakeReferenceGrants struct { +// fakeReferenceGrants implements ReferenceGrantInterface +type fakeReferenceGrants struct { + *gentype.FakeClientWithListAndApply[*v1beta1.ReferenceGrant, *v1beta1.ReferenceGrantList, *apisv1beta1.ReferenceGrantApplyConfiguration] Fake *FakeGatewayV1beta1 - ns string -} - -var referencegrantsResource = v1beta1.SchemeGroupVersion.WithResource("referencegrants") - -var referencegrantsKind = v1beta1.SchemeGroupVersion.WithKind("ReferenceGrant") - -// Get takes name of the referenceGrant, and returns the corresponding referenceGrant object, and an error if there is any. -func (c *FakeReferenceGrants) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.ReferenceGrant, err error) { - emptyResult := &v1beta1.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(referencegrantsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.ReferenceGrant), err -} - -// List takes label and field selectors, and returns the list of ReferenceGrants that match those selectors. -func (c *FakeReferenceGrants) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.ReferenceGrantList, err error) { - emptyResult := &v1beta1.ReferenceGrantList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(referencegrantsResource, referencegrantsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1beta1.ReferenceGrantList{ListMeta: obj.(*v1beta1.ReferenceGrantList).ListMeta} - for _, item := range obj.(*v1beta1.ReferenceGrantList).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 referenceGrants. -func (c *FakeReferenceGrants) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(referencegrantsResource, c.ns, opts)) - } -// Create takes the representation of a referenceGrant and creates it. Returns the server's representation of the referenceGrant, and an error, if there is any. -func (c *FakeReferenceGrants) Create(ctx context.Context, referenceGrant *v1beta1.ReferenceGrant, opts v1.CreateOptions) (result *v1beta1.ReferenceGrant, err error) { - emptyResult := &v1beta1.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(referencegrantsResource, c.ns, referenceGrant, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.ReferenceGrant), err -} - -// Update takes the representation of a referenceGrant and updates it. Returns the server's representation of the referenceGrant, and an error, if there is any. -func (c *FakeReferenceGrants) Update(ctx context.Context, referenceGrant *v1beta1.ReferenceGrant, opts v1.UpdateOptions) (result *v1beta1.ReferenceGrant, err error) { - emptyResult := &v1beta1.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(referencegrantsResource, c.ns, referenceGrant, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.ReferenceGrant), err -} - -// Delete takes name of the referenceGrant and deletes it. Returns an error if one occurs. -func (c *FakeReferenceGrants) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(referencegrantsResource, c.ns, name, opts), &v1beta1.ReferenceGrant{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeReferenceGrants) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(referencegrantsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1beta1.ReferenceGrantList{}) - return err -} - -// Patch applies the patch and returns the patched referenceGrant. -func (c *FakeReferenceGrants) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.ReferenceGrant, err error) { - emptyResult := &v1beta1.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(referencegrantsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1beta1.ReferenceGrant), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied referenceGrant. -func (c *FakeReferenceGrants) Apply(ctx context.Context, referenceGrant *apisv1beta1.ReferenceGrantApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.ReferenceGrant, err error) { - if referenceGrant == nil { - return nil, fmt.Errorf("referenceGrant provided to Apply must not be nil") - } - data, err := json.Marshal(referenceGrant) - if err != nil { - return nil, err - } - name := referenceGrant.Name - if name == nil { - return nil, fmt.Errorf("referenceGrant.Name must be provided to Apply") - } - emptyResult := &v1beta1.ReferenceGrant{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(referencegrantsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeReferenceGrants(fake *FakeGatewayV1beta1, namespace string) typedapisv1beta1.ReferenceGrantInterface { + return &fakeReferenceGrants{ + gentype.NewFakeClientWithListAndApply[*v1beta1.ReferenceGrant, *v1beta1.ReferenceGrantList, *apisv1beta1.ReferenceGrantApplyConfiguration]( + fake.Fake, + namespace, + v1beta1.SchemeGroupVersion.WithResource("referencegrants"), + v1beta1.SchemeGroupVersion.WithKind("ReferenceGrant"), + func() *v1beta1.ReferenceGrant { return &v1beta1.ReferenceGrant{} }, + func() *v1beta1.ReferenceGrantList { return &v1beta1.ReferenceGrantList{} }, + func(dst, src *v1beta1.ReferenceGrantList) { dst.ListMeta = src.ListMeta }, + func(list *v1beta1.ReferenceGrantList) []*v1beta1.ReferenceGrant { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1beta1.ReferenceGrantList, items []*v1beta1.ReferenceGrant) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1beta1.ReferenceGrant), err } diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/gateway.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/gateway.go index 5a78411627..7302770d39 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/gateway.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/gateway.go @@ -19,14 +19,14 @@ limitations under the License. package v1beta1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - apisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + applyconfigurationapisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type GatewaysGetter interface { // GatewayInterface has methods to work with Gateway resources. type GatewayInterface interface { - Create(ctx context.Context, gateway *v1beta1.Gateway, opts v1.CreateOptions) (*v1beta1.Gateway, error) - Update(ctx context.Context, gateway *v1beta1.Gateway, opts v1.UpdateOptions) (*v1beta1.Gateway, error) + Create(ctx context.Context, gateway *apisv1beta1.Gateway, opts v1.CreateOptions) (*apisv1beta1.Gateway, error) + Update(ctx context.Context, gateway *apisv1beta1.Gateway, opts v1.UpdateOptions) (*apisv1beta1.Gateway, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, gateway *v1beta1.Gateway, opts v1.UpdateOptions) (*v1beta1.Gateway, error) + UpdateStatus(ctx context.Context, gateway *apisv1beta1.Gateway, opts v1.UpdateOptions) (*apisv1beta1.Gateway, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.Gateway, error) - List(ctx context.Context, opts v1.ListOptions) (*v1beta1.GatewayList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1beta1.Gateway, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1beta1.GatewayList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.Gateway, err error) - Apply(ctx context.Context, gateway *apisv1beta1.GatewayApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.Gateway, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1beta1.Gateway, err error) + Apply(ctx context.Context, gateway *applyconfigurationapisv1beta1.GatewayApplyConfiguration, opts v1.ApplyOptions) (result *apisv1beta1.Gateway, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, gateway *apisv1beta1.GatewayApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.Gateway, err error) + ApplyStatus(ctx context.Context, gateway *applyconfigurationapisv1beta1.GatewayApplyConfiguration, opts v1.ApplyOptions) (result *apisv1beta1.Gateway, err error) GatewayExpansion } // gateways implements GatewayInterface type gateways struct { - *gentype.ClientWithListAndApply[*v1beta1.Gateway, *v1beta1.GatewayList, *apisv1beta1.GatewayApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1beta1.Gateway, *apisv1beta1.GatewayList, *applyconfigurationapisv1beta1.GatewayApplyConfiguration] } // newGateways returns a Gateways func newGateways(c *GatewayV1beta1Client, namespace string) *gateways { return &gateways{ - gentype.NewClientWithListAndApply[*v1beta1.Gateway, *v1beta1.GatewayList, *apisv1beta1.GatewayApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1beta1.Gateway, *apisv1beta1.GatewayList, *applyconfigurationapisv1beta1.GatewayApplyConfiguration]( "gateways", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1beta1.Gateway { return &v1beta1.Gateway{} }, - func() *v1beta1.GatewayList { return &v1beta1.GatewayList{} }), + func() *apisv1beta1.Gateway { return &apisv1beta1.Gateway{} }, + func() *apisv1beta1.GatewayList { return &apisv1beta1.GatewayList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/gatewayclass.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/gatewayclass.go index d9b14b0371..6e37b2a51c 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/gatewayclass.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/gatewayclass.go @@ -19,14 +19,14 @@ limitations under the License. package v1beta1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - apisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + applyconfigurationapisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type GatewayClassesGetter interface { // GatewayClassInterface has methods to work with GatewayClass resources. type GatewayClassInterface interface { - Create(ctx context.Context, gatewayClass *v1beta1.GatewayClass, opts v1.CreateOptions) (*v1beta1.GatewayClass, error) - Update(ctx context.Context, gatewayClass *v1beta1.GatewayClass, opts v1.UpdateOptions) (*v1beta1.GatewayClass, error) + Create(ctx context.Context, gatewayClass *apisv1beta1.GatewayClass, opts v1.CreateOptions) (*apisv1beta1.GatewayClass, error) + Update(ctx context.Context, gatewayClass *apisv1beta1.GatewayClass, opts v1.UpdateOptions) (*apisv1beta1.GatewayClass, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, gatewayClass *v1beta1.GatewayClass, opts v1.UpdateOptions) (*v1beta1.GatewayClass, error) + UpdateStatus(ctx context.Context, gatewayClass *apisv1beta1.GatewayClass, opts v1.UpdateOptions) (*apisv1beta1.GatewayClass, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.GatewayClass, error) - List(ctx context.Context, opts v1.ListOptions) (*v1beta1.GatewayClassList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1beta1.GatewayClass, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1beta1.GatewayClassList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.GatewayClass, err error) - Apply(ctx context.Context, gatewayClass *apisv1beta1.GatewayClassApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.GatewayClass, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1beta1.GatewayClass, err error) + Apply(ctx context.Context, gatewayClass *applyconfigurationapisv1beta1.GatewayClassApplyConfiguration, opts v1.ApplyOptions) (result *apisv1beta1.GatewayClass, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, gatewayClass *apisv1beta1.GatewayClassApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.GatewayClass, err error) + ApplyStatus(ctx context.Context, gatewayClass *applyconfigurationapisv1beta1.GatewayClassApplyConfiguration, opts v1.ApplyOptions) (result *apisv1beta1.GatewayClass, err error) GatewayClassExpansion } // gatewayClasses implements GatewayClassInterface type gatewayClasses struct { - *gentype.ClientWithListAndApply[*v1beta1.GatewayClass, *v1beta1.GatewayClassList, *apisv1beta1.GatewayClassApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1beta1.GatewayClass, *apisv1beta1.GatewayClassList, *applyconfigurationapisv1beta1.GatewayClassApplyConfiguration] } // newGatewayClasses returns a GatewayClasses func newGatewayClasses(c *GatewayV1beta1Client) *gatewayClasses { return &gatewayClasses{ - gentype.NewClientWithListAndApply[*v1beta1.GatewayClass, *v1beta1.GatewayClassList, *apisv1beta1.GatewayClassApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1beta1.GatewayClass, *apisv1beta1.GatewayClassList, *applyconfigurationapisv1beta1.GatewayClassApplyConfiguration]( "gatewayclasses", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1beta1.GatewayClass { return &v1beta1.GatewayClass{} }, - func() *v1beta1.GatewayClassList { return &v1beta1.GatewayClassList{} }), + func() *apisv1beta1.GatewayClass { return &apisv1beta1.GatewayClass{} }, + func() *apisv1beta1.GatewayClassList { return &apisv1beta1.GatewayClassList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/httproute.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/httproute.go index 9123a629e0..84029931e8 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/httproute.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/httproute.go @@ -19,14 +19,14 @@ limitations under the License. package v1beta1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - apisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + applyconfigurationapisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type HTTPRoutesGetter interface { // HTTPRouteInterface has methods to work with HTTPRoute resources. type HTTPRouteInterface interface { - Create(ctx context.Context, hTTPRoute *v1beta1.HTTPRoute, opts v1.CreateOptions) (*v1beta1.HTTPRoute, error) - Update(ctx context.Context, hTTPRoute *v1beta1.HTTPRoute, opts v1.UpdateOptions) (*v1beta1.HTTPRoute, error) + Create(ctx context.Context, hTTPRoute *apisv1beta1.HTTPRoute, opts v1.CreateOptions) (*apisv1beta1.HTTPRoute, error) + Update(ctx context.Context, hTTPRoute *apisv1beta1.HTTPRoute, opts v1.UpdateOptions) (*apisv1beta1.HTTPRoute, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, hTTPRoute *v1beta1.HTTPRoute, opts v1.UpdateOptions) (*v1beta1.HTTPRoute, error) + UpdateStatus(ctx context.Context, hTTPRoute *apisv1beta1.HTTPRoute, opts v1.UpdateOptions) (*apisv1beta1.HTTPRoute, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.HTTPRoute, error) - List(ctx context.Context, opts v1.ListOptions) (*v1beta1.HTTPRouteList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1beta1.HTTPRoute, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1beta1.HTTPRouteList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.HTTPRoute, err error) - Apply(ctx context.Context, hTTPRoute *apisv1beta1.HTTPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.HTTPRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1beta1.HTTPRoute, err error) + Apply(ctx context.Context, hTTPRoute *applyconfigurationapisv1beta1.HTTPRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1beta1.HTTPRoute, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, hTTPRoute *apisv1beta1.HTTPRouteApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.HTTPRoute, err error) + ApplyStatus(ctx context.Context, hTTPRoute *applyconfigurationapisv1beta1.HTTPRouteApplyConfiguration, opts v1.ApplyOptions) (result *apisv1beta1.HTTPRoute, err error) HTTPRouteExpansion } // hTTPRoutes implements HTTPRouteInterface type hTTPRoutes struct { - *gentype.ClientWithListAndApply[*v1beta1.HTTPRoute, *v1beta1.HTTPRouteList, *apisv1beta1.HTTPRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1beta1.HTTPRoute, *apisv1beta1.HTTPRouteList, *applyconfigurationapisv1beta1.HTTPRouteApplyConfiguration] } // newHTTPRoutes returns a HTTPRoutes func newHTTPRoutes(c *GatewayV1beta1Client, namespace string) *hTTPRoutes { return &hTTPRoutes{ - gentype.NewClientWithListAndApply[*v1beta1.HTTPRoute, *v1beta1.HTTPRouteList, *apisv1beta1.HTTPRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1beta1.HTTPRoute, *apisv1beta1.HTTPRouteList, *applyconfigurationapisv1beta1.HTTPRouteApplyConfiguration]( "httproutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1beta1.HTTPRoute { return &v1beta1.HTTPRoute{} }, - func() *v1beta1.HTTPRouteList { return &v1beta1.HTTPRouteList{} }), + func() *apisv1beta1.HTTPRoute { return &apisv1beta1.HTTPRoute{} }, + func() *apisv1beta1.HTTPRouteList { return &apisv1beta1.HTTPRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apis/v1beta1/referencegrant.go b/pkg/client/clientset/versioned/typed/apis/v1beta1/referencegrant.go index 8ea52fad06..be6227c4dd 100644 --- a/pkg/client/clientset/versioned/typed/apis/v1beta1/referencegrant.go +++ b/pkg/client/clientset/versioned/typed/apis/v1beta1/referencegrant.go @@ -19,14 +19,14 @@ limitations under the License. package v1beta1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - apisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + applyconfigurationapisv1beta1 "sigs.k8s.io/gateway-api/applyconfiguration/apis/v1beta1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,32 +38,33 @@ type ReferenceGrantsGetter interface { // ReferenceGrantInterface has methods to work with ReferenceGrant resources. type ReferenceGrantInterface interface { - Create(ctx context.Context, referenceGrant *v1beta1.ReferenceGrant, opts v1.CreateOptions) (*v1beta1.ReferenceGrant, error) - Update(ctx context.Context, referenceGrant *v1beta1.ReferenceGrant, opts v1.UpdateOptions) (*v1beta1.ReferenceGrant, error) + Create(ctx context.Context, referenceGrant *apisv1beta1.ReferenceGrant, opts v1.CreateOptions) (*apisv1beta1.ReferenceGrant, error) + Update(ctx context.Context, referenceGrant *apisv1beta1.ReferenceGrant, opts v1.UpdateOptions) (*apisv1beta1.ReferenceGrant, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.ReferenceGrant, error) - List(ctx context.Context, opts v1.ListOptions) (*v1beta1.ReferenceGrantList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1beta1.ReferenceGrant, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1beta1.ReferenceGrantList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.ReferenceGrant, err error) - Apply(ctx context.Context, referenceGrant *apisv1beta1.ReferenceGrantApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.ReferenceGrant, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1beta1.ReferenceGrant, err error) + Apply(ctx context.Context, referenceGrant *applyconfigurationapisv1beta1.ReferenceGrantApplyConfiguration, opts v1.ApplyOptions) (result *apisv1beta1.ReferenceGrant, err error) ReferenceGrantExpansion } // referenceGrants implements ReferenceGrantInterface type referenceGrants struct { - *gentype.ClientWithListAndApply[*v1beta1.ReferenceGrant, *v1beta1.ReferenceGrantList, *apisv1beta1.ReferenceGrantApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1beta1.ReferenceGrant, *apisv1beta1.ReferenceGrantList, *applyconfigurationapisv1beta1.ReferenceGrantApplyConfiguration] } // newReferenceGrants returns a ReferenceGrants func newReferenceGrants(c *GatewayV1beta1Client, namespace string) *referenceGrants { return &referenceGrants{ - gentype.NewClientWithListAndApply[*v1beta1.ReferenceGrant, *v1beta1.ReferenceGrantList, *apisv1beta1.ReferenceGrantApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1beta1.ReferenceGrant, *apisv1beta1.ReferenceGrantList, *applyconfigurationapisv1beta1.ReferenceGrantApplyConfiguration]( "referencegrants", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1beta1.ReferenceGrant { return &v1beta1.ReferenceGrant{} }, - func() *v1beta1.ReferenceGrantList { return &v1beta1.ReferenceGrantList{} }), + func() *apisv1beta1.ReferenceGrant { return &apisv1beta1.ReferenceGrant{} }, + func() *apisv1beta1.ReferenceGrantList { return &apisv1beta1.ReferenceGrantList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/apisx_client.go b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/apisx_client.go index a2e242473f..582ef47b3d 100644 --- a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/apisx_client.go +++ b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/apisx_client.go @@ -19,11 +19,11 @@ limitations under the License. package v1alpha1 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" - "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" + apisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" + scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) type ExperimentalV1alpha1Interface interface { @@ -90,10 +90,10 @@ func New(c rest.Interface) *ExperimentalV1alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := apisxv1alpha1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_apisx_client.go b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_apisx_client.go index 348af05184..962c5f3e69 100644 --- a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_apisx_client.go +++ b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_apisx_client.go @@ -29,11 +29,11 @@ type FakeExperimentalV1alpha1 struct { } func (c *FakeExperimentalV1alpha1) XBackendTrafficPolicies(namespace string) v1alpha1.XBackendTrafficPolicyInterface { - return &FakeXBackendTrafficPolicies{c, namespace} + return newFakeXBackendTrafficPolicies(c, namespace) } func (c *FakeExperimentalV1alpha1) XListenerSets(namespace string) v1alpha1.XListenerSetInterface { - return &FakeXListenerSets{c, namespace} + return newFakeXListenerSets(c, namespace) } // RESTClient returns a RESTClient that is used to communicate diff --git a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_xbackendtrafficpolicy.go b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_xbackendtrafficpolicy.go index 360f4f5d2a..2418d4db50 100644 --- a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_xbackendtrafficpolicy.go +++ b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_xbackendtrafficpolicy.go @@ -19,179 +19,35 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" apisxv1alpha1 "sigs.k8s.io/gateway-api/applyconfiguration/apisx/v1alpha1" + typedapisxv1alpha1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apisx/v1alpha1" ) -// FakeXBackendTrafficPolicies implements XBackendTrafficPolicyInterface -type FakeXBackendTrafficPolicies struct { +// fakeXBackendTrafficPolicies implements XBackendTrafficPolicyInterface +type fakeXBackendTrafficPolicies struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.XBackendTrafficPolicy, *v1alpha1.XBackendTrafficPolicyList, *apisxv1alpha1.XBackendTrafficPolicyApplyConfiguration] Fake *FakeExperimentalV1alpha1 - ns string -} - -var xbackendtrafficpoliciesResource = v1alpha1.SchemeGroupVersion.WithResource("xbackendtrafficpolicies") - -var xbackendtrafficpoliciesKind = v1alpha1.SchemeGroupVersion.WithKind("XBackendTrafficPolicy") - -// Get takes name of the xBackendTrafficPolicy, and returns the corresponding xBackendTrafficPolicy object, and an error if there is any. -func (c *FakeXBackendTrafficPolicies) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.XBackendTrafficPolicy, err error) { - emptyResult := &v1alpha1.XBackendTrafficPolicy{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(xbackendtrafficpoliciesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XBackendTrafficPolicy), err -} - -// List takes label and field selectors, and returns the list of XBackendTrafficPolicies that match those selectors. -func (c *FakeXBackendTrafficPolicies) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.XBackendTrafficPolicyList, err error) { - emptyResult := &v1alpha1.XBackendTrafficPolicyList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(xbackendtrafficpoliciesResource, xbackendtrafficpoliciesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.XBackendTrafficPolicyList{ListMeta: obj.(*v1alpha1.XBackendTrafficPolicyList).ListMeta} - for _, item := range obj.(*v1alpha1.XBackendTrafficPolicyList).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 xBackendTrafficPolicies. -func (c *FakeXBackendTrafficPolicies) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(xbackendtrafficpoliciesResource, c.ns, opts)) - -} - -// Create takes the representation of a xBackendTrafficPolicy and creates it. Returns the server's representation of the xBackendTrafficPolicy, and an error, if there is any. -func (c *FakeXBackendTrafficPolicies) Create(ctx context.Context, xBackendTrafficPolicy *v1alpha1.XBackendTrafficPolicy, opts v1.CreateOptions) (result *v1alpha1.XBackendTrafficPolicy, err error) { - emptyResult := &v1alpha1.XBackendTrafficPolicy{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(xbackendtrafficpoliciesResource, c.ns, xBackendTrafficPolicy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XBackendTrafficPolicy), err -} - -// Update takes the representation of a xBackendTrafficPolicy and updates it. Returns the server's representation of the xBackendTrafficPolicy, and an error, if there is any. -func (c *FakeXBackendTrafficPolicies) Update(ctx context.Context, xBackendTrafficPolicy *v1alpha1.XBackendTrafficPolicy, opts v1.UpdateOptions) (result *v1alpha1.XBackendTrafficPolicy, err error) { - emptyResult := &v1alpha1.XBackendTrafficPolicy{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(xbackendtrafficpoliciesResource, c.ns, xBackendTrafficPolicy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XBackendTrafficPolicy), 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 *FakeXBackendTrafficPolicies) UpdateStatus(ctx context.Context, xBackendTrafficPolicy *v1alpha1.XBackendTrafficPolicy, opts v1.UpdateOptions) (result *v1alpha1.XBackendTrafficPolicy, err error) { - emptyResult := &v1alpha1.XBackendTrafficPolicy{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(xbackendtrafficpoliciesResource, "status", c.ns, xBackendTrafficPolicy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XBackendTrafficPolicy), err -} - -// Delete takes name of the xBackendTrafficPolicy and deletes it. Returns an error if one occurs. -func (c *FakeXBackendTrafficPolicies) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(xbackendtrafficpoliciesResource, c.ns, name, opts), &v1alpha1.XBackendTrafficPolicy{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeXBackendTrafficPolicies) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(xbackendtrafficpoliciesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.XBackendTrafficPolicyList{}) - return err -} - -// Patch applies the patch and returns the patched xBackendTrafficPolicy. -func (c *FakeXBackendTrafficPolicies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.XBackendTrafficPolicy, err error) { - emptyResult := &v1alpha1.XBackendTrafficPolicy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(xbackendtrafficpoliciesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XBackendTrafficPolicy), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied xBackendTrafficPolicy. -func (c *FakeXBackendTrafficPolicies) Apply(ctx context.Context, xBackendTrafficPolicy *apisxv1alpha1.XBackendTrafficPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.XBackendTrafficPolicy, err error) { - if xBackendTrafficPolicy == nil { - return nil, fmt.Errorf("xBackendTrafficPolicy provided to Apply must not be nil") - } - data, err := json.Marshal(xBackendTrafficPolicy) - if err != nil { - return nil, err - } - name := xBackendTrafficPolicy.Name - if name == nil { - return nil, fmt.Errorf("xBackendTrafficPolicy.Name must be provided to Apply") - } - emptyResult := &v1alpha1.XBackendTrafficPolicy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(xbackendtrafficpoliciesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XBackendTrafficPolicy), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeXBackendTrafficPolicies) ApplyStatus(ctx context.Context, xBackendTrafficPolicy *apisxv1alpha1.XBackendTrafficPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.XBackendTrafficPolicy, err error) { - if xBackendTrafficPolicy == nil { - return nil, fmt.Errorf("xBackendTrafficPolicy provided to Apply must not be nil") - } - data, err := json.Marshal(xBackendTrafficPolicy) - if err != nil { - return nil, err - } - name := xBackendTrafficPolicy.Name - if name == nil { - return nil, fmt.Errorf("xBackendTrafficPolicy.Name must be provided to Apply") - } - emptyResult := &v1alpha1.XBackendTrafficPolicy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(xbackendtrafficpoliciesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeXBackendTrafficPolicies(fake *FakeExperimentalV1alpha1, namespace string) typedapisxv1alpha1.XBackendTrafficPolicyInterface { + return &fakeXBackendTrafficPolicies{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.XBackendTrafficPolicy, *v1alpha1.XBackendTrafficPolicyList, *apisxv1alpha1.XBackendTrafficPolicyApplyConfiguration]( + fake.Fake, + namespace, + v1alpha1.SchemeGroupVersion.WithResource("xbackendtrafficpolicies"), + v1alpha1.SchemeGroupVersion.WithKind("XBackendTrafficPolicy"), + func() *v1alpha1.XBackendTrafficPolicy { return &v1alpha1.XBackendTrafficPolicy{} }, + func() *v1alpha1.XBackendTrafficPolicyList { return &v1alpha1.XBackendTrafficPolicyList{} }, + func(dst, src *v1alpha1.XBackendTrafficPolicyList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.XBackendTrafficPolicyList) []*v1alpha1.XBackendTrafficPolicy { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.XBackendTrafficPolicyList, items []*v1alpha1.XBackendTrafficPolicy) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.XBackendTrafficPolicy), err } diff --git a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_xlistenerset.go b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_xlistenerset.go index 2d605b3db0..0c595fc0d1 100644 --- a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_xlistenerset.go +++ b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/fake/fake_xlistenerset.go @@ -19,179 +19,35 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" apisxv1alpha1 "sigs.k8s.io/gateway-api/applyconfiguration/apisx/v1alpha1" + typedapisxv1alpha1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apisx/v1alpha1" ) -// FakeXListenerSets implements XListenerSetInterface -type FakeXListenerSets struct { +// fakeXListenerSets implements XListenerSetInterface +type fakeXListenerSets struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.XListenerSet, *v1alpha1.XListenerSetList, *apisxv1alpha1.XListenerSetApplyConfiguration] Fake *FakeExperimentalV1alpha1 - ns string -} - -var xlistenersetsResource = v1alpha1.SchemeGroupVersion.WithResource("xlistenersets") - -var xlistenersetsKind = v1alpha1.SchemeGroupVersion.WithKind("XListenerSet") - -// Get takes name of the xListenerSet, and returns the corresponding xListenerSet object, and an error if there is any. -func (c *FakeXListenerSets) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.XListenerSet, err error) { - emptyResult := &v1alpha1.XListenerSet{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(xlistenersetsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XListenerSet), err -} - -// List takes label and field selectors, and returns the list of XListenerSets that match those selectors. -func (c *FakeXListenerSets) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.XListenerSetList, err error) { - emptyResult := &v1alpha1.XListenerSetList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(xlistenersetsResource, xlistenersetsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.XListenerSetList{ListMeta: obj.(*v1alpha1.XListenerSetList).ListMeta} - for _, item := range obj.(*v1alpha1.XListenerSetList).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 xListenerSets. -func (c *FakeXListenerSets) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(xlistenersetsResource, c.ns, opts)) - -} - -// Create takes the representation of a xListenerSet and creates it. Returns the server's representation of the xListenerSet, and an error, if there is any. -func (c *FakeXListenerSets) Create(ctx context.Context, xListenerSet *v1alpha1.XListenerSet, opts v1.CreateOptions) (result *v1alpha1.XListenerSet, err error) { - emptyResult := &v1alpha1.XListenerSet{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(xlistenersetsResource, c.ns, xListenerSet, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XListenerSet), err -} - -// Update takes the representation of a xListenerSet and updates it. Returns the server's representation of the xListenerSet, and an error, if there is any. -func (c *FakeXListenerSets) Update(ctx context.Context, xListenerSet *v1alpha1.XListenerSet, opts v1.UpdateOptions) (result *v1alpha1.XListenerSet, err error) { - emptyResult := &v1alpha1.XListenerSet{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(xlistenersetsResource, c.ns, xListenerSet, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XListenerSet), 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 *FakeXListenerSets) UpdateStatus(ctx context.Context, xListenerSet *v1alpha1.XListenerSet, opts v1.UpdateOptions) (result *v1alpha1.XListenerSet, err error) { - emptyResult := &v1alpha1.XListenerSet{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(xlistenersetsResource, "status", c.ns, xListenerSet, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XListenerSet), err -} - -// Delete takes name of the xListenerSet and deletes it. Returns an error if one occurs. -func (c *FakeXListenerSets) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(xlistenersetsResource, c.ns, name, opts), &v1alpha1.XListenerSet{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeXListenerSets) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(xlistenersetsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.XListenerSetList{}) - return err -} - -// Patch applies the patch and returns the patched xListenerSet. -func (c *FakeXListenerSets) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.XListenerSet, err error) { - emptyResult := &v1alpha1.XListenerSet{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(xlistenersetsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XListenerSet), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied xListenerSet. -func (c *FakeXListenerSets) Apply(ctx context.Context, xListenerSet *apisxv1alpha1.XListenerSetApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.XListenerSet, err error) { - if xListenerSet == nil { - return nil, fmt.Errorf("xListenerSet provided to Apply must not be nil") - } - data, err := json.Marshal(xListenerSet) - if err != nil { - return nil, err - } - name := xListenerSet.Name - if name == nil { - return nil, fmt.Errorf("xListenerSet.Name must be provided to Apply") - } - emptyResult := &v1alpha1.XListenerSet{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(xlistenersetsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.XListenerSet), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeXListenerSets) ApplyStatus(ctx context.Context, xListenerSet *apisxv1alpha1.XListenerSetApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.XListenerSet, err error) { - if xListenerSet == nil { - return nil, fmt.Errorf("xListenerSet provided to Apply must not be nil") - } - data, err := json.Marshal(xListenerSet) - if err != nil { - return nil, err - } - name := xListenerSet.Name - if name == nil { - return nil, fmt.Errorf("xListenerSet.Name must be provided to Apply") - } - emptyResult := &v1alpha1.XListenerSet{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(xlistenersetsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeXListenerSets(fake *FakeExperimentalV1alpha1, namespace string) typedapisxv1alpha1.XListenerSetInterface { + return &fakeXListenerSets{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.XListenerSet, *v1alpha1.XListenerSetList, *apisxv1alpha1.XListenerSetApplyConfiguration]( + fake.Fake, + namespace, + v1alpha1.SchemeGroupVersion.WithResource("xlistenersets"), + v1alpha1.SchemeGroupVersion.WithKind("XListenerSet"), + func() *v1alpha1.XListenerSet { return &v1alpha1.XListenerSet{} }, + func() *v1alpha1.XListenerSetList { return &v1alpha1.XListenerSetList{} }, + func(dst, src *v1alpha1.XListenerSetList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.XListenerSetList) []*v1alpha1.XListenerSet { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.XListenerSetList, items []*v1alpha1.XListenerSet) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.XListenerSet), err } diff --git a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/xbackendtrafficpolicy.go b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/xbackendtrafficpolicy.go index 523b9daf0b..e27b8fb45c 100644 --- a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/xbackendtrafficpolicy.go +++ b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/xbackendtrafficpolicy.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" - apisxv1alpha1 "sigs.k8s.io/gateway-api/applyconfiguration/apisx/v1alpha1" + apisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" + applyconfigurationapisxv1alpha1 "sigs.k8s.io/gateway-api/applyconfiguration/apisx/v1alpha1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type XBackendTrafficPoliciesGetter interface { // XBackendTrafficPolicyInterface has methods to work with XBackendTrafficPolicy resources. type XBackendTrafficPolicyInterface interface { - Create(ctx context.Context, xBackendTrafficPolicy *v1alpha1.XBackendTrafficPolicy, opts v1.CreateOptions) (*v1alpha1.XBackendTrafficPolicy, error) - Update(ctx context.Context, xBackendTrafficPolicy *v1alpha1.XBackendTrafficPolicy, opts v1.UpdateOptions) (*v1alpha1.XBackendTrafficPolicy, error) + Create(ctx context.Context, xBackendTrafficPolicy *apisxv1alpha1.XBackendTrafficPolicy, opts v1.CreateOptions) (*apisxv1alpha1.XBackendTrafficPolicy, error) + Update(ctx context.Context, xBackendTrafficPolicy *apisxv1alpha1.XBackendTrafficPolicy, opts v1.UpdateOptions) (*apisxv1alpha1.XBackendTrafficPolicy, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, xBackendTrafficPolicy *v1alpha1.XBackendTrafficPolicy, opts v1.UpdateOptions) (*v1alpha1.XBackendTrafficPolicy, error) + UpdateStatus(ctx context.Context, xBackendTrafficPolicy *apisxv1alpha1.XBackendTrafficPolicy, opts v1.UpdateOptions) (*apisxv1alpha1.XBackendTrafficPolicy, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.XBackendTrafficPolicy, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.XBackendTrafficPolicyList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisxv1alpha1.XBackendTrafficPolicy, error) + List(ctx context.Context, opts v1.ListOptions) (*apisxv1alpha1.XBackendTrafficPolicyList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.XBackendTrafficPolicy, err error) - Apply(ctx context.Context, xBackendTrafficPolicy *apisxv1alpha1.XBackendTrafficPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.XBackendTrafficPolicy, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisxv1alpha1.XBackendTrafficPolicy, err error) + Apply(ctx context.Context, xBackendTrafficPolicy *applyconfigurationapisxv1alpha1.XBackendTrafficPolicyApplyConfiguration, opts v1.ApplyOptions) (result *apisxv1alpha1.XBackendTrafficPolicy, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, xBackendTrafficPolicy *apisxv1alpha1.XBackendTrafficPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.XBackendTrafficPolicy, err error) + ApplyStatus(ctx context.Context, xBackendTrafficPolicy *applyconfigurationapisxv1alpha1.XBackendTrafficPolicyApplyConfiguration, opts v1.ApplyOptions) (result *apisxv1alpha1.XBackendTrafficPolicy, err error) XBackendTrafficPolicyExpansion } // xBackendTrafficPolicies implements XBackendTrafficPolicyInterface type xBackendTrafficPolicies struct { - *gentype.ClientWithListAndApply[*v1alpha1.XBackendTrafficPolicy, *v1alpha1.XBackendTrafficPolicyList, *apisxv1alpha1.XBackendTrafficPolicyApplyConfiguration] + *gentype.ClientWithListAndApply[*apisxv1alpha1.XBackendTrafficPolicy, *apisxv1alpha1.XBackendTrafficPolicyList, *applyconfigurationapisxv1alpha1.XBackendTrafficPolicyApplyConfiguration] } // newXBackendTrafficPolicies returns a XBackendTrafficPolicies func newXBackendTrafficPolicies(c *ExperimentalV1alpha1Client, namespace string) *xBackendTrafficPolicies { return &xBackendTrafficPolicies{ - gentype.NewClientWithListAndApply[*v1alpha1.XBackendTrafficPolicy, *v1alpha1.XBackendTrafficPolicyList, *apisxv1alpha1.XBackendTrafficPolicyApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisxv1alpha1.XBackendTrafficPolicy, *apisxv1alpha1.XBackendTrafficPolicyList, *applyconfigurationapisxv1alpha1.XBackendTrafficPolicyApplyConfiguration]( "xbackendtrafficpolicies", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha1.XBackendTrafficPolicy { return &v1alpha1.XBackendTrafficPolicy{} }, - func() *v1alpha1.XBackendTrafficPolicyList { return &v1alpha1.XBackendTrafficPolicyList{} }), + func() *apisxv1alpha1.XBackendTrafficPolicy { return &apisxv1alpha1.XBackendTrafficPolicy{} }, + func() *apisxv1alpha1.XBackendTrafficPolicyList { return &apisxv1alpha1.XBackendTrafficPolicyList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/xlistenerset.go b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/xlistenerset.go index 42f3bc39c7..1ad3ba96ac 100644 --- a/pkg/client/clientset/versioned/typed/apisx/v1alpha1/xlistenerset.go +++ b/pkg/client/clientset/versioned/typed/apisx/v1alpha1/xlistenerset.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" - apisxv1alpha1 "sigs.k8s.io/gateway-api/applyconfiguration/apisx/v1alpha1" + apisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" + applyconfigurationapisxv1alpha1 "sigs.k8s.io/gateway-api/applyconfiguration/apisx/v1alpha1" scheme "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/scheme" ) @@ -38,36 +38,37 @@ type XListenerSetsGetter interface { // XListenerSetInterface has methods to work with XListenerSet resources. type XListenerSetInterface interface { - Create(ctx context.Context, xListenerSet *v1alpha1.XListenerSet, opts v1.CreateOptions) (*v1alpha1.XListenerSet, error) - Update(ctx context.Context, xListenerSet *v1alpha1.XListenerSet, opts v1.UpdateOptions) (*v1alpha1.XListenerSet, error) + Create(ctx context.Context, xListenerSet *apisxv1alpha1.XListenerSet, opts v1.CreateOptions) (*apisxv1alpha1.XListenerSet, error) + Update(ctx context.Context, xListenerSet *apisxv1alpha1.XListenerSet, opts v1.UpdateOptions) (*apisxv1alpha1.XListenerSet, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, xListenerSet *v1alpha1.XListenerSet, opts v1.UpdateOptions) (*v1alpha1.XListenerSet, error) + UpdateStatus(ctx context.Context, xListenerSet *apisxv1alpha1.XListenerSet, opts v1.UpdateOptions) (*apisxv1alpha1.XListenerSet, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.XListenerSet, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.XListenerSetList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisxv1alpha1.XListenerSet, error) + List(ctx context.Context, opts v1.ListOptions) (*apisxv1alpha1.XListenerSetList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.XListenerSet, err error) - Apply(ctx context.Context, xListenerSet *apisxv1alpha1.XListenerSetApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.XListenerSet, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisxv1alpha1.XListenerSet, err error) + Apply(ctx context.Context, xListenerSet *applyconfigurationapisxv1alpha1.XListenerSetApplyConfiguration, opts v1.ApplyOptions) (result *apisxv1alpha1.XListenerSet, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, xListenerSet *apisxv1alpha1.XListenerSetApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.XListenerSet, err error) + ApplyStatus(ctx context.Context, xListenerSet *applyconfigurationapisxv1alpha1.XListenerSetApplyConfiguration, opts v1.ApplyOptions) (result *apisxv1alpha1.XListenerSet, err error) XListenerSetExpansion } // xListenerSets implements XListenerSetInterface type xListenerSets struct { - *gentype.ClientWithListAndApply[*v1alpha1.XListenerSet, *v1alpha1.XListenerSetList, *apisxv1alpha1.XListenerSetApplyConfiguration] + *gentype.ClientWithListAndApply[*apisxv1alpha1.XListenerSet, *apisxv1alpha1.XListenerSetList, *applyconfigurationapisxv1alpha1.XListenerSetApplyConfiguration] } // newXListenerSets returns a XListenerSets func newXListenerSets(c *ExperimentalV1alpha1Client, namespace string) *xListenerSets { return &xListenerSets{ - gentype.NewClientWithListAndApply[*v1alpha1.XListenerSet, *v1alpha1.XListenerSetList, *apisxv1alpha1.XListenerSetApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisxv1alpha1.XListenerSet, *apisxv1alpha1.XListenerSetList, *applyconfigurationapisxv1alpha1.XListenerSetApplyConfiguration]( "xlistenersets", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha1.XListenerSet { return &v1alpha1.XListenerSet{} }, - func() *v1alpha1.XListenerSetList { return &v1alpha1.XListenerSetList{} }), + func() *apisxv1alpha1.XListenerSet { return &apisxv1alpha1.XListenerSet{} }, + func() *apisxv1alpha1.XListenerSetList { return &apisxv1alpha1.XListenerSetList{} }, + ), } } diff --git a/pkg/client/informers/externalversions/apis/v1/gateway.go b/pkg/client/informers/externalversions/apis/v1/gateway.go index 640db80586..9df059e555 100644 --- a/pkg/client/informers/externalversions/apis/v1/gateway.go +++ b/pkg/client/informers/externalversions/apis/v1/gateway.go @@ -19,24 +19,24 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" metav1 "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" - apisv1 "sigs.k8s.io/gateway-api/apis/v1" + gatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1" ) // GatewayInformer provides access to a shared informer and lister for // Gateways. type GatewayInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GatewayLister + Lister() apisv1.GatewayLister } type gatewayInformer struct { @@ -71,7 +71,7 @@ func NewFilteredGatewayInformer(client versioned.Interface, namespace string, re return client.GatewayV1().Gateways(namespace).Watch(context.TODO(), options) }, }, - &apisv1.Gateway{}, + &gatewayapiapisv1.Gateway{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *gatewayInformer) defaultInformer(client versioned.Interface, resyncPeri } func (f *gatewayInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1.Gateway{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1.Gateway{}, f.defaultInformer) } -func (f *gatewayInformer) Lister() v1.GatewayLister { - return v1.NewGatewayLister(f.Informer().GetIndexer()) +func (f *gatewayInformer) Lister() apisv1.GatewayLister { + return apisv1.NewGatewayLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1/gatewayclass.go b/pkg/client/informers/externalversions/apis/v1/gatewayclass.go index 4b2a2577c6..7ad2c7f400 100644 --- a/pkg/client/informers/externalversions/apis/v1/gatewayclass.go +++ b/pkg/client/informers/externalversions/apis/v1/gatewayclass.go @@ -19,24 +19,24 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" metav1 "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" - apisv1 "sigs.k8s.io/gateway-api/apis/v1" + gatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1" ) // GatewayClassInformer provides access to a shared informer and lister for // GatewayClasses. type GatewayClassInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GatewayClassLister + Lister() apisv1.GatewayClassLister } type gatewayClassInformer struct { @@ -70,7 +70,7 @@ func NewFilteredGatewayClassInformer(client versioned.Interface, resyncPeriod ti return client.GatewayV1().GatewayClasses().Watch(context.TODO(), options) }, }, - &apisv1.GatewayClass{}, + &gatewayapiapisv1.GatewayClass{}, resyncPeriod, indexers, ) @@ -81,9 +81,9 @@ func (f *gatewayClassInformer) defaultInformer(client versioned.Interface, resyn } func (f *gatewayClassInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1.GatewayClass{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1.GatewayClass{}, f.defaultInformer) } -func (f *gatewayClassInformer) Lister() v1.GatewayClassLister { - return v1.NewGatewayClassLister(f.Informer().GetIndexer()) +func (f *gatewayClassInformer) Lister() apisv1.GatewayClassLister { + return apisv1.NewGatewayClassLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1/grpcroute.go b/pkg/client/informers/externalversions/apis/v1/grpcroute.go index f27004eb75..5633d5b408 100644 --- a/pkg/client/informers/externalversions/apis/v1/grpcroute.go +++ b/pkg/client/informers/externalversions/apis/v1/grpcroute.go @@ -19,24 +19,24 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" metav1 "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" - apisv1 "sigs.k8s.io/gateway-api/apis/v1" + gatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1" ) // GRPCRouteInformer provides access to a shared informer and lister for // GRPCRoutes. type GRPCRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GRPCRouteLister + Lister() apisv1.GRPCRouteLister } type gRPCRouteInformer struct { @@ -71,7 +71,7 @@ func NewFilteredGRPCRouteInformer(client versioned.Interface, namespace string, return client.GatewayV1().GRPCRoutes(namespace).Watch(context.TODO(), options) }, }, - &apisv1.GRPCRoute{}, + &gatewayapiapisv1.GRPCRoute{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *gRPCRouteInformer) defaultInformer(client versioned.Interface, resyncPe } func (f *gRPCRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1.GRPCRoute{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1.GRPCRoute{}, f.defaultInformer) } -func (f *gRPCRouteInformer) Lister() v1.GRPCRouteLister { - return v1.NewGRPCRouteLister(f.Informer().GetIndexer()) +func (f *gRPCRouteInformer) Lister() apisv1.GRPCRouteLister { + return apisv1.NewGRPCRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1/httproute.go b/pkg/client/informers/externalversions/apis/v1/httproute.go index 921404311f..697d15013f 100644 --- a/pkg/client/informers/externalversions/apis/v1/httproute.go +++ b/pkg/client/informers/externalversions/apis/v1/httproute.go @@ -19,24 +19,24 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" metav1 "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" - apisv1 "sigs.k8s.io/gateway-api/apis/v1" + gatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1" + apisv1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1" ) // HTTPRouteInformer provides access to a shared informer and lister for // HTTPRoutes. type HTTPRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.HTTPRouteLister + Lister() apisv1.HTTPRouteLister } type hTTPRouteInformer struct { @@ -71,7 +71,7 @@ func NewFilteredHTTPRouteInformer(client versioned.Interface, namespace string, return client.GatewayV1().HTTPRoutes(namespace).Watch(context.TODO(), options) }, }, - &apisv1.HTTPRoute{}, + &gatewayapiapisv1.HTTPRoute{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *hTTPRouteInformer) defaultInformer(client versioned.Interface, resyncPe } func (f *hTTPRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1.HTTPRoute{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1.HTTPRoute{}, f.defaultInformer) } -func (f *hTTPRouteInformer) Lister() v1.HTTPRouteLister { - return v1.NewHTTPRouteLister(f.Informer().GetIndexer()) +func (f *hTTPRouteInformer) Lister() apisv1.HTTPRouteLister { + return apisv1.NewHTTPRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1alpha2/grpcroute.go b/pkg/client/informers/externalversions/apis/v1alpha2/grpcroute.go index d7360bdb31..4317e8cd0d 100644 --- a/pkg/client/informers/externalversions/apis/v1alpha2/grpcroute.go +++ b/pkg/client/informers/externalversions/apis/v1alpha2/grpcroute.go @@ -19,24 +19,24 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" 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" - apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gatewayapiapisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" ) // GRPCRouteInformer provides access to a shared informer and lister for // GRPCRoutes. type GRPCRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha2.GRPCRouteLister + Lister() apisv1alpha2.GRPCRouteLister } type gRPCRouteInformer struct { @@ -71,7 +71,7 @@ func NewFilteredGRPCRouteInformer(client versioned.Interface, namespace string, return client.GatewayV1alpha2().GRPCRoutes(namespace).Watch(context.TODO(), options) }, }, - &apisv1alpha2.GRPCRoute{}, + &gatewayapiapisv1alpha2.GRPCRoute{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *gRPCRouteInformer) defaultInformer(client versioned.Interface, resyncPe } func (f *gRPCRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1alpha2.GRPCRoute{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1alpha2.GRPCRoute{}, f.defaultInformer) } -func (f *gRPCRouteInformer) Lister() v1alpha2.GRPCRouteLister { - return v1alpha2.NewGRPCRouteLister(f.Informer().GetIndexer()) +func (f *gRPCRouteInformer) Lister() apisv1alpha2.GRPCRouteLister { + return apisv1alpha2.NewGRPCRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1alpha2/referencegrant.go b/pkg/client/informers/externalversions/apis/v1alpha2/referencegrant.go index d7a91c434c..a3ba093c67 100644 --- a/pkg/client/informers/externalversions/apis/v1alpha2/referencegrant.go +++ b/pkg/client/informers/externalversions/apis/v1alpha2/referencegrant.go @@ -19,24 +19,24 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" 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" - apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gatewayapiapisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" ) // ReferenceGrantInformer provides access to a shared informer and lister for // ReferenceGrants. type ReferenceGrantInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha2.ReferenceGrantLister + Lister() apisv1alpha2.ReferenceGrantLister } type referenceGrantInformer struct { @@ -71,7 +71,7 @@ func NewFilteredReferenceGrantInformer(client versioned.Interface, namespace str return client.GatewayV1alpha2().ReferenceGrants(namespace).Watch(context.TODO(), options) }, }, - &apisv1alpha2.ReferenceGrant{}, + &gatewayapiapisv1alpha2.ReferenceGrant{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *referenceGrantInformer) defaultInformer(client versioned.Interface, res } func (f *referenceGrantInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1alpha2.ReferenceGrant{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1alpha2.ReferenceGrant{}, f.defaultInformer) } -func (f *referenceGrantInformer) Lister() v1alpha2.ReferenceGrantLister { - return v1alpha2.NewReferenceGrantLister(f.Informer().GetIndexer()) +func (f *referenceGrantInformer) Lister() apisv1alpha2.ReferenceGrantLister { + return apisv1alpha2.NewReferenceGrantLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1alpha2/tcproute.go b/pkg/client/informers/externalversions/apis/v1alpha2/tcproute.go index 4a0c2b6c3f..850d5e2f59 100644 --- a/pkg/client/informers/externalversions/apis/v1alpha2/tcproute.go +++ b/pkg/client/informers/externalversions/apis/v1alpha2/tcproute.go @@ -19,24 +19,24 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" 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" - apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gatewayapiapisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" ) // TCPRouteInformer provides access to a shared informer and lister for // TCPRoutes. type TCPRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha2.TCPRouteLister + Lister() apisv1alpha2.TCPRouteLister } type tCPRouteInformer struct { @@ -71,7 +71,7 @@ func NewFilteredTCPRouteInformer(client versioned.Interface, namespace string, r return client.GatewayV1alpha2().TCPRoutes(namespace).Watch(context.TODO(), options) }, }, - &apisv1alpha2.TCPRoute{}, + &gatewayapiapisv1alpha2.TCPRoute{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *tCPRouteInformer) defaultInformer(client versioned.Interface, resyncPer } func (f *tCPRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1alpha2.TCPRoute{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1alpha2.TCPRoute{}, f.defaultInformer) } -func (f *tCPRouteInformer) Lister() v1alpha2.TCPRouteLister { - return v1alpha2.NewTCPRouteLister(f.Informer().GetIndexer()) +func (f *tCPRouteInformer) Lister() apisv1alpha2.TCPRouteLister { + return apisv1alpha2.NewTCPRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1alpha2/tlsroute.go b/pkg/client/informers/externalversions/apis/v1alpha2/tlsroute.go index 00eb0cb6e7..9a729348b0 100644 --- a/pkg/client/informers/externalversions/apis/v1alpha2/tlsroute.go +++ b/pkg/client/informers/externalversions/apis/v1alpha2/tlsroute.go @@ -19,24 +19,24 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" 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" - apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gatewayapiapisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" ) // TLSRouteInformer provides access to a shared informer and lister for // TLSRoutes. type TLSRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha2.TLSRouteLister + Lister() apisv1alpha2.TLSRouteLister } type tLSRouteInformer struct { @@ -71,7 +71,7 @@ func NewFilteredTLSRouteInformer(client versioned.Interface, namespace string, r return client.GatewayV1alpha2().TLSRoutes(namespace).Watch(context.TODO(), options) }, }, - &apisv1alpha2.TLSRoute{}, + &gatewayapiapisv1alpha2.TLSRoute{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *tLSRouteInformer) defaultInformer(client versioned.Interface, resyncPer } func (f *tLSRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1alpha2.TLSRoute{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1alpha2.TLSRoute{}, f.defaultInformer) } -func (f *tLSRouteInformer) Lister() v1alpha2.TLSRouteLister { - return v1alpha2.NewTLSRouteLister(f.Informer().GetIndexer()) +func (f *tLSRouteInformer) Lister() apisv1alpha2.TLSRouteLister { + return apisv1alpha2.NewTLSRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1alpha2/udproute.go b/pkg/client/informers/externalversions/apis/v1alpha2/udproute.go index 2040c81846..10a40c087f 100644 --- a/pkg/client/informers/externalversions/apis/v1alpha2/udproute.go +++ b/pkg/client/informers/externalversions/apis/v1alpha2/udproute.go @@ -19,24 +19,24 @@ limitations under the License. package v1alpha2 import ( - "context" + context "context" 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" - apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + gatewayapiapisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" + apisv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" ) // UDPRouteInformer provides access to a shared informer and lister for // UDPRoutes. type UDPRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha2.UDPRouteLister + Lister() apisv1alpha2.UDPRouteLister } type uDPRouteInformer struct { @@ -71,7 +71,7 @@ func NewFilteredUDPRouteInformer(client versioned.Interface, namespace string, r return client.GatewayV1alpha2().UDPRoutes(namespace).Watch(context.TODO(), options) }, }, - &apisv1alpha2.UDPRoute{}, + &gatewayapiapisv1alpha2.UDPRoute{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *uDPRouteInformer) defaultInformer(client versioned.Interface, resyncPer } func (f *uDPRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1alpha2.UDPRoute{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1alpha2.UDPRoute{}, f.defaultInformer) } -func (f *uDPRouteInformer) Lister() v1alpha2.UDPRouteLister { - return v1alpha2.NewUDPRouteLister(f.Informer().GetIndexer()) +func (f *uDPRouteInformer) Lister() apisv1alpha2.UDPRouteLister { + return apisv1alpha2.NewUDPRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1alpha3/backendtlspolicy.go b/pkg/client/informers/externalversions/apis/v1alpha3/backendtlspolicy.go index 927db8da49..28ec827d80 100644 --- a/pkg/client/informers/externalversions/apis/v1alpha3/backendtlspolicy.go +++ b/pkg/client/informers/externalversions/apis/v1alpha3/backendtlspolicy.go @@ -19,24 +19,24 @@ limitations under the License. package v1alpha3 import ( - "context" + context "context" 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" - apisv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" + gatewayapiapisv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1alpha3 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha3" + apisv1alpha3 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha3" ) // BackendTLSPolicyInformer provides access to a shared informer and lister for // BackendTLSPolicies. type BackendTLSPolicyInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha3.BackendTLSPolicyLister + Lister() apisv1alpha3.BackendTLSPolicyLister } type backendTLSPolicyInformer struct { @@ -71,7 +71,7 @@ func NewFilteredBackendTLSPolicyInformer(client versioned.Interface, namespace s return client.GatewayV1alpha3().BackendTLSPolicies(namespace).Watch(context.TODO(), options) }, }, - &apisv1alpha3.BackendTLSPolicy{}, + &gatewayapiapisv1alpha3.BackendTLSPolicy{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *backendTLSPolicyInformer) defaultInformer(client versioned.Interface, r } func (f *backendTLSPolicyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1alpha3.BackendTLSPolicy{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1alpha3.BackendTLSPolicy{}, f.defaultInformer) } -func (f *backendTLSPolicyInformer) Lister() v1alpha3.BackendTLSPolicyLister { - return v1alpha3.NewBackendTLSPolicyLister(f.Informer().GetIndexer()) +func (f *backendTLSPolicyInformer) Lister() apisv1alpha3.BackendTLSPolicyLister { + return apisv1alpha3.NewBackendTLSPolicyLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1beta1/gateway.go b/pkg/client/informers/externalversions/apis/v1beta1/gateway.go index 5da7a413e5..112506f9f3 100644 --- a/pkg/client/informers/externalversions/apis/v1beta1/gateway.go +++ b/pkg/client/informers/externalversions/apis/v1beta1/gateway.go @@ -19,24 +19,24 @@ limitations under the License. package v1beta1 import ( - "context" + context "context" 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" - apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + gatewayapiapisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" ) // GatewayInformer provides access to a shared informer and lister for // Gateways. type GatewayInformer interface { Informer() cache.SharedIndexInformer - Lister() v1beta1.GatewayLister + Lister() apisv1beta1.GatewayLister } type gatewayInformer struct { @@ -71,7 +71,7 @@ func NewFilteredGatewayInformer(client versioned.Interface, namespace string, re return client.GatewayV1beta1().Gateways(namespace).Watch(context.TODO(), options) }, }, - &apisv1beta1.Gateway{}, + &gatewayapiapisv1beta1.Gateway{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *gatewayInformer) defaultInformer(client versioned.Interface, resyncPeri } func (f *gatewayInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1beta1.Gateway{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1beta1.Gateway{}, f.defaultInformer) } -func (f *gatewayInformer) Lister() v1beta1.GatewayLister { - return v1beta1.NewGatewayLister(f.Informer().GetIndexer()) +func (f *gatewayInformer) Lister() apisv1beta1.GatewayLister { + return apisv1beta1.NewGatewayLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1beta1/gatewayclass.go b/pkg/client/informers/externalversions/apis/v1beta1/gatewayclass.go index 0f5e1be1a8..ed422ffa79 100644 --- a/pkg/client/informers/externalversions/apis/v1beta1/gatewayclass.go +++ b/pkg/client/informers/externalversions/apis/v1beta1/gatewayclass.go @@ -19,24 +19,24 @@ limitations under the License. package v1beta1 import ( - "context" + context "context" 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" - apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + gatewayapiapisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" ) // GatewayClassInformer provides access to a shared informer and lister for // GatewayClasses. type GatewayClassInformer interface { Informer() cache.SharedIndexInformer - Lister() v1beta1.GatewayClassLister + Lister() apisv1beta1.GatewayClassLister } type gatewayClassInformer struct { @@ -70,7 +70,7 @@ func NewFilteredGatewayClassInformer(client versioned.Interface, resyncPeriod ti return client.GatewayV1beta1().GatewayClasses().Watch(context.TODO(), options) }, }, - &apisv1beta1.GatewayClass{}, + &gatewayapiapisv1beta1.GatewayClass{}, resyncPeriod, indexers, ) @@ -81,9 +81,9 @@ func (f *gatewayClassInformer) defaultInformer(client versioned.Interface, resyn } func (f *gatewayClassInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1beta1.GatewayClass{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1beta1.GatewayClass{}, f.defaultInformer) } -func (f *gatewayClassInformer) Lister() v1beta1.GatewayClassLister { - return v1beta1.NewGatewayClassLister(f.Informer().GetIndexer()) +func (f *gatewayClassInformer) Lister() apisv1beta1.GatewayClassLister { + return apisv1beta1.NewGatewayClassLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1beta1/httproute.go b/pkg/client/informers/externalversions/apis/v1beta1/httproute.go index bcdc7bb73e..1aaf2e0ec3 100644 --- a/pkg/client/informers/externalversions/apis/v1beta1/httproute.go +++ b/pkg/client/informers/externalversions/apis/v1beta1/httproute.go @@ -19,24 +19,24 @@ limitations under the License. package v1beta1 import ( - "context" + context "context" 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" - apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + gatewayapiapisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" ) // HTTPRouteInformer provides access to a shared informer and lister for // HTTPRoutes. type HTTPRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1beta1.HTTPRouteLister + Lister() apisv1beta1.HTTPRouteLister } type hTTPRouteInformer struct { @@ -71,7 +71,7 @@ func NewFilteredHTTPRouteInformer(client versioned.Interface, namespace string, return client.GatewayV1beta1().HTTPRoutes(namespace).Watch(context.TODO(), options) }, }, - &apisv1beta1.HTTPRoute{}, + &gatewayapiapisv1beta1.HTTPRoute{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *hTTPRouteInformer) defaultInformer(client versioned.Interface, resyncPe } func (f *hTTPRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1beta1.HTTPRoute{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1beta1.HTTPRoute{}, f.defaultInformer) } -func (f *hTTPRouteInformer) Lister() v1beta1.HTTPRouteLister { - return v1beta1.NewHTTPRouteLister(f.Informer().GetIndexer()) +func (f *hTTPRouteInformer) Lister() apisv1beta1.HTTPRouteLister { + return apisv1beta1.NewHTTPRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apis/v1beta1/referencegrant.go b/pkg/client/informers/externalversions/apis/v1beta1/referencegrant.go index 0e533d2293..5dea76f78d 100644 --- a/pkg/client/informers/externalversions/apis/v1beta1/referencegrant.go +++ b/pkg/client/informers/externalversions/apis/v1beta1/referencegrant.go @@ -19,24 +19,24 @@ limitations under the License. package v1beta1 import ( - "context" + context "context" 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" - apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + gatewayapiapisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" + apisv1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" ) // ReferenceGrantInformer provides access to a shared informer and lister for // ReferenceGrants. type ReferenceGrantInformer interface { Informer() cache.SharedIndexInformer - Lister() v1beta1.ReferenceGrantLister + Lister() apisv1beta1.ReferenceGrantLister } type referenceGrantInformer struct { @@ -71,7 +71,7 @@ func NewFilteredReferenceGrantInformer(client versioned.Interface, namespace str return client.GatewayV1beta1().ReferenceGrants(namespace).Watch(context.TODO(), options) }, }, - &apisv1beta1.ReferenceGrant{}, + &gatewayapiapisv1beta1.ReferenceGrant{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *referenceGrantInformer) defaultInformer(client versioned.Interface, res } func (f *referenceGrantInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisv1beta1.ReferenceGrant{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisv1beta1.ReferenceGrant{}, f.defaultInformer) } -func (f *referenceGrantInformer) Lister() v1beta1.ReferenceGrantLister { - return v1beta1.NewReferenceGrantLister(f.Informer().GetIndexer()) +func (f *referenceGrantInformer) Lister() apisv1beta1.ReferenceGrantLister { + return apisv1beta1.NewReferenceGrantLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apisx/v1alpha1/xbackendtrafficpolicy.go b/pkg/client/informers/externalversions/apisx/v1alpha1/xbackendtrafficpolicy.go index b623d12ab5..44747690af 100644 --- a/pkg/client/informers/externalversions/apisx/v1alpha1/xbackendtrafficpolicy.go +++ b/pkg/client/informers/externalversions/apisx/v1alpha1/xbackendtrafficpolicy.go @@ -19,24 +19,24 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" 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" - apisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" + gatewayapiapisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "sigs.k8s.io/gateway-api/pkg/client/listers/apisx/v1alpha1" + apisxv1alpha1 "sigs.k8s.io/gateway-api/pkg/client/listers/apisx/v1alpha1" ) // XBackendTrafficPolicyInformer provides access to a shared informer and lister for // XBackendTrafficPolicies. type XBackendTrafficPolicyInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha1.XBackendTrafficPolicyLister + Lister() apisxv1alpha1.XBackendTrafficPolicyLister } type xBackendTrafficPolicyInformer struct { @@ -71,7 +71,7 @@ func NewFilteredXBackendTrafficPolicyInformer(client versioned.Interface, namesp return client.ExperimentalV1alpha1().XBackendTrafficPolicies(namespace).Watch(context.TODO(), options) }, }, - &apisxv1alpha1.XBackendTrafficPolicy{}, + &gatewayapiapisxv1alpha1.XBackendTrafficPolicy{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *xBackendTrafficPolicyInformer) defaultInformer(client versioned.Interfa } func (f *xBackendTrafficPolicyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisxv1alpha1.XBackendTrafficPolicy{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisxv1alpha1.XBackendTrafficPolicy{}, f.defaultInformer) } -func (f *xBackendTrafficPolicyInformer) Lister() v1alpha1.XBackendTrafficPolicyLister { - return v1alpha1.NewXBackendTrafficPolicyLister(f.Informer().GetIndexer()) +func (f *xBackendTrafficPolicyInformer) Lister() apisxv1alpha1.XBackendTrafficPolicyLister { + return apisxv1alpha1.NewXBackendTrafficPolicyLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/apisx/v1alpha1/xlistenerset.go b/pkg/client/informers/externalversions/apisx/v1alpha1/xlistenerset.go index b8a6c0b1aa..f959180852 100644 --- a/pkg/client/informers/externalversions/apisx/v1alpha1/xlistenerset.go +++ b/pkg/client/informers/externalversions/apisx/v1alpha1/xlistenerset.go @@ -19,24 +19,24 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" 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" - apisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" + gatewayapiapisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" versioned "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" internalinterfaces "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "sigs.k8s.io/gateway-api/pkg/client/listers/apisx/v1alpha1" + apisxv1alpha1 "sigs.k8s.io/gateway-api/pkg/client/listers/apisx/v1alpha1" ) // XListenerSetInformer provides access to a shared informer and lister for // XListenerSets. type XListenerSetInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha1.XListenerSetLister + Lister() apisxv1alpha1.XListenerSetLister } type xListenerSetInformer struct { @@ -71,7 +71,7 @@ func NewFilteredXListenerSetInformer(client versioned.Interface, namespace strin return client.ExperimentalV1alpha1().XListenerSets(namespace).Watch(context.TODO(), options) }, }, - &apisxv1alpha1.XListenerSet{}, + &gatewayapiapisxv1alpha1.XListenerSet{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *xListenerSetInformer) defaultInformer(client versioned.Interface, resyn } func (f *xListenerSetInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apisxv1alpha1.XListenerSet{}, f.defaultInformer) + return f.factory.InformerFor(&gatewayapiapisxv1alpha1.XListenerSet{}, f.defaultInformer) } -func (f *xListenerSetInformer) Lister() v1alpha1.XListenerSetLister { - return v1alpha1.NewXListenerSetLister(f.Informer().GetIndexer()) +func (f *xListenerSetInformer) Lister() apisxv1alpha1.XListenerSetLister { + return apisxv1alpha1.NewXListenerSetLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index e69adaa8b9..1d90930c0c 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -19,7 +19,7 @@ limitations under the License. package externalversions import ( - "fmt" + fmt "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/apis/v1/gateway.go b/pkg/client/listers/apis/v1/gateway.go index a709b86266..389df604f9 100644 --- a/pkg/client/listers/apis/v1/gateway.go +++ b/pkg/client/listers/apis/v1/gateway.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1 "sigs.k8s.io/gateway-api/apis/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GatewayLister helps list Gateways. @@ -30,7 +30,7 @@ import ( type GatewayLister interface { // List lists all Gateways in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Gateway, err error) + List(selector labels.Selector) (ret []*apisv1.Gateway, err error) // Gateways returns an object that can list and get Gateways. Gateways(namespace string) GatewayNamespaceLister GatewayListerExpansion @@ -38,17 +38,17 @@ type GatewayLister interface { // gatewayLister implements the GatewayLister interface. type gatewayLister struct { - listers.ResourceIndexer[*v1.Gateway] + listers.ResourceIndexer[*apisv1.Gateway] } // NewGatewayLister returns a new GatewayLister. func NewGatewayLister(indexer cache.Indexer) GatewayLister { - return &gatewayLister{listers.New[*v1.Gateway](indexer, v1.Resource("gateway"))} + return &gatewayLister{listers.New[*apisv1.Gateway](indexer, apisv1.Resource("gateway"))} } // Gateways returns an object that can list and get Gateways. func (s *gatewayLister) Gateways(namespace string) GatewayNamespaceLister { - return gatewayNamespaceLister{listers.NewNamespaced[*v1.Gateway](s.ResourceIndexer, namespace)} + return gatewayNamespaceLister{listers.NewNamespaced[*apisv1.Gateway](s.ResourceIndexer, namespace)} } // GatewayNamespaceLister helps list and get Gateways. @@ -56,15 +56,15 @@ func (s *gatewayLister) Gateways(namespace string) GatewayNamespaceLister { type GatewayNamespaceLister interface { // List lists all Gateways in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Gateway, err error) + List(selector labels.Selector) (ret []*apisv1.Gateway, err error) // Get retrieves the Gateway from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.Gateway, error) + Get(name string) (*apisv1.Gateway, error) GatewayNamespaceListerExpansion } // gatewayNamespaceLister implements the GatewayNamespaceLister // interface. type gatewayNamespaceLister struct { - listers.ResourceIndexer[*v1.Gateway] + listers.ResourceIndexer[*apisv1.Gateway] } diff --git a/pkg/client/listers/apis/v1/gatewayclass.go b/pkg/client/listers/apis/v1/gatewayclass.go index 477e91983d..e8a3021eec 100644 --- a/pkg/client/listers/apis/v1/gatewayclass.go +++ b/pkg/client/listers/apis/v1/gatewayclass.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1 "sigs.k8s.io/gateway-api/apis/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GatewayClassLister helps list GatewayClasses. @@ -30,19 +30,19 @@ import ( type GatewayClassLister interface { // List lists all GatewayClasses in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GatewayClass, err error) + List(selector labels.Selector) (ret []*apisv1.GatewayClass, err error) // Get retrieves the GatewayClass from the index for a given name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.GatewayClass, error) + Get(name string) (*apisv1.GatewayClass, error) GatewayClassListerExpansion } // gatewayClassLister implements the GatewayClassLister interface. type gatewayClassLister struct { - listers.ResourceIndexer[*v1.GatewayClass] + listers.ResourceIndexer[*apisv1.GatewayClass] } // NewGatewayClassLister returns a new GatewayClassLister. func NewGatewayClassLister(indexer cache.Indexer) GatewayClassLister { - return &gatewayClassLister{listers.New[*v1.GatewayClass](indexer, v1.Resource("gatewayclass"))} + return &gatewayClassLister{listers.New[*apisv1.GatewayClass](indexer, apisv1.Resource("gatewayclass"))} } diff --git a/pkg/client/listers/apis/v1/grpcroute.go b/pkg/client/listers/apis/v1/grpcroute.go index 0409c9a402..10d4b8daa9 100644 --- a/pkg/client/listers/apis/v1/grpcroute.go +++ b/pkg/client/listers/apis/v1/grpcroute.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1 "sigs.k8s.io/gateway-api/apis/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // GRPCRouteLister helps list GRPCRoutes. @@ -30,7 +30,7 @@ import ( type GRPCRouteLister interface { // List lists all GRPCRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GRPCRoute, err error) + List(selector labels.Selector) (ret []*apisv1.GRPCRoute, err error) // GRPCRoutes returns an object that can list and get GRPCRoutes. GRPCRoutes(namespace string) GRPCRouteNamespaceLister GRPCRouteListerExpansion @@ -38,17 +38,17 @@ type GRPCRouteLister interface { // gRPCRouteLister implements the GRPCRouteLister interface. type gRPCRouteLister struct { - listers.ResourceIndexer[*v1.GRPCRoute] + listers.ResourceIndexer[*apisv1.GRPCRoute] } // NewGRPCRouteLister returns a new GRPCRouteLister. func NewGRPCRouteLister(indexer cache.Indexer) GRPCRouteLister { - return &gRPCRouteLister{listers.New[*v1.GRPCRoute](indexer, v1.Resource("grpcroute"))} + return &gRPCRouteLister{listers.New[*apisv1.GRPCRoute](indexer, apisv1.Resource("grpcroute"))} } // GRPCRoutes returns an object that can list and get GRPCRoutes. func (s *gRPCRouteLister) GRPCRoutes(namespace string) GRPCRouteNamespaceLister { - return gRPCRouteNamespaceLister{listers.NewNamespaced[*v1.GRPCRoute](s.ResourceIndexer, namespace)} + return gRPCRouteNamespaceLister{listers.NewNamespaced[*apisv1.GRPCRoute](s.ResourceIndexer, namespace)} } // GRPCRouteNamespaceLister helps list and get GRPCRoutes. @@ -56,15 +56,15 @@ func (s *gRPCRouteLister) GRPCRoutes(namespace string) GRPCRouteNamespaceLister type GRPCRouteNamespaceLister interface { // List lists all GRPCRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GRPCRoute, err error) + List(selector labels.Selector) (ret []*apisv1.GRPCRoute, err error) // Get retrieves the GRPCRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.GRPCRoute, error) + Get(name string) (*apisv1.GRPCRoute, error) GRPCRouteNamespaceListerExpansion } // gRPCRouteNamespaceLister implements the GRPCRouteNamespaceLister // interface. type gRPCRouteNamespaceLister struct { - listers.ResourceIndexer[*v1.GRPCRoute] + listers.ResourceIndexer[*apisv1.GRPCRoute] } diff --git a/pkg/client/listers/apis/v1/httproute.go b/pkg/client/listers/apis/v1/httproute.go index 2cbbe09d94..e1f03d45eb 100644 --- a/pkg/client/listers/apis/v1/httproute.go +++ b/pkg/client/listers/apis/v1/httproute.go @@ -19,10 +19,10 @@ limitations under the License. package v1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1 "sigs.k8s.io/gateway-api/apis/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1 "sigs.k8s.io/gateway-api/apis/v1" ) // HTTPRouteLister helps list HTTPRoutes. @@ -30,7 +30,7 @@ import ( type HTTPRouteLister interface { // List lists all HTTPRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.HTTPRoute, err error) + List(selector labels.Selector) (ret []*apisv1.HTTPRoute, err error) // HTTPRoutes returns an object that can list and get HTTPRoutes. HTTPRoutes(namespace string) HTTPRouteNamespaceLister HTTPRouteListerExpansion @@ -38,17 +38,17 @@ type HTTPRouteLister interface { // hTTPRouteLister implements the HTTPRouteLister interface. type hTTPRouteLister struct { - listers.ResourceIndexer[*v1.HTTPRoute] + listers.ResourceIndexer[*apisv1.HTTPRoute] } // NewHTTPRouteLister returns a new HTTPRouteLister. func NewHTTPRouteLister(indexer cache.Indexer) HTTPRouteLister { - return &hTTPRouteLister{listers.New[*v1.HTTPRoute](indexer, v1.Resource("httproute"))} + return &hTTPRouteLister{listers.New[*apisv1.HTTPRoute](indexer, apisv1.Resource("httproute"))} } // HTTPRoutes returns an object that can list and get HTTPRoutes. func (s *hTTPRouteLister) HTTPRoutes(namespace string) HTTPRouteNamespaceLister { - return hTTPRouteNamespaceLister{listers.NewNamespaced[*v1.HTTPRoute](s.ResourceIndexer, namespace)} + return hTTPRouteNamespaceLister{listers.NewNamespaced[*apisv1.HTTPRoute](s.ResourceIndexer, namespace)} } // HTTPRouteNamespaceLister helps list and get HTTPRoutes. @@ -56,15 +56,15 @@ func (s *hTTPRouteLister) HTTPRoutes(namespace string) HTTPRouteNamespaceLister type HTTPRouteNamespaceLister interface { // List lists all HTTPRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.HTTPRoute, err error) + List(selector labels.Selector) (ret []*apisv1.HTTPRoute, err error) // Get retrieves the HTTPRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.HTTPRoute, error) + Get(name string) (*apisv1.HTTPRoute, error) HTTPRouteNamespaceListerExpansion } // hTTPRouteNamespaceLister implements the HTTPRouteNamespaceLister // interface. type hTTPRouteNamespaceLister struct { - listers.ResourceIndexer[*v1.HTTPRoute] + listers.ResourceIndexer[*apisv1.HTTPRoute] } diff --git a/pkg/client/listers/apis/v1alpha2/grpcroute.go b/pkg/client/listers/apis/v1alpha2/grpcroute.go index 9ec44ce2b3..6e447be1b6 100644 --- a/pkg/client/listers/apis/v1alpha2/grpcroute.go +++ b/pkg/client/listers/apis/v1alpha2/grpcroute.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" ) // GRPCRouteLister helps list GRPCRoutes. @@ -30,7 +30,7 @@ import ( type GRPCRouteLister interface { // List lists all GRPCRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.GRPCRoute, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.GRPCRoute, err error) // GRPCRoutes returns an object that can list and get GRPCRoutes. GRPCRoutes(namespace string) GRPCRouteNamespaceLister GRPCRouteListerExpansion @@ -38,17 +38,17 @@ type GRPCRouteLister interface { // gRPCRouteLister implements the GRPCRouteLister interface. type gRPCRouteLister struct { - listers.ResourceIndexer[*v1alpha2.GRPCRoute] + listers.ResourceIndexer[*apisv1alpha2.GRPCRoute] } // NewGRPCRouteLister returns a new GRPCRouteLister. func NewGRPCRouteLister(indexer cache.Indexer) GRPCRouteLister { - return &gRPCRouteLister{listers.New[*v1alpha2.GRPCRoute](indexer, v1alpha2.Resource("grpcroute"))} + return &gRPCRouteLister{listers.New[*apisv1alpha2.GRPCRoute](indexer, apisv1alpha2.Resource("grpcroute"))} } // GRPCRoutes returns an object that can list and get GRPCRoutes. func (s *gRPCRouteLister) GRPCRoutes(namespace string) GRPCRouteNamespaceLister { - return gRPCRouteNamespaceLister{listers.NewNamespaced[*v1alpha2.GRPCRoute](s.ResourceIndexer, namespace)} + return gRPCRouteNamespaceLister{listers.NewNamespaced[*apisv1alpha2.GRPCRoute](s.ResourceIndexer, namespace)} } // GRPCRouteNamespaceLister helps list and get GRPCRoutes. @@ -56,15 +56,15 @@ func (s *gRPCRouteLister) GRPCRoutes(namespace string) GRPCRouteNamespaceLister type GRPCRouteNamespaceLister interface { // List lists all GRPCRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.GRPCRoute, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.GRPCRoute, err error) // Get retrieves the GRPCRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha2.GRPCRoute, error) + Get(name string) (*apisv1alpha2.GRPCRoute, error) GRPCRouteNamespaceListerExpansion } // gRPCRouteNamespaceLister implements the GRPCRouteNamespaceLister // interface. type gRPCRouteNamespaceLister struct { - listers.ResourceIndexer[*v1alpha2.GRPCRoute] + listers.ResourceIndexer[*apisv1alpha2.GRPCRoute] } diff --git a/pkg/client/listers/apis/v1alpha2/referencegrant.go b/pkg/client/listers/apis/v1alpha2/referencegrant.go index 8df80e9252..92695743b1 100644 --- a/pkg/client/listers/apis/v1alpha2/referencegrant.go +++ b/pkg/client/listers/apis/v1alpha2/referencegrant.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" ) // ReferenceGrantLister helps list ReferenceGrants. @@ -30,7 +30,7 @@ import ( type ReferenceGrantLister interface { // List lists all ReferenceGrants in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.ReferenceGrant, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.ReferenceGrant, err error) // ReferenceGrants returns an object that can list and get ReferenceGrants. ReferenceGrants(namespace string) ReferenceGrantNamespaceLister ReferenceGrantListerExpansion @@ -38,17 +38,17 @@ type ReferenceGrantLister interface { // referenceGrantLister implements the ReferenceGrantLister interface. type referenceGrantLister struct { - listers.ResourceIndexer[*v1alpha2.ReferenceGrant] + listers.ResourceIndexer[*apisv1alpha2.ReferenceGrant] } // NewReferenceGrantLister returns a new ReferenceGrantLister. func NewReferenceGrantLister(indexer cache.Indexer) ReferenceGrantLister { - return &referenceGrantLister{listers.New[*v1alpha2.ReferenceGrant](indexer, v1alpha2.Resource("referencegrant"))} + return &referenceGrantLister{listers.New[*apisv1alpha2.ReferenceGrant](indexer, apisv1alpha2.Resource("referencegrant"))} } // ReferenceGrants returns an object that can list and get ReferenceGrants. func (s *referenceGrantLister) ReferenceGrants(namespace string) ReferenceGrantNamespaceLister { - return referenceGrantNamespaceLister{listers.NewNamespaced[*v1alpha2.ReferenceGrant](s.ResourceIndexer, namespace)} + return referenceGrantNamespaceLister{listers.NewNamespaced[*apisv1alpha2.ReferenceGrant](s.ResourceIndexer, namespace)} } // ReferenceGrantNamespaceLister helps list and get ReferenceGrants. @@ -56,15 +56,15 @@ func (s *referenceGrantLister) ReferenceGrants(namespace string) ReferenceGrantN type ReferenceGrantNamespaceLister interface { // List lists all ReferenceGrants in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.ReferenceGrant, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.ReferenceGrant, err error) // Get retrieves the ReferenceGrant from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha2.ReferenceGrant, error) + Get(name string) (*apisv1alpha2.ReferenceGrant, error) ReferenceGrantNamespaceListerExpansion } // referenceGrantNamespaceLister implements the ReferenceGrantNamespaceLister // interface. type referenceGrantNamespaceLister struct { - listers.ResourceIndexer[*v1alpha2.ReferenceGrant] + listers.ResourceIndexer[*apisv1alpha2.ReferenceGrant] } diff --git a/pkg/client/listers/apis/v1alpha2/tcproute.go b/pkg/client/listers/apis/v1alpha2/tcproute.go index 4b34f9a2d9..4cbfe2349b 100644 --- a/pkg/client/listers/apis/v1alpha2/tcproute.go +++ b/pkg/client/listers/apis/v1alpha2/tcproute.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" ) // TCPRouteLister helps list TCPRoutes. @@ -30,7 +30,7 @@ import ( type TCPRouteLister interface { // List lists all TCPRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.TCPRoute, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.TCPRoute, err error) // TCPRoutes returns an object that can list and get TCPRoutes. TCPRoutes(namespace string) TCPRouteNamespaceLister TCPRouteListerExpansion @@ -38,17 +38,17 @@ type TCPRouteLister interface { // tCPRouteLister implements the TCPRouteLister interface. type tCPRouteLister struct { - listers.ResourceIndexer[*v1alpha2.TCPRoute] + listers.ResourceIndexer[*apisv1alpha2.TCPRoute] } // NewTCPRouteLister returns a new TCPRouteLister. func NewTCPRouteLister(indexer cache.Indexer) TCPRouteLister { - return &tCPRouteLister{listers.New[*v1alpha2.TCPRoute](indexer, v1alpha2.Resource("tcproute"))} + return &tCPRouteLister{listers.New[*apisv1alpha2.TCPRoute](indexer, apisv1alpha2.Resource("tcproute"))} } // TCPRoutes returns an object that can list and get TCPRoutes. func (s *tCPRouteLister) TCPRoutes(namespace string) TCPRouteNamespaceLister { - return tCPRouteNamespaceLister{listers.NewNamespaced[*v1alpha2.TCPRoute](s.ResourceIndexer, namespace)} + return tCPRouteNamespaceLister{listers.NewNamespaced[*apisv1alpha2.TCPRoute](s.ResourceIndexer, namespace)} } // TCPRouteNamespaceLister helps list and get TCPRoutes. @@ -56,15 +56,15 @@ func (s *tCPRouteLister) TCPRoutes(namespace string) TCPRouteNamespaceLister { type TCPRouteNamespaceLister interface { // List lists all TCPRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.TCPRoute, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.TCPRoute, err error) // Get retrieves the TCPRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha2.TCPRoute, error) + Get(name string) (*apisv1alpha2.TCPRoute, error) TCPRouteNamespaceListerExpansion } // tCPRouteNamespaceLister implements the TCPRouteNamespaceLister // interface. type tCPRouteNamespaceLister struct { - listers.ResourceIndexer[*v1alpha2.TCPRoute] + listers.ResourceIndexer[*apisv1alpha2.TCPRoute] } diff --git a/pkg/client/listers/apis/v1alpha2/tlsroute.go b/pkg/client/listers/apis/v1alpha2/tlsroute.go index ad021d0d14..be8e902609 100644 --- a/pkg/client/listers/apis/v1alpha2/tlsroute.go +++ b/pkg/client/listers/apis/v1alpha2/tlsroute.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" ) // TLSRouteLister helps list TLSRoutes. @@ -30,7 +30,7 @@ import ( type TLSRouteLister interface { // List lists all TLSRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.TLSRoute, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.TLSRoute, err error) // TLSRoutes returns an object that can list and get TLSRoutes. TLSRoutes(namespace string) TLSRouteNamespaceLister TLSRouteListerExpansion @@ -38,17 +38,17 @@ type TLSRouteLister interface { // tLSRouteLister implements the TLSRouteLister interface. type tLSRouteLister struct { - listers.ResourceIndexer[*v1alpha2.TLSRoute] + listers.ResourceIndexer[*apisv1alpha2.TLSRoute] } // NewTLSRouteLister returns a new TLSRouteLister. func NewTLSRouteLister(indexer cache.Indexer) TLSRouteLister { - return &tLSRouteLister{listers.New[*v1alpha2.TLSRoute](indexer, v1alpha2.Resource("tlsroute"))} + return &tLSRouteLister{listers.New[*apisv1alpha2.TLSRoute](indexer, apisv1alpha2.Resource("tlsroute"))} } // TLSRoutes returns an object that can list and get TLSRoutes. func (s *tLSRouteLister) TLSRoutes(namespace string) TLSRouteNamespaceLister { - return tLSRouteNamespaceLister{listers.NewNamespaced[*v1alpha2.TLSRoute](s.ResourceIndexer, namespace)} + return tLSRouteNamespaceLister{listers.NewNamespaced[*apisv1alpha2.TLSRoute](s.ResourceIndexer, namespace)} } // TLSRouteNamespaceLister helps list and get TLSRoutes. @@ -56,15 +56,15 @@ func (s *tLSRouteLister) TLSRoutes(namespace string) TLSRouteNamespaceLister { type TLSRouteNamespaceLister interface { // List lists all TLSRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.TLSRoute, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.TLSRoute, err error) // Get retrieves the TLSRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha2.TLSRoute, error) + Get(name string) (*apisv1alpha2.TLSRoute, error) TLSRouteNamespaceListerExpansion } // tLSRouteNamespaceLister implements the TLSRouteNamespaceLister // interface. type tLSRouteNamespaceLister struct { - listers.ResourceIndexer[*v1alpha2.TLSRoute] + listers.ResourceIndexer[*apisv1alpha2.TLSRoute] } diff --git a/pkg/client/listers/apis/v1alpha2/udproute.go b/pkg/client/listers/apis/v1alpha2/udproute.go index e4e4a20643..39834ce208 100644 --- a/pkg/client/listers/apis/v1alpha2/udproute.go +++ b/pkg/client/listers/apis/v1alpha2/udproute.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" ) // UDPRouteLister helps list UDPRoutes. @@ -30,7 +30,7 @@ import ( type UDPRouteLister interface { // List lists all UDPRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.UDPRoute, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.UDPRoute, err error) // UDPRoutes returns an object that can list and get UDPRoutes. UDPRoutes(namespace string) UDPRouteNamespaceLister UDPRouteListerExpansion @@ -38,17 +38,17 @@ type UDPRouteLister interface { // uDPRouteLister implements the UDPRouteLister interface. type uDPRouteLister struct { - listers.ResourceIndexer[*v1alpha2.UDPRoute] + listers.ResourceIndexer[*apisv1alpha2.UDPRoute] } // NewUDPRouteLister returns a new UDPRouteLister. func NewUDPRouteLister(indexer cache.Indexer) UDPRouteLister { - return &uDPRouteLister{listers.New[*v1alpha2.UDPRoute](indexer, v1alpha2.Resource("udproute"))} + return &uDPRouteLister{listers.New[*apisv1alpha2.UDPRoute](indexer, apisv1alpha2.Resource("udproute"))} } // UDPRoutes returns an object that can list and get UDPRoutes. func (s *uDPRouteLister) UDPRoutes(namespace string) UDPRouteNamespaceLister { - return uDPRouteNamespaceLister{listers.NewNamespaced[*v1alpha2.UDPRoute](s.ResourceIndexer, namespace)} + return uDPRouteNamespaceLister{listers.NewNamespaced[*apisv1alpha2.UDPRoute](s.ResourceIndexer, namespace)} } // UDPRouteNamespaceLister helps list and get UDPRoutes. @@ -56,15 +56,15 @@ func (s *uDPRouteLister) UDPRoutes(namespace string) UDPRouteNamespaceLister { type UDPRouteNamespaceLister interface { // List lists all UDPRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha2.UDPRoute, err error) + List(selector labels.Selector) (ret []*apisv1alpha2.UDPRoute, err error) // Get retrieves the UDPRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha2.UDPRoute, error) + Get(name string) (*apisv1alpha2.UDPRoute, error) UDPRouteNamespaceListerExpansion } // uDPRouteNamespaceLister implements the UDPRouteNamespaceLister // interface. type uDPRouteNamespaceLister struct { - listers.ResourceIndexer[*v1alpha2.UDPRoute] + listers.ResourceIndexer[*apisv1alpha2.UDPRoute] } diff --git a/pkg/client/listers/apis/v1alpha3/backendtlspolicy.go b/pkg/client/listers/apis/v1alpha3/backendtlspolicy.go index c881c849f4..85d77da318 100644 --- a/pkg/client/listers/apis/v1alpha3/backendtlspolicy.go +++ b/pkg/client/listers/apis/v1alpha3/backendtlspolicy.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha3 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" ) // BackendTLSPolicyLister helps list BackendTLSPolicies. @@ -30,7 +30,7 @@ import ( type BackendTLSPolicyLister interface { // List lists all BackendTLSPolicies in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha3.BackendTLSPolicy, err error) + List(selector labels.Selector) (ret []*apisv1alpha3.BackendTLSPolicy, err error) // BackendTLSPolicies returns an object that can list and get BackendTLSPolicies. BackendTLSPolicies(namespace string) BackendTLSPolicyNamespaceLister BackendTLSPolicyListerExpansion @@ -38,17 +38,17 @@ type BackendTLSPolicyLister interface { // backendTLSPolicyLister implements the BackendTLSPolicyLister interface. type backendTLSPolicyLister struct { - listers.ResourceIndexer[*v1alpha3.BackendTLSPolicy] + listers.ResourceIndexer[*apisv1alpha3.BackendTLSPolicy] } // NewBackendTLSPolicyLister returns a new BackendTLSPolicyLister. func NewBackendTLSPolicyLister(indexer cache.Indexer) BackendTLSPolicyLister { - return &backendTLSPolicyLister{listers.New[*v1alpha3.BackendTLSPolicy](indexer, v1alpha3.Resource("backendtlspolicy"))} + return &backendTLSPolicyLister{listers.New[*apisv1alpha3.BackendTLSPolicy](indexer, apisv1alpha3.Resource("backendtlspolicy"))} } // BackendTLSPolicies returns an object that can list and get BackendTLSPolicies. func (s *backendTLSPolicyLister) BackendTLSPolicies(namespace string) BackendTLSPolicyNamespaceLister { - return backendTLSPolicyNamespaceLister{listers.NewNamespaced[*v1alpha3.BackendTLSPolicy](s.ResourceIndexer, namespace)} + return backendTLSPolicyNamespaceLister{listers.NewNamespaced[*apisv1alpha3.BackendTLSPolicy](s.ResourceIndexer, namespace)} } // BackendTLSPolicyNamespaceLister helps list and get BackendTLSPolicies. @@ -56,15 +56,15 @@ func (s *backendTLSPolicyLister) BackendTLSPolicies(namespace string) BackendTLS type BackendTLSPolicyNamespaceLister interface { // List lists all BackendTLSPolicies in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha3.BackendTLSPolicy, err error) + List(selector labels.Selector) (ret []*apisv1alpha3.BackendTLSPolicy, err error) // Get retrieves the BackendTLSPolicy from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha3.BackendTLSPolicy, error) + Get(name string) (*apisv1alpha3.BackendTLSPolicy, error) BackendTLSPolicyNamespaceListerExpansion } // backendTLSPolicyNamespaceLister implements the BackendTLSPolicyNamespaceLister // interface. type backendTLSPolicyNamespaceLister struct { - listers.ResourceIndexer[*v1alpha3.BackendTLSPolicy] + listers.ResourceIndexer[*apisv1alpha3.BackendTLSPolicy] } diff --git a/pkg/client/listers/apis/v1beta1/gateway.go b/pkg/client/listers/apis/v1beta1/gateway.go index 2b20013c17..fc297bee4b 100644 --- a/pkg/client/listers/apis/v1beta1/gateway.go +++ b/pkg/client/listers/apis/v1beta1/gateway.go @@ -19,10 +19,10 @@ limitations under the License. package v1beta1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) // GatewayLister helps list Gateways. @@ -30,7 +30,7 @@ import ( type GatewayLister interface { // List lists all Gateways in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta1.Gateway, err error) + List(selector labels.Selector) (ret []*apisv1beta1.Gateway, err error) // Gateways returns an object that can list and get Gateways. Gateways(namespace string) GatewayNamespaceLister GatewayListerExpansion @@ -38,17 +38,17 @@ type GatewayLister interface { // gatewayLister implements the GatewayLister interface. type gatewayLister struct { - listers.ResourceIndexer[*v1beta1.Gateway] + listers.ResourceIndexer[*apisv1beta1.Gateway] } // NewGatewayLister returns a new GatewayLister. func NewGatewayLister(indexer cache.Indexer) GatewayLister { - return &gatewayLister{listers.New[*v1beta1.Gateway](indexer, v1beta1.Resource("gateway"))} + return &gatewayLister{listers.New[*apisv1beta1.Gateway](indexer, apisv1beta1.Resource("gateway"))} } // Gateways returns an object that can list and get Gateways. func (s *gatewayLister) Gateways(namespace string) GatewayNamespaceLister { - return gatewayNamespaceLister{listers.NewNamespaced[*v1beta1.Gateway](s.ResourceIndexer, namespace)} + return gatewayNamespaceLister{listers.NewNamespaced[*apisv1beta1.Gateway](s.ResourceIndexer, namespace)} } // GatewayNamespaceLister helps list and get Gateways. @@ -56,15 +56,15 @@ func (s *gatewayLister) Gateways(namespace string) GatewayNamespaceLister { type GatewayNamespaceLister interface { // List lists all Gateways in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta1.Gateway, err error) + List(selector labels.Selector) (ret []*apisv1beta1.Gateway, err error) // Get retrieves the Gateway from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1beta1.Gateway, error) + Get(name string) (*apisv1beta1.Gateway, error) GatewayNamespaceListerExpansion } // gatewayNamespaceLister implements the GatewayNamespaceLister // interface. type gatewayNamespaceLister struct { - listers.ResourceIndexer[*v1beta1.Gateway] + listers.ResourceIndexer[*apisv1beta1.Gateway] } diff --git a/pkg/client/listers/apis/v1beta1/gatewayclass.go b/pkg/client/listers/apis/v1beta1/gatewayclass.go index c2ae2ec025..3c2343f0ad 100644 --- a/pkg/client/listers/apis/v1beta1/gatewayclass.go +++ b/pkg/client/listers/apis/v1beta1/gatewayclass.go @@ -19,10 +19,10 @@ limitations under the License. package v1beta1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) // GatewayClassLister helps list GatewayClasses. @@ -30,19 +30,19 @@ import ( type GatewayClassLister interface { // List lists all GatewayClasses in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta1.GatewayClass, err error) + List(selector labels.Selector) (ret []*apisv1beta1.GatewayClass, err error) // Get retrieves the GatewayClass from the index for a given name. // Objects returned here must be treated as read-only. - Get(name string) (*v1beta1.GatewayClass, error) + Get(name string) (*apisv1beta1.GatewayClass, error) GatewayClassListerExpansion } // gatewayClassLister implements the GatewayClassLister interface. type gatewayClassLister struct { - listers.ResourceIndexer[*v1beta1.GatewayClass] + listers.ResourceIndexer[*apisv1beta1.GatewayClass] } // NewGatewayClassLister returns a new GatewayClassLister. func NewGatewayClassLister(indexer cache.Indexer) GatewayClassLister { - return &gatewayClassLister{listers.New[*v1beta1.GatewayClass](indexer, v1beta1.Resource("gatewayclass"))} + return &gatewayClassLister{listers.New[*apisv1beta1.GatewayClass](indexer, apisv1beta1.Resource("gatewayclass"))} } diff --git a/pkg/client/listers/apis/v1beta1/httproute.go b/pkg/client/listers/apis/v1beta1/httproute.go index 243226986c..62fe4b4804 100644 --- a/pkg/client/listers/apis/v1beta1/httproute.go +++ b/pkg/client/listers/apis/v1beta1/httproute.go @@ -19,10 +19,10 @@ limitations under the License. package v1beta1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) // HTTPRouteLister helps list HTTPRoutes. @@ -30,7 +30,7 @@ import ( type HTTPRouteLister interface { // List lists all HTTPRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta1.HTTPRoute, err error) + List(selector labels.Selector) (ret []*apisv1beta1.HTTPRoute, err error) // HTTPRoutes returns an object that can list and get HTTPRoutes. HTTPRoutes(namespace string) HTTPRouteNamespaceLister HTTPRouteListerExpansion @@ -38,17 +38,17 @@ type HTTPRouteLister interface { // hTTPRouteLister implements the HTTPRouteLister interface. type hTTPRouteLister struct { - listers.ResourceIndexer[*v1beta1.HTTPRoute] + listers.ResourceIndexer[*apisv1beta1.HTTPRoute] } // NewHTTPRouteLister returns a new HTTPRouteLister. func NewHTTPRouteLister(indexer cache.Indexer) HTTPRouteLister { - return &hTTPRouteLister{listers.New[*v1beta1.HTTPRoute](indexer, v1beta1.Resource("httproute"))} + return &hTTPRouteLister{listers.New[*apisv1beta1.HTTPRoute](indexer, apisv1beta1.Resource("httproute"))} } // HTTPRoutes returns an object that can list and get HTTPRoutes. func (s *hTTPRouteLister) HTTPRoutes(namespace string) HTTPRouteNamespaceLister { - return hTTPRouteNamespaceLister{listers.NewNamespaced[*v1beta1.HTTPRoute](s.ResourceIndexer, namespace)} + return hTTPRouteNamespaceLister{listers.NewNamespaced[*apisv1beta1.HTTPRoute](s.ResourceIndexer, namespace)} } // HTTPRouteNamespaceLister helps list and get HTTPRoutes. @@ -56,15 +56,15 @@ func (s *hTTPRouteLister) HTTPRoutes(namespace string) HTTPRouteNamespaceLister type HTTPRouteNamespaceLister interface { // List lists all HTTPRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta1.HTTPRoute, err error) + List(selector labels.Selector) (ret []*apisv1beta1.HTTPRoute, err error) // Get retrieves the HTTPRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1beta1.HTTPRoute, error) + Get(name string) (*apisv1beta1.HTTPRoute, error) HTTPRouteNamespaceListerExpansion } // hTTPRouteNamespaceLister implements the HTTPRouteNamespaceLister // interface. type hTTPRouteNamespaceLister struct { - listers.ResourceIndexer[*v1beta1.HTTPRoute] + listers.ResourceIndexer[*apisv1beta1.HTTPRoute] } diff --git a/pkg/client/listers/apis/v1beta1/referencegrant.go b/pkg/client/listers/apis/v1beta1/referencegrant.go index 5263fef653..703018d02f 100644 --- a/pkg/client/listers/apis/v1beta1/referencegrant.go +++ b/pkg/client/listers/apis/v1beta1/referencegrant.go @@ -19,10 +19,10 @@ limitations under the License. package v1beta1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" ) // ReferenceGrantLister helps list ReferenceGrants. @@ -30,7 +30,7 @@ import ( type ReferenceGrantLister interface { // List lists all ReferenceGrants in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta1.ReferenceGrant, err error) + List(selector labels.Selector) (ret []*apisv1beta1.ReferenceGrant, err error) // ReferenceGrants returns an object that can list and get ReferenceGrants. ReferenceGrants(namespace string) ReferenceGrantNamespaceLister ReferenceGrantListerExpansion @@ -38,17 +38,17 @@ type ReferenceGrantLister interface { // referenceGrantLister implements the ReferenceGrantLister interface. type referenceGrantLister struct { - listers.ResourceIndexer[*v1beta1.ReferenceGrant] + listers.ResourceIndexer[*apisv1beta1.ReferenceGrant] } // NewReferenceGrantLister returns a new ReferenceGrantLister. func NewReferenceGrantLister(indexer cache.Indexer) ReferenceGrantLister { - return &referenceGrantLister{listers.New[*v1beta1.ReferenceGrant](indexer, v1beta1.Resource("referencegrant"))} + return &referenceGrantLister{listers.New[*apisv1beta1.ReferenceGrant](indexer, apisv1beta1.Resource("referencegrant"))} } // ReferenceGrants returns an object that can list and get ReferenceGrants. func (s *referenceGrantLister) ReferenceGrants(namespace string) ReferenceGrantNamespaceLister { - return referenceGrantNamespaceLister{listers.NewNamespaced[*v1beta1.ReferenceGrant](s.ResourceIndexer, namespace)} + return referenceGrantNamespaceLister{listers.NewNamespaced[*apisv1beta1.ReferenceGrant](s.ResourceIndexer, namespace)} } // ReferenceGrantNamespaceLister helps list and get ReferenceGrants. @@ -56,15 +56,15 @@ func (s *referenceGrantLister) ReferenceGrants(namespace string) ReferenceGrantN type ReferenceGrantNamespaceLister interface { // List lists all ReferenceGrants in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1beta1.ReferenceGrant, err error) + List(selector labels.Selector) (ret []*apisv1beta1.ReferenceGrant, err error) // Get retrieves the ReferenceGrant from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1beta1.ReferenceGrant, error) + Get(name string) (*apisv1beta1.ReferenceGrant, error) ReferenceGrantNamespaceListerExpansion } // referenceGrantNamespaceLister implements the ReferenceGrantNamespaceLister // interface. type referenceGrantNamespaceLister struct { - listers.ResourceIndexer[*v1beta1.ReferenceGrant] + listers.ResourceIndexer[*apisv1beta1.ReferenceGrant] } diff --git a/pkg/client/listers/apisx/v1alpha1/xbackendtrafficpolicy.go b/pkg/client/listers/apisx/v1alpha1/xbackendtrafficpolicy.go index 6b8602f4ec..a4cb26ab23 100644 --- a/pkg/client/listers/apisx/v1alpha1/xbackendtrafficpolicy.go +++ b/pkg/client/listers/apisx/v1alpha1/xbackendtrafficpolicy.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" ) // XBackendTrafficPolicyLister helps list XBackendTrafficPolicies. @@ -30,7 +30,7 @@ import ( type XBackendTrafficPolicyLister interface { // List lists all XBackendTrafficPolicies in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.XBackendTrafficPolicy, err error) + List(selector labels.Selector) (ret []*apisxv1alpha1.XBackendTrafficPolicy, err error) // XBackendTrafficPolicies returns an object that can list and get XBackendTrafficPolicies. XBackendTrafficPolicies(namespace string) XBackendTrafficPolicyNamespaceLister XBackendTrafficPolicyListerExpansion @@ -38,17 +38,17 @@ type XBackendTrafficPolicyLister interface { // xBackendTrafficPolicyLister implements the XBackendTrafficPolicyLister interface. type xBackendTrafficPolicyLister struct { - listers.ResourceIndexer[*v1alpha1.XBackendTrafficPolicy] + listers.ResourceIndexer[*apisxv1alpha1.XBackendTrafficPolicy] } // NewXBackendTrafficPolicyLister returns a new XBackendTrafficPolicyLister. func NewXBackendTrafficPolicyLister(indexer cache.Indexer) XBackendTrafficPolicyLister { - return &xBackendTrafficPolicyLister{listers.New[*v1alpha1.XBackendTrafficPolicy](indexer, v1alpha1.Resource("xbackendtrafficpolicy"))} + return &xBackendTrafficPolicyLister{listers.New[*apisxv1alpha1.XBackendTrafficPolicy](indexer, apisxv1alpha1.Resource("xbackendtrafficpolicy"))} } // XBackendTrafficPolicies returns an object that can list and get XBackendTrafficPolicies. func (s *xBackendTrafficPolicyLister) XBackendTrafficPolicies(namespace string) XBackendTrafficPolicyNamespaceLister { - return xBackendTrafficPolicyNamespaceLister{listers.NewNamespaced[*v1alpha1.XBackendTrafficPolicy](s.ResourceIndexer, namespace)} + return xBackendTrafficPolicyNamespaceLister{listers.NewNamespaced[*apisxv1alpha1.XBackendTrafficPolicy](s.ResourceIndexer, namespace)} } // XBackendTrafficPolicyNamespaceLister helps list and get XBackendTrafficPolicies. @@ -56,15 +56,15 @@ func (s *xBackendTrafficPolicyLister) XBackendTrafficPolicies(namespace string) type XBackendTrafficPolicyNamespaceLister interface { // List lists all XBackendTrafficPolicies in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.XBackendTrafficPolicy, err error) + List(selector labels.Selector) (ret []*apisxv1alpha1.XBackendTrafficPolicy, err error) // Get retrieves the XBackendTrafficPolicy from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha1.XBackendTrafficPolicy, error) + Get(name string) (*apisxv1alpha1.XBackendTrafficPolicy, error) XBackendTrafficPolicyNamespaceListerExpansion } // xBackendTrafficPolicyNamespaceLister implements the XBackendTrafficPolicyNamespaceLister // interface. type xBackendTrafficPolicyNamespaceLister struct { - listers.ResourceIndexer[*v1alpha1.XBackendTrafficPolicy] + listers.ResourceIndexer[*apisxv1alpha1.XBackendTrafficPolicy] } diff --git a/pkg/client/listers/apisx/v1alpha1/xlistenerset.go b/pkg/client/listers/apisx/v1alpha1/xlistenerset.go index f9573ce6e8..4ff5d093c3 100644 --- a/pkg/client/listers/apisx/v1alpha1/xlistenerset.go +++ b/pkg/client/listers/apisx/v1alpha1/xlistenerset.go @@ -19,10 +19,10 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" - v1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" + apisxv1alpha1 "sigs.k8s.io/gateway-api/apisx/v1alpha1" ) // XListenerSetLister helps list XListenerSets. @@ -30,7 +30,7 @@ import ( type XListenerSetLister interface { // List lists all XListenerSets in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.XListenerSet, err error) + List(selector labels.Selector) (ret []*apisxv1alpha1.XListenerSet, err error) // XListenerSets returns an object that can list and get XListenerSets. XListenerSets(namespace string) XListenerSetNamespaceLister XListenerSetListerExpansion @@ -38,17 +38,17 @@ type XListenerSetLister interface { // xListenerSetLister implements the XListenerSetLister interface. type xListenerSetLister struct { - listers.ResourceIndexer[*v1alpha1.XListenerSet] + listers.ResourceIndexer[*apisxv1alpha1.XListenerSet] } // NewXListenerSetLister returns a new XListenerSetLister. func NewXListenerSetLister(indexer cache.Indexer) XListenerSetLister { - return &xListenerSetLister{listers.New[*v1alpha1.XListenerSet](indexer, v1alpha1.Resource("xlistenerset"))} + return &xListenerSetLister{listers.New[*apisxv1alpha1.XListenerSet](indexer, apisxv1alpha1.Resource("xlistenerset"))} } // XListenerSets returns an object that can list and get XListenerSets. func (s *xListenerSetLister) XListenerSets(namespace string) XListenerSetNamespaceLister { - return xListenerSetNamespaceLister{listers.NewNamespaced[*v1alpha1.XListenerSet](s.ResourceIndexer, namespace)} + return xListenerSetNamespaceLister{listers.NewNamespaced[*apisxv1alpha1.XListenerSet](s.ResourceIndexer, namespace)} } // XListenerSetNamespaceLister helps list and get XListenerSets. @@ -56,15 +56,15 @@ func (s *xListenerSetLister) XListenerSets(namespace string) XListenerSetNamespa type XListenerSetNamespaceLister interface { // List lists all XListenerSets in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.XListenerSet, err error) + List(selector labels.Selector) (ret []*apisxv1alpha1.XListenerSet, err error) // Get retrieves the XListenerSet from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha1.XListenerSet, error) + Get(name string) (*apisxv1alpha1.XListenerSet, error) XListenerSetNamespaceListerExpansion } // xListenerSetNamespaceLister implements the XListenerSetNamespaceLister // interface. type xListenerSetNamespaceLister struct { - listers.ResourceIndexer[*v1alpha1.XListenerSet] + listers.ResourceIndexer[*apisxv1alpha1.XListenerSet] } diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index df269308ba..9279b1767a 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -839,6 +839,13 @@ func schema_pkg_apis_meta_v1_DeleteOptions(ref common.ReferenceCallback) common. }, }, }, + "ignoreStoreReadErrorWithClusterBreakingPotential": { + SchemaProps: spec.SchemaProps{ + Description: "if set to true, it will trigger an unsafe deletion of the resource in case the normal deletion flow fails with a corrupt object error. A resource is considered corrupt if it can not be retrieved from the underlying storage successfully because of a) its data can not be transformed e.g. decryption failure, or b) it fails to decode into an object. NOTE: unsafe deletion ignores finalizer constraints, skips precondition checks, and removes the object from the storage. WARNING: This may potentially break the cluster if the workload associated with the resource being unsafe-deleted relies on normal deletion flow. Use only if you REALLY know what you are doing. The default value is false, and the user must opt in to enable it", + Type: []string{"boolean"}, + Format: "", + }, + }, }, }, }, diff --git a/site-src/reference/spec.md b/site-src/reference/spec.md deleted file mode 100644 index df95f97ed3..0000000000 --- a/site-src/reference/spec.md +++ /dev/null @@ -1,5 +0,0 @@ -# API Specification - -This page contains the API field specification for Gateway API. - -REPLACE_WITH_GENERATED_CONTENT diff --git a/tools/tools.go b/tools/tools.go index e296ffa0d6..adfae1df18 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -23,7 +23,7 @@ limitations under the License. package tools import ( - _ "github.com/ahmetb/gen-crd-api-reference-docs" + _ "github.com/elastic/crd-ref-docs" _ "google.golang.org/grpc/cmd/protoc-gen-go-grpc" _ "google.golang.org/protobuf/cmd/protoc-gen-go" _ "k8s.io/code-generator/cmd/client-gen"