Skip to content

Commit 9e7cf85

Browse files
committed
feat: Update API group names and add new CRDs for Apisix resources
1 parent affb9ae commit 9e7cf85

40 files changed

+353
-686
lines changed

api/v2/groupversion_info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// Package v2 contains API Schema definitions for the apisix.apache.org v2 API group.
1414
// +kubebuilder:object:generate=true
15-
// +groupName=apisix.apache.org.github.com
15+
// +groupName=apisix.apache.org
1616
package v2
1717

1818
import (

config/crd/bases/apisix.apache.org.github.com_apisixglobalrules.yaml

Lines changed: 0 additions & 83 deletions
This file was deleted.

config/crd/bases/apisix.apache.org.github.com_apisixconsumers.yaml renamed to config/crd/bases/apisix.apache.org_apisixconsumers.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.17.2
7-
name: apisixconsumers.apisix.apache.org.github.com
7+
name: apisixconsumers.apisix.apache.org
88
spec:
9-
group: apisix.apache.org.github.com
9+
group: apisix.apache.org
1010
names:
1111
kind: ApisixConsumer
1212
listKind: ApisixConsumerList
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.17.2
7+
name: apisixglobalrules.apisix.apache.org
8+
spec:
9+
group: apisix.apache.org
10+
names:
11+
kind: ApisixGlobalRule
12+
listKind: ApisixGlobalRuleList
13+
plural: apisixglobalrules
14+
singular: apisixglobalrule
15+
scope: Namespaced
16+
versions:
17+
- name: v2
18+
schema:
19+
openAPIV3Schema:
20+
description: ApisixGlobalRule is the Schema for the apisixglobalrules API.
21+
properties:
22+
apiVersion:
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
28+
type: string
29+
kind:
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
36+
type: string
37+
metadata:
38+
type: object
39+
spec:
40+
description: ApisixGlobalRuleSpec defines the desired state of ApisixGlobalRule.
41+
properties:
42+
ingressClassName:
43+
description: |-
44+
IngressClassName is the name of an IngressClass cluster resource.
45+
The controller uses this field to decide whether the resource should be managed or not.
46+
type: string
47+
plugins:
48+
description: Plugins contains a list of ApisixRoutePlugin
49+
items:
50+
description: ApisixRoutePlugin represents an APISIX plugin.
51+
properties:
52+
config:
53+
additionalProperties:
54+
x-kubernetes-preserve-unknown-fields: true
55+
description: Plugin configuration.
56+
type: object
57+
enable:
58+
description: Whether this plugin is in use, default is true.
59+
type: boolean
60+
name:
61+
description: The plugin name.
62+
type: string
63+
secretRef:
64+
description: Plugin configuration secretRef.
65+
type: string
66+
required:
67+
- config
68+
- enable
69+
- name
70+
- secretRef
71+
type: object
72+
type: array
73+
required:
74+
- plugins
75+
type: object
76+
status:
77+
description: ApisixStatus is the status report for Apisix ingress Resources
78+
properties:
79+
conditions:
80+
items:
81+
description: Condition contains details for one aspect of the current
82+
state of this API Resource.
83+
properties:
84+
lastTransitionTime:
85+
description: |-
86+
lastTransitionTime is the last time the condition transitioned from one status to another.
87+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
88+
format: date-time
89+
type: string
90+
message:
91+
description: |-
92+
message is a human readable message indicating details about the transition.
93+
This may be an empty string.
94+
maxLength: 32768
95+
type: string
96+
observedGeneration:
97+
description: |-
98+
observedGeneration represents the .metadata.generation that the condition was set based upon.
99+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
100+
with respect to the current state of the instance.
101+
format: int64
102+
minimum: 0
103+
type: integer
104+
reason:
105+
description: |-
106+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
107+
Producers of specific condition types may define expected values and meanings for this field,
108+
and whether the values are considered a guaranteed API.
109+
The value should be a CamelCase string.
110+
This field may not be empty.
111+
maxLength: 1024
112+
minLength: 1
113+
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
114+
type: string
115+
status:
116+
description: status of the condition, one of True, False, Unknown.
117+
enum:
118+
- "True"
119+
- "False"
120+
- Unknown
121+
type: string
122+
type:
123+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
124+
maxLength: 316
125+
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
126+
type: string
127+
required:
128+
- lastTransitionTime
129+
- message
130+
- reason
131+
- status
132+
- type
133+
type: object
134+
type: array
135+
type: object
136+
type: object
137+
served: true
138+
storage: true
139+
subresources:
140+
status: {}

config/crd/bases/apisix.apache.org.github.com_apisixpluginconfigs.yaml renamed to config/crd/bases/apisix.apache.org_apisixpluginconfigs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.17.2
7-
name: apisixpluginconfigs.apisix.apache.org.github.com
7+
name: apisixpluginconfigs.apisix.apache.org
88
spec:
9-
group: apisix.apache.org.github.com
9+
group: apisix.apache.org
1010
names:
1111
kind: ApisixPluginConfig
1212
listKind: ApisixPluginConfigList

config/crd/bases/apisix.apache.org.github.com_apisixroutes.yaml renamed to config/crd/bases/apisix.apache.org_apisixroutes.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.17.2
7-
name: apisixroutes.apisix.apache.org.github.com
7+
name: apisixroutes.apisix.apache.org
88
spec:
9-
group: apisix.apache.org.github.com
9+
group: apisix.apache.org
1010
names:
1111
kind: ApisixRoute
1212
listKind: ApisixRouteList

config/crd/bases/apisix.apache.org.github.com_apisixtls.yaml renamed to config/crd/bases/apisix.apache.org_apisixtls.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.17.2
7-
name: apisixtls.apisix.apache.org.github.com
7+
name: apisixtls.apisix.apache.org
88
spec:
9-
group: apisix.apache.org.github.com
9+
group: apisix.apache.org
1010
names:
1111
kind: ApisixTls
1212
listKind: ApisixTlsList

config/crd/bases/apisix.apache.org.github.com_apisixupstreams.yaml renamed to config/crd/bases/apisix.apache.org_apisixupstreams.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.17.2
7-
name: apisixupstreams.apisix.apache.org.github.com
7+
name: apisixupstreams.apisix.apache.org
88
spec:
9-
group: apisix.apache.org.github.com
9+
group: apisix.apache.org
1010
names:
1111
kind: ApisixUpstream
1212
listKind: ApisixUpstreamList

config/rbac/apisixconsumer_admin_role.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

config/rbac/apisixconsumer_editor_role.yaml

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)