From 27902c19c283bbd329dc2458e9b1feb8b502b653 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Wed, 13 Nov 2024 10:57:53 +0000 Subject: [PATCH] deprecated v1alpha1 CRDs for GlobalConfiguration, Policy & TransportServer --- .../k8s.nginx.org_globalconfigurations.yaml | 44 -- config/crd/bases/k8s.nginx.org_policies.yaml | 110 --- .../bases/k8s.nginx.org_transportservers.yaml | 157 ----- deploy/crds.yaml | 311 --------- .../transport-server-passthrough.yaml | 2 +- .../custom-listeners/README.md | 2 +- .../global-configuration.yaml | 2 +- .../transport-server/README.md | 2 +- internal/k8s/status_test.go | 8 +- pkg/apis/configuration/v1alpha1/doc.go | 5 - pkg/apis/configuration/v1alpha1/register.go | 40 -- pkg/apis/configuration/v1alpha1/types.go | 240 ------- .../v1alpha1/zz_generated.deepcopy.go | 627 ------------------ pkg/client/clientset/versioned/clientset.go | 13 - .../versioned/fake/clientset_generated.go | 7 - .../clientset/versioned/fake/register.go | 2 - .../clientset/versioned/scheme/register.go | 2 - .../v1alpha1/configuration_client.go | 101 --- .../typed/configuration/v1alpha1/doc.go | 4 - .../typed/configuration/v1alpha1/fake/doc.go | 4 - .../fake/fake_configuration_client.go | 32 - .../v1alpha1/fake/fake_globalconfiguration.go | 118 ---- .../v1alpha1/fake/fake_policy.go | 118 ---- .../v1alpha1/fake/fake_transportserver.go | 131 ---- .../v1alpha1/generated_expansion.go | 9 - .../v1alpha1/globalconfiguration.go | 51 -- .../typed/configuration/v1alpha1/policy.go | 51 -- .../configuration/v1alpha1/transportserver.go | 53 -- .../configuration/interface.go | 8 - .../v1alpha1/globalconfiguration.go | 74 --- .../configuration/v1alpha1/interface.go | 43 -- .../configuration/v1alpha1/policy.go | 74 --- .../configuration/v1alpha1/transportserver.go | 74 --- .../informers/externalversions/generic.go | 9 - .../v1alpha1/expansion_generated.go | 27 - .../v1alpha1/globalconfiguration.go | 54 -- .../listers/configuration/v1alpha1/policy.go | 54 -- .../configuration/v1alpha1/transportserver.go | 54 -- tests/suite/utils/custom_resources_utils.py | 2 +- 39 files changed, 9 insertions(+), 2710 deletions(-) delete mode 100644 pkg/apis/configuration/v1alpha1/doc.go delete mode 100644 pkg/apis/configuration/v1alpha1/register.go delete mode 100644 pkg/apis/configuration/v1alpha1/types.go delete mode 100644 pkg/apis/configuration/v1alpha1/zz_generated.deepcopy.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/configuration_client.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/doc.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/doc.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_configuration_client.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_globalconfiguration.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_policy.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_transportserver.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/generated_expansion.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/globalconfiguration.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/policy.go delete mode 100644 pkg/client/clientset/versioned/typed/configuration/v1alpha1/transportserver.go delete mode 100644 pkg/client/informers/externalversions/configuration/v1alpha1/globalconfiguration.go delete mode 100644 pkg/client/informers/externalversions/configuration/v1alpha1/interface.go delete mode 100644 pkg/client/informers/externalversions/configuration/v1alpha1/policy.go delete mode 100644 pkg/client/informers/externalversions/configuration/v1alpha1/transportserver.go delete mode 100644 pkg/client/listers/configuration/v1alpha1/expansion_generated.go delete mode 100644 pkg/client/listers/configuration/v1alpha1/globalconfiguration.go delete mode 100644 pkg/client/listers/configuration/v1alpha1/policy.go delete mode 100644 pkg/client/listers/configuration/v1alpha1/transportserver.go diff --git a/config/crd/bases/k8s.nginx.org_globalconfigurations.yaml b/config/crd/bases/k8s.nginx.org_globalconfigurations.yaml index db68a0ad78..0a9ee9876d 100644 --- a/config/crd/bases/k8s.nginx.org_globalconfigurations.yaml +++ b/config/crd/bases/k8s.nginx.org_globalconfigurations.yaml @@ -64,47 +64,3 @@ spec: type: object served: true storage: true - - name: v1alpha1 - schema: - openAPIV3Schema: - description: GlobalConfiguration defines the GlobalConfiguration resource. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: GlobalConfigurationSpec is the spec of the GlobalConfiguration - resource. - properties: - listeners: - items: - description: Listener defines a listener. - properties: - name: - type: string - port: - type: integer - protocol: - type: string - ssl: - type: boolean - type: object - type: array - type: object - type: object - served: true - storage: false diff --git a/config/crd/bases/k8s.nginx.org_policies.yaml b/config/crd/bases/k8s.nginx.org_policies.yaml index 14a72e20f0..0fcc637850 100644 --- a/config/crd/bases/k8s.nginx.org_policies.yaml +++ b/config/crd/bases/k8s.nginx.org_policies.yaml @@ -250,113 +250,3 @@ spec: storage: true subresources: status: {} - - name: v1alpha1 - schema: - openAPIV3Schema: - description: Policy defines a Policy for VirtualServer and VirtualServerRoute - resources. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: |- - PolicySpec is the spec of the Policy resource. - The spec includes multiple fields, where each field represents a different policy. - Only one policy (field) is allowed. - properties: - accessControl: - description: AccessControl defines an access policy based on the source - IP of a request. - properties: - allow: - items: - type: string - type: array - deny: - items: - type: string - type: array - type: object - egressMTLS: - description: EgressMTLS defines an Egress MTLS policy. - properties: - ciphers: - type: string - protocols: - type: string - serverName: - type: boolean - sessionReuse: - type: boolean - sslName: - type: string - tlsSecret: - type: string - trustedCertSecret: - type: string - verifyDepth: - type: integer - verifyServer: - type: boolean - type: object - ingressMTLS: - description: IngressMTLS defines an Ingress MTLS policy. - properties: - clientCertSecret: - type: string - verifyClient: - type: string - verifyDepth: - type: integer - type: object - jwt: - description: JWTAuth holds JWT authentication configuration. - properties: - realm: - type: string - secret: - type: string - token: - type: string - type: object - rateLimit: - description: RateLimit defines a rate limit policy. - properties: - burst: - type: integer - delay: - type: integer - dryRun: - type: boolean - key: - type: string - logLevel: - type: string - noDelay: - type: boolean - rate: - type: string - rejectCode: - type: integer - zoneSize: - type: string - type: object - type: object - type: object - served: true - storage: false diff --git a/config/crd/bases/k8s.nginx.org_transportservers.yaml b/config/crd/bases/k8s.nginx.org_transportservers.yaml index f6943d240a..65e87092d0 100644 --- a/config/crd/bases/k8s.nginx.org_transportservers.yaml +++ b/config/crd/bases/k8s.nginx.org_transportservers.yaml @@ -173,160 +173,3 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - description: Current state of the TransportServer. If the resource has a valid - status, it means it has been validated and accepted by the Ingress Controller. - jsonPath: .status.state - name: State - type: string - - jsonPath: .status.reason - name: Reason - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1alpha1 - schema: - openAPIV3Schema: - description: TransportServer defines the TransportServer resource. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: TransportServerSpec is the spec of the TransportServer resource. - properties: - action: - description: TransportServerAction defines an action. - properties: - pass: - type: string - type: object - host: - type: string - ingressClassName: - type: string - listener: - description: TransportServerListener defines a listener for a TransportServer. - properties: - name: - type: string - protocol: - type: string - type: object - serverSnippets: - type: string - sessionParameters: - description: SessionParameters defines session parameters. - properties: - timeout: - type: string - type: object - streamSnippets: - type: string - tls: - description: TransportServerTLS defines TransportServerTLS configuration - for a TransportServer. - properties: - secret: - type: string - type: object - upstreamParameters: - description: UpstreamParameters defines parameters for an upstream. - properties: - connectTimeout: - type: string - nextUpstream: - type: boolean - nextUpstreamTimeout: - type: string - nextUpstreamTries: - type: integer - udpRequests: - type: integer - udpResponses: - type: integer - type: object - upstreams: - items: - description: TransportServerUpstream defines an upstream. - properties: - backup: - type: string - backupPort: - type: integer - failTimeout: - type: string - healthCheck: - description: TransportServerHealthCheck defines the parameters - for active Upstream HealthChecks. - properties: - enable: - type: boolean - fails: - type: integer - interval: - type: string - jitter: - type: string - match: - description: TransportServerMatch defines the parameters - of a custom health check. - properties: - expect: - type: string - send: - type: string - type: object - passes: - type: integer - port: - type: integer - timeout: - type: string - type: object - loadBalancingMethod: - type: string - maxConns: - type: integer - maxFails: - type: integer - name: - type: string - port: - type: integer - service: - type: string - type: object - type: array - type: object - status: - description: TransportServerStatus defines the status for the TransportServer - resource. - properties: - message: - type: string - reason: - type: string - state: - type: string - type: object - type: object - served: true - storage: false - subresources: - status: {} diff --git a/deploy/crds.yaml b/deploy/crds.yaml index 6e7844db4b..60fff48700 100644 --- a/deploy/crds.yaml +++ b/deploy/crds.yaml @@ -160,50 +160,6 @@ spec: type: object served: true storage: true - - name: v1alpha1 - schema: - openAPIV3Schema: - description: GlobalConfiguration defines the GlobalConfiguration resource. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: GlobalConfigurationSpec is the spec of the GlobalConfiguration - resource. - properties: - listeners: - items: - description: Listener defines a listener. - properties: - name: - type: string - port: - type: integer - protocol: - type: string - ssl: - type: boolean - type: object - type: array - type: object - type: object - served: true - storage: false --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -456,116 +412,6 @@ spec: storage: true subresources: status: {} - - name: v1alpha1 - schema: - openAPIV3Schema: - description: Policy defines a Policy for VirtualServer and VirtualServerRoute - resources. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: |- - PolicySpec is the spec of the Policy resource. - The spec includes multiple fields, where each field represents a different policy. - Only one policy (field) is allowed. - properties: - accessControl: - description: AccessControl defines an access policy based on the source - IP of a request. - properties: - allow: - items: - type: string - type: array - deny: - items: - type: string - type: array - type: object - egressMTLS: - description: EgressMTLS defines an Egress MTLS policy. - properties: - ciphers: - type: string - protocols: - type: string - serverName: - type: boolean - sessionReuse: - type: boolean - sslName: - type: string - tlsSecret: - type: string - trustedCertSecret: - type: string - verifyDepth: - type: integer - verifyServer: - type: boolean - type: object - ingressMTLS: - description: IngressMTLS defines an Ingress MTLS policy. - properties: - clientCertSecret: - type: string - verifyClient: - type: string - verifyDepth: - type: integer - type: object - jwt: - description: JWTAuth holds JWT authentication configuration. - properties: - realm: - type: string - secret: - type: string - token: - type: string - type: object - rateLimit: - description: RateLimit defines a rate limit policy. - properties: - burst: - type: integer - delay: - type: integer - dryRun: - type: boolean - key: - type: string - logLevel: - type: string - noDelay: - type: boolean - rate: - type: string - rejectCode: - type: integer - zoneSize: - type: string - type: object - type: object - type: object - served: true - storage: false --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -741,163 +587,6 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - description: Current state of the TransportServer. If the resource has a valid - status, it means it has been validated and accepted by the Ingress Controller. - jsonPath: .status.state - name: State - type: string - - jsonPath: .status.reason - name: Reason - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1alpha1 - schema: - openAPIV3Schema: - description: TransportServer defines the TransportServer resource. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: TransportServerSpec is the spec of the TransportServer resource. - properties: - action: - description: TransportServerAction defines an action. - properties: - pass: - type: string - type: object - host: - type: string - ingressClassName: - type: string - listener: - description: TransportServerListener defines a listener for a TransportServer. - properties: - name: - type: string - protocol: - type: string - type: object - serverSnippets: - type: string - sessionParameters: - description: SessionParameters defines session parameters. - properties: - timeout: - type: string - type: object - streamSnippets: - type: string - tls: - description: TransportServerTLS defines TransportServerTLS configuration - for a TransportServer. - properties: - secret: - type: string - type: object - upstreamParameters: - description: UpstreamParameters defines parameters for an upstream. - properties: - connectTimeout: - type: string - nextUpstream: - type: boolean - nextUpstreamTimeout: - type: string - nextUpstreamTries: - type: integer - udpRequests: - type: integer - udpResponses: - type: integer - type: object - upstreams: - items: - description: TransportServerUpstream defines an upstream. - properties: - backup: - type: string - backupPort: - type: integer - failTimeout: - type: string - healthCheck: - description: TransportServerHealthCheck defines the parameters - for active Upstream HealthChecks. - properties: - enable: - type: boolean - fails: - type: integer - interval: - type: string - jitter: - type: string - match: - description: TransportServerMatch defines the parameters - of a custom health check. - properties: - expect: - type: string - send: - type: string - type: object - passes: - type: integer - port: - type: integer - timeout: - type: string - type: object - loadBalancingMethod: - type: string - maxConns: - type: integer - maxFails: - type: integer - name: - type: string - port: - type: integer - service: - type: string - type: object - type: array - type: object - status: - description: TransportServerStatus defines the status for the TransportServer - resource. - properties: - message: - type: string - reason: - type: string - state: - type: string - type: object - type: object - served: true - storage: false - subresources: - status: {} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/examples/custom-resources/backup-directive/transport-server/transport-server-passthrough.yaml b/examples/custom-resources/backup-directive/transport-server/transport-server-passthrough.yaml index 29ab06cad9..a3e60bf3f1 100644 --- a/examples/custom-resources/backup-directive/transport-server/transport-server-passthrough.yaml +++ b/examples/custom-resources/backup-directive/transport-server/transport-server-passthrough.yaml @@ -1,4 +1,4 @@ -apiVersion: k8s.nginx.org/v1alpha1 +apiVersion: k8s.nginx.org/v1 kind: TransportServer metadata: name: secure-app diff --git a/examples/custom-resources/custom-listeners/README.md b/examples/custom-resources/custom-listeners/README.md index 8716747dbe..d55935906f 100644 --- a/examples/custom-resources/custom-listeners/README.md +++ b/examples/custom-resources/custom-listeners/README.md @@ -50,7 +50,7 @@ Similar to how listeners are configured in our [basic-tcp-udp](../../examples/cu here we deploy a GlobalConfiguration resource with the listeners we want to use in our VirtualServer. ```yaml - apiVersion: k8s.nginx.org/v1alpha1 + apiVersion: k8s.nginx.org/v1 kind: GlobalConfiguration metadata: name: nginx-configuration diff --git a/examples/custom-resources/custom-listeners/global-configuration.yaml b/examples/custom-resources/custom-listeners/global-configuration.yaml index 1cab675af6..86e15f1758 100644 --- a/examples/custom-resources/custom-listeners/global-configuration.yaml +++ b/examples/custom-resources/custom-listeners/global-configuration.yaml @@ -1,4 +1,4 @@ -apiVersion: k8s.nginx.org/v1alpha1 +apiVersion: k8s.nginx.org/v1 kind: GlobalConfiguration metadata: name: nginx-configuration diff --git a/examples/custom-resources/externalname-services/transport-server/README.md b/examples/custom-resources/externalname-services/transport-server/README.md index d8edad7b34..bdb02f20e0 100644 --- a/examples/custom-resources/externalname-services/transport-server/README.md +++ b/examples/custom-resources/externalname-services/transport-server/README.md @@ -56,7 +56,7 @@ responding to requests. 2. Replace the service name ```secure-app``` with ```externalname-service``` and apply the change. ```yaml - apiVersion: k8s.nginx.org/v1alpha1 + apiVersion: k8s.nginx.org/v1 kind: TransportServer metadata: name: secure-app diff --git a/internal/k8s/status_test.go b/internal/k8s/status_test.go index f5e0436be0..6df2770ade 100644 --- a/internal/k8s/status_test.go +++ b/internal/k8s/status_test.go @@ -12,7 +12,7 @@ import ( nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - fake_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/fake" + fake_v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/fake" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -36,7 +36,7 @@ func TestUpdateTransportServerStatus(t *testing.T) { }, } - fakeClient := fake_v1alpha1.NewSimpleClientset( + fakeClient := fake_v1.NewSimpleClientset( &conf_v1.TransportServerList{ Items: []conf_v1.TransportServer{ *ts, @@ -88,7 +88,7 @@ func TestUpdateTransportServerStatusIgnoreNoChange(t *testing.T) { }, } - fakeClient := fake_v1alpha1.NewSimpleClientset( + fakeClient := fake_v1.NewSimpleClientset( &conf_v1.TransportServerList{ Items: []conf_v1.TransportServer{ *ts, @@ -154,7 +154,7 @@ func TestUpdateTransportServerStatusMissingTransportServer(t *testing.T) { }, } - fakeClient := fake_v1alpha1.NewSimpleClientset( + fakeClient := fake_v1.NewSimpleClientset( &conf_v1.TransportServerList{ Items: []conf_v1.TransportServer{}, }) diff --git a/pkg/apis/configuration/v1alpha1/doc.go b/pkg/apis/configuration/v1alpha1/doc.go deleted file mode 100644 index ab23aacb55..0000000000 --- a/pkg/apis/configuration/v1alpha1/doc.go +++ /dev/null @@ -1,5 +0,0 @@ -// +k8s:deepcopy-gen=package -// +groupName=k8s.nginx.org - -// Package v1alpha1 is the v1alpha1 version of the API. -package v1alpha1 diff --git a/pkg/apis/configuration/v1alpha1/register.go b/pkg/apis/configuration/v1alpha1/register.go deleted file mode 100644 index 22c1aa7327..0000000000 --- a/pkg/apis/configuration/v1alpha1/register.go +++ /dev/null @@ -1,40 +0,0 @@ -package v1alpha1 - -import ( - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -// SchemeGroupVersion is group version used to register these object. -var SchemeGroupVersion = schema.GroupVersion{Group: configuration.GroupName, Version: "v1alpha1"} - -// Kind takes an unqualified kind and returns back a Group qualified GroupKind. -func Kind(kind string) schema.GroupKind { - return SchemeGroupVersion.WithKind(kind).GroupKind() -} - -// Resource takes an unqualified resource and returns a Group qualified GroupResource. -func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() -} - -var ( - // SchemeBuilder build a scheme - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - // AddToScheme exported add function - AddToScheme = SchemeBuilder.AddToScheme -) - -// Adds the list of known types to Scheme. -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, - &GlobalConfiguration{}, - &GlobalConfigurationList{}, - &TransportServer{}, - &TransportServerList{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} diff --git a/pkg/apis/configuration/v1alpha1/types.go b/pkg/apis/configuration/v1alpha1/types.go deleted file mode 100644 index ef91ec9726..0000000000 --- a/pkg/apis/configuration/v1alpha1/types.go +++ /dev/null @@ -1,240 +0,0 @@ -package v1alpha1 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -const ( - // TLSPassthroughListenerName is the name of a built-in TLS Passthrough listener. - TLSPassthroughListenerName = "tls-passthrough" - // TLSPassthroughListenerProtocol is the protocol of a built-in TLS Passthrough listener. - TLSPassthroughListenerProtocol = "TLS_PASSTHROUGH" -) - -// +genclient -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +kubebuilder:validation:Optional -// +kubebuilder:resource:shortName=gc - -// GlobalConfiguration defines the GlobalConfiguration resource. -type GlobalConfiguration struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec GlobalConfigurationSpec `json:"spec"` -} - -// GlobalConfigurationSpec is the spec of the GlobalConfiguration resource. -type GlobalConfigurationSpec struct { - Listeners []Listener `json:"listeners"` -} - -// Listener defines a listener. -type Listener struct { - Name string `json:"name"` - Port int `json:"port"` - Protocol string `json:"protocol"` - Ssl bool `json:"ssl"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// GlobalConfigurationList is a list of the GlobalConfiguration resources. -type GlobalConfigurationList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata"` - - Items []GlobalConfiguration `json:"items"` -} - -// +genclient -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +kubebuilder:validation:Optional -// +kubebuilder:resource:shortName=ts -// +kubebuilder:subresource:status -// +kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state`,description="Current state of the TransportServer. If the resource has a valid status, it means it has been validated and accepted by the Ingress Controller." -// +kubebuilder:printcolumn:name="Reason",type=string,JSONPath=`.status.reason` -// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp` - -// TransportServer defines the TransportServer resource. -type TransportServer struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec TransportServerSpec `json:"spec"` - Status TransportServerStatus `json:"status"` -} - -// TransportServerSpec is the spec of the TransportServer resource. -type TransportServerSpec struct { - IngressClass string `json:"ingressClassName"` - TLS *TransportServerTLS `json:"tls"` - Listener TransportServerListener `json:"listener"` - ServerSnippets string `json:"serverSnippets"` - StreamSnippets string `json:"streamSnippets"` - Host string `json:"host"` - Upstreams []TransportServerUpstream `json:"upstreams"` - UpstreamParameters *UpstreamParameters `json:"upstreamParameters"` - SessionParameters *SessionParameters `json:"sessionParameters"` - Action *TransportServerAction `json:"action"` -} - -// TransportServerTLS defines TransportServerTLS configuration for a TransportServer. -type TransportServerTLS struct { - Secret string `json:"secret"` -} - -// TransportServerListener defines a listener for a TransportServer. -type TransportServerListener struct { - Name string `json:"name"` - Protocol string `json:"protocol"` -} - -// TransportServerUpstream defines an upstream. -type TransportServerUpstream struct { - Name string `json:"name"` - Service string `json:"service"` - Port int `json:"port"` - FailTimeout string `json:"failTimeout"` - MaxFails *int `json:"maxFails"` - MaxConns *int `json:"maxConns"` - HealthCheck *TransportServerHealthCheck `json:"healthCheck"` - LoadBalancingMethod string `json:"loadBalancingMethod"` - Backup *string `json:"backup"` - BackupPort *int `json:"backupPort"` -} - -// TransportServerHealthCheck defines the parameters for active Upstream HealthChecks. -type TransportServerHealthCheck struct { - Enabled bool `json:"enable"` - Timeout string `json:"timeout"` - Jitter string `json:"jitter"` - Port int `json:"port"` - Interval string `json:"interval"` - Passes int `json:"passes"` - Fails int `json:"fails"` - Match *TransportServerMatch `json:"match"` -} - -// TransportServerMatch defines the parameters of a custom health check. -type TransportServerMatch struct { - Send string `json:"send"` - Expect string `json:"expect"` -} - -// UpstreamParameters defines parameters for an upstream. -type UpstreamParameters struct { - UDPRequests *int `json:"udpRequests"` - UDPResponses *int `json:"udpResponses"` - - ConnectTimeout string `json:"connectTimeout"` - NextUpstream bool `json:"nextUpstream"` - NextUpstreamTimeout string `json:"nextUpstreamTimeout"` - NextUpstreamTries int `json:"nextUpstreamTries"` -} - -// SessionParameters defines session parameters. -type SessionParameters struct { - Timeout string `json:"timeout"` -} - -// TransportServerAction defines an action. -type TransportServerAction struct { - Pass string `json:"pass"` -} - -// TransportServerStatus defines the status for the TransportServer resource. -type TransportServerStatus struct { - State string `json:"state"` - Reason string `json:"reason"` - Message string `json:"message"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// TransportServerList is a list of the TransportServer resources. -type TransportServerList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata"` - - Items []TransportServer `json:"items"` -} - -// +genclient -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +kubebuilder:validation:Optional - -// Policy defines a Policy for VirtualServer and VirtualServerRoute resources. -type Policy struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec PolicySpec `json:"spec"` -} - -// PolicySpec is the spec of the Policy resource. -// The spec includes multiple fields, where each field represents a different policy. -// Only one policy (field) is allowed. -type PolicySpec struct { - AccessControl *AccessControl `json:"accessControl"` - RateLimit *RateLimit `json:"rateLimit"` - JWTAuth *JWTAuth `json:"jwt"` - IngressMTLS *IngressMTLS `json:"ingressMTLS"` - EgressMTLS *EgressMTLS `json:"egressMTLS"` -} - -// AccessControl defines an access policy based on the source IP of a request. -type AccessControl struct { - Allow []string `json:"allow"` - Deny []string `json:"deny"` -} - -// RateLimit defines a rate limit policy. -type RateLimit struct { - Rate string `json:"rate"` - Key string `json:"key"` - Delay *int `json:"delay"` - NoDelay *bool `json:"noDelay"` - Burst *int `json:"burst"` - ZoneSize string `json:"zoneSize"` - DryRun *bool `json:"dryRun"` - LogLevel string `json:"logLevel"` - RejectCode *int `json:"rejectCode"` -} - -// JWTAuth holds JWT authentication configuration. -type JWTAuth struct { - Realm string `json:"realm"` - Secret string `json:"secret"` - Token string `json:"token"` -} - -// IngressMTLS defines an Ingress MTLS policy. -type IngressMTLS struct { - ClientCertSecret string `json:"clientCertSecret"` - VerifyClient string `json:"verifyClient"` - VerifyDepth *int `json:"verifyDepth"` -} - -// EgressMTLS defines an Egress MTLS policy. -type EgressMTLS struct { - TLSSecret string `json:"tlsSecret"` - VerifyServer bool `json:"verifyServer"` - VerifyDepth *int `json:"verifyDepth"` - Protocols string `json:"protocols"` - SessionReuse *bool `json:"sessionReuse"` - Ciphers string `json:"ciphers"` - TrustedCertSecret string `json:"trustedCertSecret"` - ServerName bool `json:"serverName"` - SSLName string `json:"sslName"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// PolicyList is a list of the Policy resources. -type PolicyList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata"` - - Items []Policy `json:"items"` -} diff --git a/pkg/apis/configuration/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/configuration/v1alpha1/zz_generated.deepcopy.go deleted file mode 100644 index bc1cedef38..0000000000 --- a/pkg/apis/configuration/v1alpha1/zz_generated.deepcopy.go +++ /dev/null @@ -1,627 +0,0 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - -// Code generated by deepcopy-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - runtime "k8s.io/apimachinery/pkg/runtime" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *AccessControl) DeepCopyInto(out *AccessControl) { - *out = *in - if in.Allow != nil { - in, out := &in.Allow, &out.Allow - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.Deny != nil { - in, out := &in.Deny, &out.Deny - *out = make([]string, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AccessControl. -func (in *AccessControl) DeepCopy() *AccessControl { - if in == nil { - return nil - } - out := new(AccessControl) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *EgressMTLS) DeepCopyInto(out *EgressMTLS) { - *out = *in - if in.VerifyDepth != nil { - in, out := &in.VerifyDepth, &out.VerifyDepth - *out = new(int) - **out = **in - } - if in.SessionReuse != nil { - in, out := &in.SessionReuse, &out.SessionReuse - *out = new(bool) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EgressMTLS. -func (in *EgressMTLS) DeepCopy() *EgressMTLS { - if in == nil { - return nil - } - out := new(EgressMTLS) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *GlobalConfiguration) DeepCopyInto(out *GlobalConfiguration) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GlobalConfiguration. -func (in *GlobalConfiguration) DeepCopy() *GlobalConfiguration { - if in == nil { - return nil - } - out := new(GlobalConfiguration) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *GlobalConfiguration) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *GlobalConfigurationList) DeepCopyInto(out *GlobalConfigurationList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]GlobalConfiguration, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GlobalConfigurationList. -func (in *GlobalConfigurationList) DeepCopy() *GlobalConfigurationList { - if in == nil { - return nil - } - out := new(GlobalConfigurationList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *GlobalConfigurationList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *GlobalConfigurationSpec) DeepCopyInto(out *GlobalConfigurationSpec) { - *out = *in - if in.Listeners != nil { - in, out := &in.Listeners, &out.Listeners - *out = make([]Listener, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GlobalConfigurationSpec. -func (in *GlobalConfigurationSpec) DeepCopy() *GlobalConfigurationSpec { - if in == nil { - return nil - } - out := new(GlobalConfigurationSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *IngressMTLS) DeepCopyInto(out *IngressMTLS) { - *out = *in - if in.VerifyDepth != nil { - in, out := &in.VerifyDepth, &out.VerifyDepth - *out = new(int) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressMTLS. -func (in *IngressMTLS) DeepCopy() *IngressMTLS { - if in == nil { - return nil - } - out := new(IngressMTLS) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *JWTAuth) DeepCopyInto(out *JWTAuth) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new JWTAuth. -func (in *JWTAuth) DeepCopy() *JWTAuth { - if in == nil { - return nil - } - out := new(JWTAuth) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Listener) DeepCopyInto(out *Listener) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Listener. -func (in *Listener) DeepCopy() *Listener { - if in == nil { - return nil - } - out := new(Listener) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Policy) DeepCopyInto(out *Policy) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Policy. -func (in *Policy) DeepCopy() *Policy { - if in == nil { - return nil - } - out := new(Policy) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Policy) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PolicyList) DeepCopyInto(out *PolicyList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Policy, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyList. -func (in *PolicyList) DeepCopy() *PolicyList { - if in == nil { - return nil - } - out := new(PolicyList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *PolicyList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PolicySpec) DeepCopyInto(out *PolicySpec) { - *out = *in - if in.AccessControl != nil { - in, out := &in.AccessControl, &out.AccessControl - *out = new(AccessControl) - (*in).DeepCopyInto(*out) - } - if in.RateLimit != nil { - in, out := &in.RateLimit, &out.RateLimit - *out = new(RateLimit) - (*in).DeepCopyInto(*out) - } - if in.JWTAuth != nil { - in, out := &in.JWTAuth, &out.JWTAuth - *out = new(JWTAuth) - **out = **in - } - if in.IngressMTLS != nil { - in, out := &in.IngressMTLS, &out.IngressMTLS - *out = new(IngressMTLS) - (*in).DeepCopyInto(*out) - } - if in.EgressMTLS != nil { - in, out := &in.EgressMTLS, &out.EgressMTLS - *out = new(EgressMTLS) - (*in).DeepCopyInto(*out) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicySpec. -func (in *PolicySpec) DeepCopy() *PolicySpec { - if in == nil { - return nil - } - out := new(PolicySpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RateLimit) DeepCopyInto(out *RateLimit) { - *out = *in - if in.Delay != nil { - in, out := &in.Delay, &out.Delay - *out = new(int) - **out = **in - } - if in.NoDelay != nil { - in, out := &in.NoDelay, &out.NoDelay - *out = new(bool) - **out = **in - } - if in.Burst != nil { - in, out := &in.Burst, &out.Burst - *out = new(int) - **out = **in - } - if in.DryRun != nil { - in, out := &in.DryRun, &out.DryRun - *out = new(bool) - **out = **in - } - if in.RejectCode != nil { - in, out := &in.RejectCode, &out.RejectCode - *out = new(int) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RateLimit. -func (in *RateLimit) DeepCopy() *RateLimit { - if in == nil { - return nil - } - out := new(RateLimit) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *SessionParameters) DeepCopyInto(out *SessionParameters) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SessionParameters. -func (in *SessionParameters) DeepCopy() *SessionParameters { - if in == nil { - return nil - } - out := new(SessionParameters) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServer) DeepCopyInto(out *TransportServer) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServer. -func (in *TransportServer) DeepCopy() *TransportServer { - if in == nil { - return nil - } - out := new(TransportServer) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *TransportServer) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerAction) DeepCopyInto(out *TransportServerAction) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerAction. -func (in *TransportServerAction) DeepCopy() *TransportServerAction { - if in == nil { - return nil - } - out := new(TransportServerAction) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerHealthCheck) DeepCopyInto(out *TransportServerHealthCheck) { - *out = *in - if in.Match != nil { - in, out := &in.Match, &out.Match - *out = new(TransportServerMatch) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerHealthCheck. -func (in *TransportServerHealthCheck) DeepCopy() *TransportServerHealthCheck { - if in == nil { - return nil - } - out := new(TransportServerHealthCheck) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerList) DeepCopyInto(out *TransportServerList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]TransportServer, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerList. -func (in *TransportServerList) DeepCopy() *TransportServerList { - if in == nil { - return nil - } - out := new(TransportServerList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *TransportServerList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerListener) DeepCopyInto(out *TransportServerListener) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerListener. -func (in *TransportServerListener) DeepCopy() *TransportServerListener { - if in == nil { - return nil - } - out := new(TransportServerListener) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerMatch) DeepCopyInto(out *TransportServerMatch) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerMatch. -func (in *TransportServerMatch) DeepCopy() *TransportServerMatch { - if in == nil { - return nil - } - out := new(TransportServerMatch) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerSpec) DeepCopyInto(out *TransportServerSpec) { - *out = *in - if in.TLS != nil { - in, out := &in.TLS, &out.TLS - *out = new(TransportServerTLS) - **out = **in - } - out.Listener = in.Listener - if in.Upstreams != nil { - in, out := &in.Upstreams, &out.Upstreams - *out = make([]TransportServerUpstream, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.UpstreamParameters != nil { - in, out := &in.UpstreamParameters, &out.UpstreamParameters - *out = new(UpstreamParameters) - (*in).DeepCopyInto(*out) - } - if in.SessionParameters != nil { - in, out := &in.SessionParameters, &out.SessionParameters - *out = new(SessionParameters) - **out = **in - } - if in.Action != nil { - in, out := &in.Action, &out.Action - *out = new(TransportServerAction) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerSpec. -func (in *TransportServerSpec) DeepCopy() *TransportServerSpec { - if in == nil { - return nil - } - out := new(TransportServerSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerStatus) DeepCopyInto(out *TransportServerStatus) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerStatus. -func (in *TransportServerStatus) DeepCopy() *TransportServerStatus { - if in == nil { - return nil - } - out := new(TransportServerStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerTLS) DeepCopyInto(out *TransportServerTLS) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerTLS. -func (in *TransportServerTLS) DeepCopy() *TransportServerTLS { - if in == nil { - return nil - } - out := new(TransportServerTLS) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TransportServerUpstream) DeepCopyInto(out *TransportServerUpstream) { - *out = *in - if in.MaxFails != nil { - in, out := &in.MaxFails, &out.MaxFails - *out = new(int) - **out = **in - } - if in.MaxConns != nil { - in, out := &in.MaxConns, &out.MaxConns - *out = new(int) - **out = **in - } - if in.HealthCheck != nil { - in, out := &in.HealthCheck, &out.HealthCheck - *out = new(TransportServerHealthCheck) - (*in).DeepCopyInto(*out) - } - if in.Backup != nil { - in, out := &in.Backup, &out.Backup - *out = new(string) - **out = **in - } - if in.BackupPort != nil { - in, out := &in.BackupPort, &out.BackupPort - *out = new(int) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TransportServerUpstream. -func (in *TransportServerUpstream) DeepCopy() *TransportServerUpstream { - if in == nil { - return nil - } - out := new(TransportServerUpstream) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UpstreamParameters) DeepCopyInto(out *UpstreamParameters) { - *out = *in - if in.UDPRequests != nil { - in, out := &in.UDPRequests, &out.UDPRequests - *out = new(int) - **out = **in - } - if in.UDPResponses != nil { - in, out := &in.UDPResponses, &out.UDPResponses - *out = new(int) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UpstreamParameters. -func (in *UpstreamParameters) DeepCopy() *UpstreamParameters { - if in == nil { - return nil - } - out := new(UpstreamParameters) - in.DeepCopyInto(out) - return out -} diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 2c74d275f7..7992c4f511 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -7,7 +7,6 @@ import ( "net/http" k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" - k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1alpha1" appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" discovery "k8s.io/client-go/discovery" @@ -18,7 +17,6 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface K8sV1() k8sv1.K8sV1Interface - K8sV1alpha1() k8sv1alpha1.K8sV1alpha1Interface AppprotectdosV1beta1() appprotectdosv1beta1.AppprotectdosV1beta1Interface ExternaldnsV1() externaldnsv1.ExternaldnsV1Interface } @@ -27,7 +25,6 @@ type Interface interface { type Clientset struct { *discovery.DiscoveryClient k8sV1 *k8sv1.K8sV1Client - k8sV1alpha1 *k8sv1alpha1.K8sV1alpha1Client appprotectdosV1beta1 *appprotectdosv1beta1.AppprotectdosV1beta1Client externaldnsV1 *externaldnsv1.ExternaldnsV1Client } @@ -37,11 +34,6 @@ func (c *Clientset) K8sV1() k8sv1.K8sV1Interface { return c.k8sV1 } -// K8sV1alpha1 retrieves the K8sV1alpha1Client -func (c *Clientset) K8sV1alpha1() k8sv1alpha1.K8sV1alpha1Interface { - return c.k8sV1alpha1 -} - // AppprotectdosV1beta1 retrieves the AppprotectdosV1beta1Client func (c *Clientset) AppprotectdosV1beta1() appprotectdosv1beta1.AppprotectdosV1beta1Interface { return c.appprotectdosV1beta1 @@ -100,10 +92,6 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, if err != nil { return nil, err } - cs.k8sV1alpha1, err = k8sv1alpha1.NewForConfigAndClient(&configShallowCopy, httpClient) - if err != nil { - return nil, err - } cs.appprotectdosV1beta1, err = appprotectdosv1beta1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err @@ -134,7 +122,6 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { func New(c rest.Interface) *Clientset { var cs Clientset cs.k8sV1 = k8sv1.New(c) - cs.k8sV1alpha1 = k8sv1alpha1.New(c) cs.appprotectdosV1beta1 = appprotectdosv1beta1.New(c) cs.externaldnsV1 = externaldnsv1.New(c) diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 65ffe4b639..6ce8759b48 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -6,8 +6,6 @@ import ( clientset "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" fakek8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1/fake" - k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1alpha1" - fakek8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake" appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" fakeappprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1/fake" externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" @@ -78,11 +76,6 @@ func (c *Clientset) K8sV1() k8sv1.K8sV1Interface { return &fakek8sv1.FakeK8sV1{Fake: &c.Fake} } -// K8sV1alpha1 retrieves the K8sV1alpha1Client -func (c *Clientset) K8sV1alpha1() k8sv1alpha1.K8sV1alpha1Interface { - return &fakek8sv1alpha1.FakeK8sV1alpha1{Fake: &c.Fake} -} - // AppprotectdosV1beta1 retrieves the AppprotectdosV1beta1Client func (c *Clientset) AppprotectdosV1beta1() appprotectdosv1beta1.AppprotectdosV1beta1Interface { return &fakeappprotectdosv1beta1.FakeAppprotectdosV1beta1{Fake: &c.Fake} diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 8e32fa7027..8541344f57 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -4,7 +4,6 @@ package fake import ( k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -19,7 +18,6 @@ var codecs = serializer.NewCodecFactory(scheme) var localSchemeBuilder = runtime.SchemeBuilder{ k8sv1.AddToScheme, - k8sv1alpha1.AddToScheme, appprotectdosv1beta1.AddToScheme, externaldnsv1.AddToScheme, } diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index d44198d75b..81c9900742 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -4,7 +4,6 @@ package scheme import ( k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -19,7 +18,6 @@ var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) var localSchemeBuilder = runtime.SchemeBuilder{ k8sv1.AddToScheme, - k8sv1alpha1.AddToScheme, appprotectdosv1beta1.AddToScheme, externaldnsv1.AddToScheme, } diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/configuration_client.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/configuration_client.go deleted file mode 100644 index 349d660772..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/configuration_client.go +++ /dev/null @@ -1,101 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "net/http" - - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" -) - -type K8sV1alpha1Interface interface { - RESTClient() rest.Interface - GlobalConfigurationsGetter - PoliciesGetter - TransportServersGetter -} - -// K8sV1alpha1Client is used to interact with features provided by the k8s.nginx.org group. -type K8sV1alpha1Client struct { - restClient rest.Interface -} - -func (c *K8sV1alpha1Client) GlobalConfigurations(namespace string) GlobalConfigurationInterface { - return newGlobalConfigurations(c, namespace) -} - -func (c *K8sV1alpha1Client) Policies(namespace string) PolicyInterface { - return newPolicies(c, namespace) -} - -func (c *K8sV1alpha1Client) TransportServers(namespace string) TransportServerInterface { - return newTransportServers(c, namespace) -} - -// NewForConfig creates a new K8sV1alpha1Client for the given config. -// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), -// where httpClient was generated with rest.HTTPClientFor(c). -func NewForConfig(c *rest.Config) (*K8sV1alpha1Client, error) { - config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } - httpClient, err := rest.HTTPClientFor(&config) - if err != nil { - return nil, err - } - return NewForConfigAndClient(&config, httpClient) -} - -// NewForConfigAndClient creates a new K8sV1alpha1Client for the given config and http client. -// Note the http client provided takes precedence over the configured transport values. -func NewForConfigAndClient(c *rest.Config, h *http.Client) (*K8sV1alpha1Client, error) { - config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } - client, err := rest.RESTClientForConfigAndClient(&config, h) - if err != nil { - return nil, err - } - return &K8sV1alpha1Client{client}, nil -} - -// NewForConfigOrDie creates a new K8sV1alpha1Client for the given config and -// panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *K8sV1alpha1Client { - client, err := NewForConfig(c) - if err != nil { - panic(err) - } - return client -} - -// New creates a new K8sV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *K8sV1alpha1Client { - return &K8sV1alpha1Client{c} -} - -func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion - config.GroupVersion = &gv - config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() - - if config.UserAgent == "" { - config.UserAgent = rest.DefaultKubernetesUserAgent() - } - - return nil -} - -// RESTClient returns a RESTClient that is used to communicate -// with API server by this client implementation. -func (c *K8sV1alpha1Client) RESTClient() rest.Interface { - if c == nil { - return nil - } - return c.restClient -} diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/doc.go deleted file mode 100644 index 93a7ca4e0e..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/doc.go +++ /dev/null @@ -1,4 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -// This package has the automatically generated typed clients. -package v1alpha1 diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/doc.go deleted file mode 100644 index 2b5ba4c8e4..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/doc.go +++ /dev/null @@ -1,4 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -// Package fake has the automatically generated clients. -package fake diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_configuration_client.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_configuration_client.go deleted file mode 100644 index 9ad22127bd..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_configuration_client.go +++ /dev/null @@ -1,32 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1alpha1" - rest "k8s.io/client-go/rest" - testing "k8s.io/client-go/testing" -) - -type FakeK8sV1alpha1 struct { - *testing.Fake -} - -func (c *FakeK8sV1alpha1) GlobalConfigurations(namespace string) v1alpha1.GlobalConfigurationInterface { - return &FakeGlobalConfigurations{c, namespace} -} - -func (c *FakeK8sV1alpha1) Policies(namespace string) v1alpha1.PolicyInterface { - return &FakePolicies{c, namespace} -} - -func (c *FakeK8sV1alpha1) TransportServers(namespace string) v1alpha1.TransportServerInterface { - return &FakeTransportServers{c, namespace} -} - -// RESTClient returns a RESTClient that is used to communicate -// with API server by this client implementation. -func (c *FakeK8sV1alpha1) RESTClient() rest.Interface { - var ret *rest.RESTClient - return ret -} diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_globalconfiguration.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_globalconfiguration.go deleted file mode 100644 index 299a15a62c..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_globalconfiguration.go +++ /dev/null @@ -1,118 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - "context" - - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - 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" -) - -// FakeGlobalConfigurations implements GlobalConfigurationInterface -type FakeGlobalConfigurations struct { - Fake *FakeK8sV1alpha1 - ns string -} - -var globalconfigurationsResource = v1alpha1.SchemeGroupVersion.WithResource("globalconfigurations") - -var globalconfigurationsKind = v1alpha1.SchemeGroupVersion.WithKind("GlobalConfiguration") - -// Get takes name of the globalConfiguration, and returns the corresponding globalConfiguration object, and an error if there is any. -func (c *FakeGlobalConfigurations) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.GlobalConfiguration, err error) { - emptyResult := &v1alpha1.GlobalConfiguration{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(globalconfigurationsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.GlobalConfiguration), err -} - -// List takes label and field selectors, and returns the list of GlobalConfigurations that match those selectors. -func (c *FakeGlobalConfigurations) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.GlobalConfigurationList, err error) { - emptyResult := &v1alpha1.GlobalConfigurationList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(globalconfigurationsResource, globalconfigurationsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.GlobalConfigurationList{ListMeta: obj.(*v1alpha1.GlobalConfigurationList).ListMeta} - for _, item := range obj.(*v1alpha1.GlobalConfigurationList).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 globalConfigurations. -func (c *FakeGlobalConfigurations) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(globalconfigurationsResource, c.ns, opts)) - -} - -// Create takes the representation of a globalConfiguration and creates it. Returns the server's representation of the globalConfiguration, and an error, if there is any. -func (c *FakeGlobalConfigurations) Create(ctx context.Context, globalConfiguration *v1alpha1.GlobalConfiguration, opts v1.CreateOptions) (result *v1alpha1.GlobalConfiguration, err error) { - emptyResult := &v1alpha1.GlobalConfiguration{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(globalconfigurationsResource, c.ns, globalConfiguration, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.GlobalConfiguration), err -} - -// Update takes the representation of a globalConfiguration and updates it. Returns the server's representation of the globalConfiguration, and an error, if there is any. -func (c *FakeGlobalConfigurations) Update(ctx context.Context, globalConfiguration *v1alpha1.GlobalConfiguration, opts v1.UpdateOptions) (result *v1alpha1.GlobalConfiguration, err error) { - emptyResult := &v1alpha1.GlobalConfiguration{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(globalconfigurationsResource, c.ns, globalConfiguration, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.GlobalConfiguration), err -} - -// Delete takes name of the globalConfiguration and deletes it. Returns an error if one occurs. -func (c *FakeGlobalConfigurations) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(globalconfigurationsResource, c.ns, name, opts), &v1alpha1.GlobalConfiguration{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGlobalConfigurations) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(globalconfigurationsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.GlobalConfigurationList{}) - return err -} - -// Patch applies the patch and returns the patched globalConfiguration. -func (c *FakeGlobalConfigurations) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.GlobalConfiguration, err error) { - emptyResult := &v1alpha1.GlobalConfiguration{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(globalconfigurationsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.GlobalConfiguration), err -} diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_policy.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_policy.go deleted file mode 100644 index 3c0ca2383a..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_policy.go +++ /dev/null @@ -1,118 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - "context" - - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - 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" -) - -// FakePolicies implements PolicyInterface -type FakePolicies struct { - Fake *FakeK8sV1alpha1 - ns string -} - -var policiesResource = v1alpha1.SchemeGroupVersion.WithResource("policies") - -var policiesKind = v1alpha1.SchemeGroupVersion.WithKind("Policy") - -// Get takes name of the policy, and returns the corresponding policy object, and an error if there is any. -func (c *FakePolicies) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Policy, err error) { - emptyResult := &v1alpha1.Policy{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(policiesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Policy), err -} - -// List takes label and field selectors, and returns the list of Policies that match those selectors. -func (c *FakePolicies) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.PolicyList, err error) { - emptyResult := &v1alpha1.PolicyList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(policiesResource, policiesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.PolicyList{ListMeta: obj.(*v1alpha1.PolicyList).ListMeta} - for _, item := range obj.(*v1alpha1.PolicyList).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 policies. -func (c *FakePolicies) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(policiesResource, c.ns, opts)) - -} - -// Create takes the representation of a policy and creates it. Returns the server's representation of the policy, and an error, if there is any. -func (c *FakePolicies) Create(ctx context.Context, policy *v1alpha1.Policy, opts v1.CreateOptions) (result *v1alpha1.Policy, err error) { - emptyResult := &v1alpha1.Policy{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(policiesResource, c.ns, policy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Policy), err -} - -// Update takes the representation of a policy and updates it. Returns the server's representation of the policy, and an error, if there is any. -func (c *FakePolicies) Update(ctx context.Context, policy *v1alpha1.Policy, opts v1.UpdateOptions) (result *v1alpha1.Policy, err error) { - emptyResult := &v1alpha1.Policy{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(policiesResource, c.ns, policy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Policy), err -} - -// Delete takes name of the policy and deletes it. Returns an error if one occurs. -func (c *FakePolicies) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(policiesResource, c.ns, name, opts), &v1alpha1.Policy{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakePolicies) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(policiesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.PolicyList{}) - return err -} - -// Patch applies the patch and returns the patched policy. -func (c *FakePolicies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Policy, err error) { - emptyResult := &v1alpha1.Policy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(policiesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Policy), err -} diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_transportserver.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_transportserver.go deleted file mode 100644 index 0e6a1d93d0..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_transportserver.go +++ /dev/null @@ -1,131 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - "context" - - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - 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" -) - -// FakeTransportServers implements TransportServerInterface -type FakeTransportServers struct { - Fake *FakeK8sV1alpha1 - ns string -} - -var transportserversResource = v1alpha1.SchemeGroupVersion.WithResource("transportservers") - -var transportserversKind = v1alpha1.SchemeGroupVersion.WithKind("TransportServer") - -// Get takes name of the transportServer, and returns the corresponding transportServer object, and an error if there is any. -func (c *FakeTransportServers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.TransportServer, err error) { - emptyResult := &v1alpha1.TransportServer{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(transportserversResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.TransportServer), err -} - -// List takes label and field selectors, and returns the list of TransportServers that match those selectors. -func (c *FakeTransportServers) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.TransportServerList, err error) { - emptyResult := &v1alpha1.TransportServerList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(transportserversResource, transportserversKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.TransportServerList{ListMeta: obj.(*v1alpha1.TransportServerList).ListMeta} - for _, item := range obj.(*v1alpha1.TransportServerList).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 transportServers. -func (c *FakeTransportServers) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(transportserversResource, c.ns, opts)) - -} - -// Create takes the representation of a transportServer and creates it. Returns the server's representation of the transportServer, and an error, if there is any. -func (c *FakeTransportServers) Create(ctx context.Context, transportServer *v1alpha1.TransportServer, opts v1.CreateOptions) (result *v1alpha1.TransportServer, err error) { - emptyResult := &v1alpha1.TransportServer{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(transportserversResource, c.ns, transportServer, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.TransportServer), err -} - -// Update takes the representation of a transportServer and updates it. Returns the server's representation of the transportServer, and an error, if there is any. -func (c *FakeTransportServers) Update(ctx context.Context, transportServer *v1alpha1.TransportServer, opts v1.UpdateOptions) (result *v1alpha1.TransportServer, err error) { - emptyResult := &v1alpha1.TransportServer{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(transportserversResource, c.ns, transportServer, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.TransportServer), 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 *FakeTransportServers) UpdateStatus(ctx context.Context, transportServer *v1alpha1.TransportServer, opts v1.UpdateOptions) (result *v1alpha1.TransportServer, err error) { - emptyResult := &v1alpha1.TransportServer{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(transportserversResource, "status", c.ns, transportServer, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.TransportServer), err -} - -// Delete takes name of the transportServer and deletes it. Returns an error if one occurs. -func (c *FakeTransportServers) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(transportserversResource, c.ns, name, opts), &v1alpha1.TransportServer{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeTransportServers) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(transportserversResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.TransportServerList{}) - return err -} - -// Patch applies the patch and returns the patched transportServer. -func (c *FakeTransportServers) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.TransportServer, err error) { - emptyResult := &v1alpha1.TransportServer{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(transportserversResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.TransportServer), err -} diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/generated_expansion.go deleted file mode 100644 index 80fc437593..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/generated_expansion.go +++ /dev/null @@ -1,9 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -type GlobalConfigurationExpansion interface{} - -type PolicyExpansion interface{} - -type TransportServerExpansion interface{} diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/globalconfiguration.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/globalconfiguration.go deleted file mode 100644 index 9dd6eb3495..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/globalconfiguration.go +++ /dev/null @@ -1,51 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" - 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" -) - -// GlobalConfigurationsGetter has a method to return a GlobalConfigurationInterface. -// A group's client should implement this interface. -type GlobalConfigurationsGetter interface { - GlobalConfigurations(namespace string) GlobalConfigurationInterface -} - -// GlobalConfigurationInterface has methods to work with GlobalConfiguration resources. -type GlobalConfigurationInterface interface { - Create(ctx context.Context, globalConfiguration *v1alpha1.GlobalConfiguration, opts v1.CreateOptions) (*v1alpha1.GlobalConfiguration, error) - Update(ctx context.Context, globalConfiguration *v1alpha1.GlobalConfiguration, opts v1.UpdateOptions) (*v1alpha1.GlobalConfiguration, 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.GlobalConfiguration, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.GlobalConfigurationList, 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.GlobalConfiguration, err error) - GlobalConfigurationExpansion -} - -// globalConfigurations implements GlobalConfigurationInterface -type globalConfigurations struct { - *gentype.ClientWithList[*v1alpha1.GlobalConfiguration, *v1alpha1.GlobalConfigurationList] -} - -// newGlobalConfigurations returns a GlobalConfigurations -func newGlobalConfigurations(c *K8sV1alpha1Client, namespace string) *globalConfigurations { - return &globalConfigurations{ - gentype.NewClientWithList[*v1alpha1.GlobalConfiguration, *v1alpha1.GlobalConfigurationList]( - "globalconfigurations", - c.RESTClient(), - scheme.ParameterCodec, - namespace, - func() *v1alpha1.GlobalConfiguration { return &v1alpha1.GlobalConfiguration{} }, - func() *v1alpha1.GlobalConfigurationList { return &v1alpha1.GlobalConfigurationList{} }), - } -} diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/policy.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/policy.go deleted file mode 100644 index 0563d4e44b..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/policy.go +++ /dev/null @@ -1,51 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" - 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" -) - -// PoliciesGetter has a method to return a PolicyInterface. -// A group's client should implement this interface. -type PoliciesGetter interface { - Policies(namespace string) PolicyInterface -} - -// PolicyInterface has methods to work with Policy resources. -type PolicyInterface interface { - Create(ctx context.Context, policy *v1alpha1.Policy, opts v1.CreateOptions) (*v1alpha1.Policy, error) - Update(ctx context.Context, policy *v1alpha1.Policy, opts v1.UpdateOptions) (*v1alpha1.Policy, 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.Policy, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.PolicyList, 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.Policy, err error) - PolicyExpansion -} - -// policies implements PolicyInterface -type policies struct { - *gentype.ClientWithList[*v1alpha1.Policy, *v1alpha1.PolicyList] -} - -// newPolicies returns a Policies -func newPolicies(c *K8sV1alpha1Client, namespace string) *policies { - return &policies{ - gentype.NewClientWithList[*v1alpha1.Policy, *v1alpha1.PolicyList]( - "policies", - c.RESTClient(), - scheme.ParameterCodec, - namespace, - func() *v1alpha1.Policy { return &v1alpha1.Policy{} }, - func() *v1alpha1.PolicyList { return &v1alpha1.PolicyList{} }), - } -} diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/transportserver.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/transportserver.go deleted file mode 100644 index 156e8f25d3..0000000000 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/transportserver.go +++ /dev/null @@ -1,53 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" - 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" -) - -// TransportServersGetter has a method to return a TransportServerInterface. -// A group's client should implement this interface. -type TransportServersGetter interface { - TransportServers(namespace string) TransportServerInterface -} - -// TransportServerInterface has methods to work with TransportServer resources. -type TransportServerInterface interface { - Create(ctx context.Context, transportServer *v1alpha1.TransportServer, opts v1.CreateOptions) (*v1alpha1.TransportServer, error) - Update(ctx context.Context, transportServer *v1alpha1.TransportServer, opts v1.UpdateOptions) (*v1alpha1.TransportServer, error) - // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, transportServer *v1alpha1.TransportServer, opts v1.UpdateOptions) (*v1alpha1.TransportServer, 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.TransportServer, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.TransportServerList, 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.TransportServer, err error) - TransportServerExpansion -} - -// transportServers implements TransportServerInterface -type transportServers struct { - *gentype.ClientWithList[*v1alpha1.TransportServer, *v1alpha1.TransportServerList] -} - -// newTransportServers returns a TransportServers -func newTransportServers(c *K8sV1alpha1Client, namespace string) *transportServers { - return &transportServers{ - gentype.NewClientWithList[*v1alpha1.TransportServer, *v1alpha1.TransportServerList]( - "transportservers", - c.RESTClient(), - scheme.ParameterCodec, - namespace, - func() *v1alpha1.TransportServer { return &v1alpha1.TransportServer{} }, - func() *v1alpha1.TransportServerList { return &v1alpha1.TransportServerList{} }), - } -} diff --git a/pkg/client/informers/externalversions/configuration/interface.go b/pkg/client/informers/externalversions/configuration/interface.go index 800727ffad..0ce17ea432 100644 --- a/pkg/client/informers/externalversions/configuration/interface.go +++ b/pkg/client/informers/externalversions/configuration/interface.go @@ -4,7 +4,6 @@ package configuration import ( v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/configuration/v1" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/configuration/v1alpha1" internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) @@ -12,8 +11,6 @@ import ( type Interface interface { // V1 provides access to shared informers for resources in V1. V1() v1.Interface - // V1alpha1 provides access to shared informers for resources in V1alpha1. - V1alpha1() v1alpha1.Interface } type group struct { @@ -31,8 +28,3 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList func (g *group) V1() v1.Interface { return v1.New(g.factory, g.namespace, g.tweakListOptions) } - -// V1alpha1 returns a new v1alpha1.Interface. -func (g *group) V1alpha1() v1alpha1.Interface { - return v1alpha1.New(g.factory, g.namespace, g.tweakListOptions) -} diff --git a/pkg/client/informers/externalversions/configuration/v1alpha1/globalconfiguration.go b/pkg/client/informers/externalversions/configuration/v1alpha1/globalconfiguration.go deleted file mode 100644 index 7c2da1c427..0000000000 --- a/pkg/client/informers/externalversions/configuration/v1alpha1/globalconfiguration.go +++ /dev/null @@ -1,74 +0,0 @@ -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - time "time" - - configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1alpha1" - 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" -) - -// GlobalConfigurationInformer provides access to a shared informer and lister for -// GlobalConfigurations. -type GlobalConfigurationInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1alpha1.GlobalConfigurationLister -} - -type globalConfigurationInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc - namespace string -} - -// NewGlobalConfigurationInformer constructs a new informer for GlobalConfiguration type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewGlobalConfigurationInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredGlobalConfigurationInformer(client, namespace, resyncPeriod, indexers, nil) -} - -// NewFilteredGlobalConfigurationInformer constructs a new informer for GlobalConfiguration type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredGlobalConfigurationInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.K8sV1alpha1().GlobalConfigurations(namespace).List(context.TODO(), options) - }, - WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.K8sV1alpha1().GlobalConfigurations(namespace).Watch(context.TODO(), options) - }, - }, - &configurationv1alpha1.GlobalConfiguration{}, - resyncPeriod, - indexers, - ) -} - -func (f *globalConfigurationInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredGlobalConfigurationInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *globalConfigurationInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&configurationv1alpha1.GlobalConfiguration{}, f.defaultInformer) -} - -func (f *globalConfigurationInformer) Lister() v1alpha1.GlobalConfigurationLister { - return v1alpha1.NewGlobalConfigurationLister(f.Informer().GetIndexer()) -} diff --git a/pkg/client/informers/externalversions/configuration/v1alpha1/interface.go b/pkg/client/informers/externalversions/configuration/v1alpha1/interface.go deleted file mode 100644 index b65ce74c68..0000000000 --- a/pkg/client/informers/externalversions/configuration/v1alpha1/interface.go +++ /dev/null @@ -1,43 +0,0 @@ -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" -) - -// Interface provides access to all the informers in this group version. -type Interface interface { - // GlobalConfigurations returns a GlobalConfigurationInformer. - GlobalConfigurations() GlobalConfigurationInformer - // Policies returns a PolicyInformer. - Policies() PolicyInformer - // TransportServers returns a TransportServerInformer. - TransportServers() TransportServerInformer -} - -type version struct { - factory internalinterfaces.SharedInformerFactory - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { - return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} -} - -// GlobalConfigurations returns a GlobalConfigurationInformer. -func (v *version) GlobalConfigurations() GlobalConfigurationInformer { - return &globalConfigurationInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} -} - -// Policies returns a PolicyInformer. -func (v *version) Policies() PolicyInformer { - return &policyInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} -} - -// TransportServers returns a TransportServerInformer. -func (v *version) TransportServers() TransportServerInformer { - return &transportServerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} -} diff --git a/pkg/client/informers/externalversions/configuration/v1alpha1/policy.go b/pkg/client/informers/externalversions/configuration/v1alpha1/policy.go deleted file mode 100644 index 8cb91c2189..0000000000 --- a/pkg/client/informers/externalversions/configuration/v1alpha1/policy.go +++ /dev/null @@ -1,74 +0,0 @@ -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - time "time" - - configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1alpha1" - 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" -) - -// PolicyInformer provides access to a shared informer and lister for -// Policies. -type PolicyInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1alpha1.PolicyLister -} - -type policyInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc - namespace string -} - -// NewPolicyInformer constructs a new informer for Policy type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewPolicyInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredPolicyInformer(client, namespace, resyncPeriod, indexers, nil) -} - -// NewFilteredPolicyInformer constructs a new informer for Policy type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredPolicyInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.K8sV1alpha1().Policies(namespace).List(context.TODO(), options) - }, - WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.K8sV1alpha1().Policies(namespace).Watch(context.TODO(), options) - }, - }, - &configurationv1alpha1.Policy{}, - resyncPeriod, - indexers, - ) -} - -func (f *policyInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredPolicyInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *policyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&configurationv1alpha1.Policy{}, f.defaultInformer) -} - -func (f *policyInformer) Lister() v1alpha1.PolicyLister { - return v1alpha1.NewPolicyLister(f.Informer().GetIndexer()) -} diff --git a/pkg/client/informers/externalversions/configuration/v1alpha1/transportserver.go b/pkg/client/informers/externalversions/configuration/v1alpha1/transportserver.go deleted file mode 100644 index a6dbdcd29e..0000000000 --- a/pkg/client/informers/externalversions/configuration/v1alpha1/transportserver.go +++ /dev/null @@ -1,74 +0,0 @@ -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - time "time" - - configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1alpha1" - 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" -) - -// TransportServerInformer provides access to a shared informer and lister for -// TransportServers. -type TransportServerInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1alpha1.TransportServerLister -} - -type transportServerInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc - namespace string -} - -// NewTransportServerInformer constructs a new informer for TransportServer type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewTransportServerInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredTransportServerInformer(client, namespace, resyncPeriod, indexers, nil) -} - -// NewFilteredTransportServerInformer constructs a new informer for TransportServer type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredTransportServerInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.K8sV1alpha1().TransportServers(namespace).List(context.TODO(), options) - }, - WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.K8sV1alpha1().TransportServers(namespace).Watch(context.TODO(), options) - }, - }, - &configurationv1alpha1.TransportServer{}, - resyncPeriod, - indexers, - ) -} - -func (f *transportServerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredTransportServerInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *transportServerInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&configurationv1alpha1.TransportServer{}, f.defaultInformer) -} - -func (f *transportServerInformer) Lister() v1alpha1.TransportServerLister { - return v1alpha1.NewTransportServerLister(f.Informer().GetIndexer()) -} diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 4165eab009..a9603456b3 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -6,7 +6,6 @@ import ( "fmt" configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -59,14 +58,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource case configurationv1.SchemeGroupVersion.WithResource("virtualserverroutes"): return &genericInformer{resource: resource.GroupResource(), informer: f.K8s().V1().VirtualServerRoutes().Informer()}, nil - // Group=k8s.nginx.org, Version=v1alpha1 - case v1alpha1.SchemeGroupVersion.WithResource("globalconfigurations"): - return &genericInformer{resource: resource.GroupResource(), informer: f.K8s().V1alpha1().GlobalConfigurations().Informer()}, nil - case v1alpha1.SchemeGroupVersion.WithResource("policies"): - return &genericInformer{resource: resource.GroupResource(), informer: f.K8s().V1alpha1().Policies().Informer()}, nil - case v1alpha1.SchemeGroupVersion.WithResource("transportservers"): - return &genericInformer{resource: resource.GroupResource(), informer: f.K8s().V1alpha1().TransportServers().Informer()}, nil - } return nil, fmt.Errorf("no informer found for %v", resource) diff --git a/pkg/client/listers/configuration/v1alpha1/expansion_generated.go b/pkg/client/listers/configuration/v1alpha1/expansion_generated.go deleted file mode 100644 index e92ce0c811..0000000000 --- a/pkg/client/listers/configuration/v1alpha1/expansion_generated.go +++ /dev/null @@ -1,27 +0,0 @@ -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -// GlobalConfigurationListerExpansion allows custom methods to be added to -// GlobalConfigurationLister. -type GlobalConfigurationListerExpansion interface{} - -// GlobalConfigurationNamespaceListerExpansion allows custom methods to be added to -// GlobalConfigurationNamespaceLister. -type GlobalConfigurationNamespaceListerExpansion interface{} - -// PolicyListerExpansion allows custom methods to be added to -// PolicyLister. -type PolicyListerExpansion interface{} - -// PolicyNamespaceListerExpansion allows custom methods to be added to -// PolicyNamespaceLister. -type PolicyNamespaceListerExpansion interface{} - -// TransportServerListerExpansion allows custom methods to be added to -// TransportServerLister. -type TransportServerListerExpansion interface{} - -// TransportServerNamespaceListerExpansion allows custom methods to be added to -// TransportServerNamespaceLister. -type TransportServerNamespaceListerExpansion interface{} diff --git a/pkg/client/listers/configuration/v1alpha1/globalconfiguration.go b/pkg/client/listers/configuration/v1alpha1/globalconfiguration.go deleted file mode 100644 index 4f25150865..0000000000 --- a/pkg/client/listers/configuration/v1alpha1/globalconfiguration.go +++ /dev/null @@ -1,54 +0,0 @@ -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" -) - -// GlobalConfigurationLister helps list GlobalConfigurations. -// All objects returned here must be treated as read-only. -type GlobalConfigurationLister interface { - // List lists all GlobalConfigurations in the indexer. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.GlobalConfiguration, err error) - // GlobalConfigurations returns an object that can list and get GlobalConfigurations. - GlobalConfigurations(namespace string) GlobalConfigurationNamespaceLister - GlobalConfigurationListerExpansion -} - -// globalConfigurationLister implements the GlobalConfigurationLister interface. -type globalConfigurationLister struct { - listers.ResourceIndexer[*v1alpha1.GlobalConfiguration] -} - -// NewGlobalConfigurationLister returns a new GlobalConfigurationLister. -func NewGlobalConfigurationLister(indexer cache.Indexer) GlobalConfigurationLister { - return &globalConfigurationLister{listers.New[*v1alpha1.GlobalConfiguration](indexer, v1alpha1.Resource("globalconfiguration"))} -} - -// GlobalConfigurations returns an object that can list and get GlobalConfigurations. -func (s *globalConfigurationLister) GlobalConfigurations(namespace string) GlobalConfigurationNamespaceLister { - return globalConfigurationNamespaceLister{listers.NewNamespaced[*v1alpha1.GlobalConfiguration](s.ResourceIndexer, namespace)} -} - -// GlobalConfigurationNamespaceLister helps list and get GlobalConfigurations. -// All objects returned here must be treated as read-only. -type GlobalConfigurationNamespaceLister interface { - // List lists all GlobalConfigurations in the indexer for a given namespace. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.GlobalConfiguration, err error) - // Get retrieves the GlobalConfiguration from the indexer for a given namespace and name. - // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha1.GlobalConfiguration, error) - GlobalConfigurationNamespaceListerExpansion -} - -// globalConfigurationNamespaceLister implements the GlobalConfigurationNamespaceLister -// interface. -type globalConfigurationNamespaceLister struct { - listers.ResourceIndexer[*v1alpha1.GlobalConfiguration] -} diff --git a/pkg/client/listers/configuration/v1alpha1/policy.go b/pkg/client/listers/configuration/v1alpha1/policy.go deleted file mode 100644 index a43388c2ac..0000000000 --- a/pkg/client/listers/configuration/v1alpha1/policy.go +++ /dev/null @@ -1,54 +0,0 @@ -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" -) - -// PolicyLister helps list Policies. -// All objects returned here must be treated as read-only. -type PolicyLister interface { - // List lists all Policies in the indexer. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.Policy, err error) - // Policies returns an object that can list and get Policies. - Policies(namespace string) PolicyNamespaceLister - PolicyListerExpansion -} - -// policyLister implements the PolicyLister interface. -type policyLister struct { - listers.ResourceIndexer[*v1alpha1.Policy] -} - -// NewPolicyLister returns a new PolicyLister. -func NewPolicyLister(indexer cache.Indexer) PolicyLister { - return &policyLister{listers.New[*v1alpha1.Policy](indexer, v1alpha1.Resource("policy"))} -} - -// Policies returns an object that can list and get Policies. -func (s *policyLister) Policies(namespace string) PolicyNamespaceLister { - return policyNamespaceLister{listers.NewNamespaced[*v1alpha1.Policy](s.ResourceIndexer, namespace)} -} - -// PolicyNamespaceLister helps list and get Policies. -// All objects returned here must be treated as read-only. -type PolicyNamespaceLister interface { - // List lists all Policies in the indexer for a given namespace. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.Policy, err error) - // Get retrieves the Policy from the indexer for a given namespace and name. - // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha1.Policy, error) - PolicyNamespaceListerExpansion -} - -// policyNamespaceLister implements the PolicyNamespaceLister -// interface. -type policyNamespaceLister struct { - listers.ResourceIndexer[*v1alpha1.Policy] -} diff --git a/pkg/client/listers/configuration/v1alpha1/transportserver.go b/pkg/client/listers/configuration/v1alpha1/transportserver.go deleted file mode 100644 index c4f2b07cac..0000000000 --- a/pkg/client/listers/configuration/v1alpha1/transportserver.go +++ /dev/null @@ -1,54 +0,0 @@ -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" -) - -// TransportServerLister helps list TransportServers. -// All objects returned here must be treated as read-only. -type TransportServerLister interface { - // List lists all TransportServers in the indexer. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.TransportServer, err error) - // TransportServers returns an object that can list and get TransportServers. - TransportServers(namespace string) TransportServerNamespaceLister - TransportServerListerExpansion -} - -// transportServerLister implements the TransportServerLister interface. -type transportServerLister struct { - listers.ResourceIndexer[*v1alpha1.TransportServer] -} - -// NewTransportServerLister returns a new TransportServerLister. -func NewTransportServerLister(indexer cache.Indexer) TransportServerLister { - return &transportServerLister{listers.New[*v1alpha1.TransportServer](indexer, v1alpha1.Resource("transportserver"))} -} - -// TransportServers returns an object that can list and get TransportServers. -func (s *transportServerLister) TransportServers(namespace string) TransportServerNamespaceLister { - return transportServerNamespaceLister{listers.NewNamespaced[*v1alpha1.TransportServer](s.ResourceIndexer, namespace)} -} - -// TransportServerNamespaceLister helps list and get TransportServers. -// All objects returned here must be treated as read-only. -type TransportServerNamespaceLister interface { - // List lists all TransportServers in the indexer for a given namespace. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.TransportServer, err error) - // Get retrieves the TransportServer from the indexer for a given namespace and name. - // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha1.TransportServer, error) - TransportServerNamespaceListerExpansion -} - -// transportServerNamespaceLister implements the TransportServerNamespaceLister -// interface. -type transportServerNamespaceLister struct { - listers.ResourceIndexer[*v1alpha1.TransportServer] -} diff --git a/tests/suite/utils/custom_resources_utils.py b/tests/suite/utils/custom_resources_utils.py index aaee0708d7..2d9ef2bf73 100644 --- a/tests/suite/utils/custom_resources_utils.py +++ b/tests/suite/utils/custom_resources_utils.py @@ -120,7 +120,7 @@ def create_resource_from_manifest(custom_objects: CustomObjectsApi, body, namesp raise ex -def read_custom_resource_v1alpha1(custom_objects: CustomObjectsApi, namespace, plural, name) -> object: +def read_custom_resource_v1(custom_objects: CustomObjectsApi, namespace, plural, name) -> object: """ Get CRD information (kubectl describe output)