shaba/traefik
1
0
Fork 0
mirror of https://github.com/containous/traefik.git synced 2025-01-22 22:03:51 +03:00
Code Releases Activity

add printable column and fix invalid CEL rule

Browse Source
This commit is contained in:
Michel Loiseleur 2024-08-19 12:30:57 +02:00
parent c11bf24789
commit 69b63fb420
Failed to extract signature
14 changed files with 127 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
View File

@ -14,7 +14,17 @@ spec:
singular: ingressroute singular: ingressroute
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
- jsonPath: .spec.routes[*].match
name: Rule
type: string
- jsonPath: .spec.routes[*].middlewares[*].name
name: Middlewares
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRoute is the CRD implementation of a Traefik HTTP Router. description: IngressRoute is the CRD implementation of a Traefik HTTP Router.
@ -238,9 +248,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -344,6 +351,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -360,7 +368,11 @@ spec:
singular: ingressroutetcp singular: ingressroutetcp
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRouteTCP is the CRD implementation of a Traefik TCP Router. description: IngressRouteTCP is the CRD implementation of a Traefik TCP Router.
@ -604,6 +616,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -620,7 +633,11 @@ spec:
singular: ingressrouteudp singular: ingressrouteudp
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRouteUDP is a CRD implementation of a Traefik UDP Router. description: IngressRouteUDP is a CRD implementation of a Traefik UDP Router.
@ -718,6 +735,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -1141,9 +1159,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -2077,7 +2092,11 @@ spec:
singular: serverstransport singular: serverstransport
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.serverName
name: ServerName
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: |- description: |-
@ -2210,6 +2229,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -2226,7 +2246,14 @@ spec:
singular: tlsoption singular: tlsoption
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.minVersion
name: MinVersion
type: string
- jsonPath: .spec.maxVersion
name: MaxVersion
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: |- description: |-
@ -2344,6 +2371,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -2648,9 +2676,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -2771,9 +2796,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -2912,9 +2934,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object

16
docs/content/reference/dynamic-configuration/traefik.io_ingressroutes.yaml
View File

@ -14,7 +14,17 @@ spec:
singular: ingressroute singular: ingressroute
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
- jsonPath: .spec.routes[*].match
name: Rule
type: string
- jsonPath: .spec.routes[*].middlewares[*].name
name: Middlewares
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRoute is the CRD implementation of a Traefik HTTP Router. description: IngressRoute is the CRD implementation of a Traefik HTTP Router.
@ -238,9 +248,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -344,3 +351,4 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}

7
docs/content/reference/dynamic-configuration/traefik.io_ingressroutetcps.yaml
View File

@ -14,7 +14,11 @@ spec:
singular: ingressroutetcp singular: ingressroutetcp
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRouteTCP is the CRD implementation of a Traefik TCP Router. description: IngressRouteTCP is the CRD implementation of a Traefik TCP Router.
@ -258,3 +262,4 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}

7
docs/content/reference/dynamic-configuration/traefik.io_ingressrouteudps.yaml
View File

@ -14,7 +14,11 @@ spec:
singular: ingressrouteudp singular: ingressrouteudp
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRouteUDP is a CRD implementation of a Traefik UDP Router. description: IngressRouteUDP is a CRD implementation of a Traefik UDP Router.
@ -112,3 +116,4 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}

3
docs/content/reference/dynamic-configuration/traefik.io_middlewares.yaml
View File

@ -421,9 +421,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object

7
docs/content/reference/dynamic-configuration/traefik.io_serverstransports.yaml
View File

@ -14,7 +14,11 @@ spec:
singular: serverstransport singular: serverstransport
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.serverName
name: ServerName
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: |- description: |-
@ -147,3 +151,4 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}

10
docs/content/reference/dynamic-configuration/traefik.io_tlsoptions.yaml
View File

@ -14,7 +14,14 @@ spec:
singular: tlsoption singular: tlsoption
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.minVersion
name: MinVersion
type: string
- jsonPath: .spec.maxVersion
name: MaxVersion
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: |- description: |-
@ -132,3 +139,4 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}

9
docs/content/reference/dynamic-configuration/traefik.io_traefikservices.yaml
View File

@ -197,9 +197,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -320,9 +317,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -461,9 +455,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object

59
integration/fixtures/k8s/01-traefik-crd.yml
View File

