Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Graduate TransportServer and GlobalConfiguration to v1 #4574

Merged
merged 13 commits into from
Nov 7, 2023
Merged

Graduate TransportServer and GlobalConfiguration to v1 #4574

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
208ed0c
Graduate TransportServer and GlobalConfiguration to v1
shaun-nx Oct 26, 2023
0ccb8f0
Merge branch 'main' into feat/graduate-ts-and-gc
shaun-nx Oct 26, 2023
77c2388
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 26, 2023
c124c49
Replace usage of read_custom_resource_v1alpha1 with read_custom_resource
shaun-nx Oct 26, 2023
0ef11d3
Revert settings.py
shaun-nx Oct 26, 2023
f815c5c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 26, 2023
e7a7186
Rename `patch_custom_resource_v1` to `patch_custom_resource`
shaun-nx Nov 1, 2023
9ce1e14
Merge branch 'main' into feat/graduate-ts-and-gc
shaun-nx Nov 1, 2023
2624c15
Merge branch 'main' into feat/graduate-ts-and-gc
shaun-nx Nov 1, 2023
4be9d42
Fix typo in apiVersion
shaun-nx Nov 2, 2023
be7162f
Merge branch 'main' into feat/graduate-ts-and-gc
shaun-nx Nov 2, 2023
b8cf4d3
Merge branch 'main' into feat/graduate-ts-and-gc
shaun-nx Nov 2, 2023
06509a7
Merge branch 'main' into feat/graduate-ts-and-gc
shaun-nx Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 40 additions & 1 deletion config/crd/bases/k8s.nginx.org_globalconfigurations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
singular: globalconfiguration
scope: Namespaced
versions:
- name: v1alpha1
- name: v1
schema:
openAPIV3Schema:
description: GlobalConfiguration defines the GlobalConfiguration resource.
Expand Down Expand Up @@ -55,3 +55,42 @@ 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
165 changes: 157 additions & 8 deletions config/crd/bases/k8s.nginx.org_transportservers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
name: v1
schema:
openAPIV3Schema:
description: TransportServer defines the TransportServer resource.
Expand All @@ -49,7 +49,7 @@ spec:
description: TransportServerSpec is the spec of the TransportServer resource.
properties:
action:
description: Action defines an action.
description: TransportServerAction defines an action.
properties:
pass:
type: string
Expand Down Expand Up @@ -77,7 +77,8 @@ spec:
streamSnippets:
type: string
tls:
description: TLS defines TLS configuration for a TransportServer.
description: TransportServerTLS defines TransportServerTLS configuration
for a TransportServer.
properties:
secret:
type: string
Expand All @@ -100,13 +101,13 @@ spec:
type: object
upstreams:
items:
description: Upstream defines an upstream.
description: TransportServerUpstream defines an upstream.
properties:
failTimeout:
type: string
healthCheck:
description: HealthCheck defines the parameters for active Upstream
HealthChecks.
description: TransportServerHealthCheck defines the parameters
for active Upstream HealthChecks.
properties:
enable:
type: boolean
Expand All @@ -117,8 +118,8 @@ spec:
jitter:
type: string
match:
description: Match defines the parameters of a custom health
check.
description: TransportServerMatch defines the parameters
of a custom health check.
properties:
expect:
type: string
Expand Down Expand Up @@ -163,3 +164,151 @@ 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:
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: {}
4 changes: 2 additions & 2 deletions config/crd/bases/k8s.nginx.org_virtualservers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ spec:
routing.
type: boolean
listener:
description: Listener references a custom http and/or https listener
defined in GlobalConfiguration.
description: VirtualServerListener references a custom http and/or
vepatel marked this conversation as resolved.
Show resolved Hide resolved
https listener defined in GlobalConfiguration.
properties:
http:
type: string
Expand Down
Loading
Loading