Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions api/v2/apisixconsumer_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type ApisixConsumerStatus = ApisixStatus

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:shortName=ac

// ApisixConsumer is the Schema for the apisixconsumers API.
type ApisixConsumer struct {
Expand Down
1 change: 1 addition & 0 deletions api/v2/apisixglobalrule_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ type ApisixGlobalRuleStatus = ApisixStatus

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:shortName=agr

// ApisixGlobalRule is the Schema for the apisixglobalrules API.
type ApisixGlobalRule struct {
Expand Down
1 change: 1 addition & 0 deletions api/v2/apisixpluginconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type ApisixPluginConfigStatus = ApisixStatus

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:shortName=apc

// ApisixPluginConfig is the Schema for the apisixpluginconfigs API.
type ApisixPluginConfig struct {
Expand Down
7 changes: 7 additions & 0 deletions api/v2/apisixroute_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ type ApisixRouteStatus = ApisixStatus

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:shortName=ar
// +kubebuilder:printcolumn:name="Hosts",type="string",JSONPath=".spec.http[].match.hosts",description="HTTP Hosts",priority=0
// +kubebuilder:printcolumn:name="URIs",type="string",JSONPath=".spec.http[].match.paths",description="HTTP Paths",priority=0
// +kubebuilder:printcolumn:name="Target Service (HTTP)",type="string",JSONPath=".spec.http[].backends[].serviceName",description="Backend Service for HTTP",priority=1
// +kubebuilder:printcolumn:name="Ingress Port (TCP)",type="integer",JSONPath=".spec.tcp[].match.ingressPort",description="TCP Ingress Port",priority=1
// +kubebuilder:printcolumn:name="Target Service (TCP)",type="string",JSONPath=".spec.tcp[].match.backend.serviceName",description="Backend Service for TCP",priority=1
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Creation time",priority=0

// ApisixRoute is the Schema for the apisixroutes API.
type ApisixRoute struct {
Expand Down
15 changes: 8 additions & 7 deletions api/v2/apisixtls_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ type ApisixTlsStatus = ApisixStatus
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:shortName=atls,path=apisixtlses
// +kubebuilder:printcolumn:name="SNIs",type=string,JSONPath=`.spec.hosts`
// +kubebuilder:printcolumn:name="Secret Name",type=string,JSONPath=`.spec.secret.name`
// +kubebuilder:printcolumn:name="Secret Namespace",type=string,JSONPath=`.spec.secret.namespace`
// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
// +kubebuilder:printcolumn:name="Client CA Secret Name",type=string,JSONPath=`.spec.client.ca.name`
// +kubebuilder:printcolumn:name="Client CA Secret Namespace",type=string,JSONPath=`.spec.client.ca.namespace`

// ApisixTls is the Schema for the apisixtls API.
type ApisixTls struct {
Expand All @@ -47,14 +53,9 @@ type ApisixTls struct {
Status ApisixTlsStatus `json:"status,omitempty"`
}

// ApisixTlsList contains a list of ApisixTls.
// +kubebuilder:object:root=true
// +kubebuilder:printcolumn:name="SNIs",type=string,JSONPath=`.spec.hosts`
// +kubebuilder:printcolumn:name="Secret Name",type=string,JSONPath=`.spec.secret.name`
// +kubebuilder:printcolumn:name="Secret Namespace",type=string,JSONPath=`.spec.secret.namespace`
// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
// +kubebuilder:printcolumn:name="Client CA Secret Name",type=string,JSONPath=`.spec.client.ca.name`
// +kubebuilder:printcolumn:name="Client CA Secret Namespace",type=string,JSONPath=`.spec.client.ca.namespace`

// ApisixTlsList contains a list of ApisixTls.
type ApisixTlsList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions api/v2/apisixupstream_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ type ApisixUpstreamStatus = ApisixStatus

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:shortName=au

// ApisixUpstream is the Schema for the apisixupstreams API.
type ApisixUpstream struct {
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/apisix.apache.org_apisixconsumers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: ApisixConsumer
listKind: ApisixConsumerList
plural: apisixconsumers
shortNames:
- ac
singular: apisixconsumer
scope: Namespaced
versions:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/apisix.apache.org_apisixglobalrules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: ApisixGlobalRule
listKind: ApisixGlobalRuleList
plural: apisixglobalrules
shortNames:
- agr
singular: apisixglobalrule
scope: Namespaced
versions:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/apisix.apache.org_apisixpluginconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: ApisixPluginConfig
listKind: ApisixPluginConfigList
plural: apisixpluginconfigs
shortNames:
- apc
singular: apisixpluginconfig
scope: Namespaced
versions:
Expand Down
32 changes: 31 additions & 1 deletion config/crd/bases/apisix.apache.org_apisixroutes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,40 @@ spec:
kind: ApisixRoute
listKind: ApisixRouteList
plural: apisixroutes
shortNames:
- ar
singular: apisixroute
scope: Namespaced
versions:
- name: v2
- additionalPrinterColumns:
- description: HTTP Hosts
jsonPath: .spec.http[].match.hosts
name: Hosts
type: string
- description: HTTP Paths
jsonPath: .spec.http[].match.paths
name: URIs
type: string
- description: Backend Service for HTTP
jsonPath: .spec.http[].backends[].serviceName
name: Target Service (HTTP)
priority: 1
type: string
- description: TCP Ingress Port
jsonPath: .spec.tcp[].match.ingressPort
name: Ingress Port (TCP)
priority: 1
type: integer
- description: Backend Service for TCP
jsonPath: .spec.tcp[].match.backend.serviceName
name: Target Service (TCP)
priority: 1
type: string
- description: Creation time
jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v2
schema:
openAPIV3Schema:
description: ApisixRoute is the Schema for the apisixroutes API.
Expand Down
21 changes: 20 additions & 1 deletion config/crd/bases/apisix.apache.org_apisixtlses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,26 @@ spec:
singular: apisixtls
scope: Namespaced
versions:
- name: v2
- additionalPrinterColumns:
- jsonPath: .spec.hosts
name: SNIs
type: string
- jsonPath: .spec.secret.name
name: Secret Name
type: string
- jsonPath: .spec.secret.namespace
name: Secret Namespace
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- jsonPath: .spec.client.ca.name
name: Client CA Secret Name
type: string
- jsonPath: .spec.client.ca.namespace
name: Client CA Secret Namespace
type: string
name: v2
schema:
openAPIV3Schema:
description: ApisixTls is the Schema for the apisixtls API.
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/apisix.apache.org_apisixupstreams.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ spec:
kind: ApisixUpstream
listKind: ApisixUpstreamList
plural: apisixupstreams
shortNames:
- au
singular: apisixupstream
scope: Namespaced
versions:
Expand Down
Loading