@ -14,7 +14,17 @@ spec:
singular: ingressroute singular: ingressroute
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
- jsonPath: .spec.routes[*].match
name: Rule
type: string
- jsonPath: .spec.routes[*].middlewares[*].name
name: Middlewares
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRoute is the CRD implementation of a Traefik HTTP Router. description: IngressRoute is the CRD implementation of a Traefik HTTP Router.
@ -238,9 +248,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -344,6 +351,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -360,7 +368,11 @@ spec:
singular: ingressroutetcp singular: ingressroutetcp
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRouteTCP is the CRD implementation of a Traefik TCP Router. description: IngressRouteTCP is the CRD implementation of a Traefik TCP Router.
@ -604,6 +616,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -620,7 +633,11 @@ spec:
singular: ingressrouteudp singular: ingressrouteudp
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.entryPoints
name: EntryPoints
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: IngressRouteUDP is a CRD implementation of a Traefik UDP Router. description: IngressRouteUDP is a CRD implementation of a Traefik UDP Router.
@ -718,6 +735,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -1141,9 +1159,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -2077,7 +2092,11 @@ spec:
singular: serverstransport singular: serverstransport
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.serverName
name: ServerName
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: |- description: |-
@ -2210,6 +2229,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -2226,7 +2246,14 @@ spec:
singular: tlsoption singular: tlsoption
scope: Namespaced scope: Namespaced
versions: versions:
- name: v1alpha1 - additionalPrinterColumns:
- jsonPath: .spec.minVersion
name: MinVersion
type: string
- jsonPath: .spec.maxVersion
name: MaxVersion
type: string
name: v1alpha1
schema: schema:
openAPIV3Schema: openAPIV3Schema:
description: |- description: |-
@ -2344,6 +2371,7 @@ spec:
type: object type: object
served: true served: true
storage: true storage: true
subresources: {}
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
@ -2648,9 +2676,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -2771,9 +2796,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object
@ -2912,9 +2934,6 @@ spec:
example: 10 example: 10
minimum: 0 minimum: 0
type: integer type: integer
x-kubernetes-validations:
- message: weight can only be used on TraefikService
rule: self.kind == 'TraefikService'
required: required:
- name - name
type: object type: object

6
pkg/provider/kubernetes/crd/traefikio/v1alpha1/ingressroute.go
View File

@ -142,7 +142,6 @@ type LoadBalancerSpec struct {
ServersTransport string `json:"serversTransport,omitempty"` ServersTransport string `json:"serversTransport,omitempty"`
// Weight defines the weight and should only be specified when Name references a TraefikService object // Weight defines the weight and should only be specified when Name references a TraefikService object
// (and to be precise, one that embeds a Weighted Round Robin). // (and to be precise, one that embeds a Weighted Round Robin).
// +kubebuilder:validation:XValidation:message="weight can only be used on TraefikService",rule="self.kind == 'TraefikService'"
// +kubebuilder:validation:Minimum=0 // +kubebuilder:validation:Minimum=0
// +kubebuilder:example=10 // +kubebuilder:example=10
Weight *int `json:"weight,omitempty"` Weight *int `json:"weight,omitempty"`
@ -171,9 +170,14 @@ type MiddlewareRef struct {
// +genclient // +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:storageversion // +kubebuilder:storageversion
// +kubebuilder:printcolumn:name="EntryPoints",type=string,JSONPath=`.spec.entryPoints`
// +kubebuilder:printcolumn:name="Rule",type=string,JSONPath=`.spec.routes[*].match`
// +kubebuilder:printcolumn:name="Middlewares",type=string,JSONPath=`.spec.routes[*].middlewares[*].name`
// IngressRoute is the CRD implementation of a Traefik HTTP Router. // IngressRoute is the CRD implementation of a Traefik HTTP Router.
type IngressRoute struct { type IngressRoute struct {
// +kubebuilder:printcolumn:name="EntryPoints",type=string,JSONPath=`.`
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata

1
pkg/provider/kubernetes/crd/traefikio/v1alpha1/ingressroutetcp.go
View File

@ -111,6 +111,7 @@ type ServiceTCP struct {
// +genclient // +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:storageversion // +kubebuilder:storageversion
// +kubebuilder:printcolumn:name="EntryPoints",type=string,JSONPath=`.spec.entryPoints`
// IngressRouteTCP is the CRD implementation of a Traefik TCP Router. // IngressRouteTCP is the CRD implementation of a Traefik TCP Router.
type IngressRouteTCP struct { type IngressRouteTCP struct {

1
pkg/provider/kubernetes/crd/traefikio/v1alpha1/ingressrouteudp.go
View File

@ -53,6 +53,7 @@ type ServiceUDP struct {
// +genclient // +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:storageversion // +kubebuilder:storageversion
// +kubebuilder:printcolumn:name="EntryPoints",type=string,JSONPath=`.spec.entryPoints`
// IngressRouteUDP is a CRD implementation of a Traefik UDP Router. // IngressRouteUDP is a CRD implementation of a Traefik UDP Router.
type IngressRouteUDP struct { type IngressRouteUDP struct {

1
pkg/provider/kubernetes/crd/traefikio/v1alpha1/serverstransport.go
View File

@ -8,6 +8,7 @@ import (
// +genclient // +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:storageversion // +kubebuilder:storageversion
// +kubebuilder:printcolumn:name="ServerName",type=string,JSONPath=`.spec.serverName`
// ServersTransport is the CRD implementation of a ServersTransport. // ServersTransport is the CRD implementation of a ServersTransport.
// If no serversTransport is specified, the default@internal will be used. // If no serversTransport is specified, the default@internal will be used.

2
pkg/provider/kubernetes/crd/traefikio/v1alpha1/tlsoption.go
View File

@ -7,6 +7,8 @@ import (
// +genclient // +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:storageversion // +kubebuilder:storageversion
// +kubebuilder:printcolumn:name="MinVersion",type=string,JSONPath=`.spec.minVersion`
// +kubebuilder:printcolumn:name="MaxVersion",type=string,JSONPath=`.spec.maxVersion`
// TLSOption is the CRD implementation of a Traefik TLS Option, allowing to configure some parameters of the TLS connection. // TLSOption is the CRD implementation of a Traefik TLS Option, allowing to configure some parameters of the TLS connection.
// More info: https://doc.traefik.io/traefik/v2.11/https/tls/#tls-options // More info: https://doc.traefik.io/traefik/v2.11/https/tls/#tls-options