feat: support apisix global rule

api/adc/types.go

@@ -103,6 +103,13 @@ func (g *GlobalRule) DeepCopy() GlobalRule {
 	return GlobalRule(copied)
 }
 
+// +k8s:deepcopy-gen=true
+type GlobalRuleItem struct {
+	Metadata `json:",inline" yaml:",inline"`
+
+	Plugins Plugins `json:"plugins" yaml:"plugins"`
+}
+
 type PluginMetadata Plugins
 
 func (p *PluginMetadata) DeepCopy() PluginMetadata {

api/v2/apisixroute_types.go

@@ -130,10 +130,13 @@ type ApisixRoutePlugin struct {
 	// The plugin name.
 	Name string `json:"name" yaml:"name"`
 	// Whether this plugin is in use, default is true.
+	// +kubebuilder:default=true
 	Enable bool `json:"enable" yaml:"enable"`
 	// Plugin configuration.
+	// +kubebuilder:validation:Optional
 	Config ApisixRoutePluginConfig `json:"config" yaml:"config"`
 	// Plugin configuration secretRef.
+	// +kubebuilder:validation:Optional
 	SecretRef string `json:"secretRef" yaml:"secretRef"`
 }
 

api/v2/reason.go

@@ -0,0 +1,19 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v2
+
+type Reason string
+
+const (
+	ReasonSyncFailed Reason = "SyncFailed"
+)

config/crd/bases/apisix.apache.org_apisixglobalrules.yaml

@@ -55,6 +55,7 @@ spec:
                       description: Plugin configuration.
                       type: object
                     enable:
+                      default: true
                       description: Whether this plugin is in use, default is true.
                       type: boolean
                     name:
@@ -64,10 +65,8 @@ spec:
                       description: Plugin configuration secretRef.
                       type: string
                   required:
-                  - config
                   - enable
                   - name
-                  - secretRef
                   type: object
                 type: array
             required:

config/crd/bases/apisix.apache.org_apisixpluginconfigs.yaml

@@ -56,6 +56,7 @@ spec:
                       description: Plugin configuration.
                       type: object
                     enable:
+                      default: true
                       description: Whether this plugin is in use, default is true.
                       type: boolean
                     name:
@@ -65,10 +66,8 @@ spec:
                       description: Plugin configuration secretRef.
                       type: string
                   required:
-                  - config
                   - enable
                   - name
-                  - secretRef
                   type: object
                 type: array
             required:

config/crd/bases/apisix.apache.org_apisixroutes.yaml

@@ -255,6 +255,7 @@ spec:
                             description: Plugin configuration.
                             type: object
                           enable:
+                            default: true
                             description: Whether this plugin is in use, default is
                               true.
                             type: boolean
@@ -265,10 +266,8 @@ spec:
                             description: Plugin configuration secretRef.
                             type: string
                         required:
-                        - config
                         - enable
                         - name
-                        - secretRef
                         type: object
                       type: array
                     priority:
@@ -374,6 +373,7 @@ spec:
                             description: Plugin configuration.
                             type: object
                           enable:
+                            default: true
                             description: Whether this plugin is in use, default is
                               true.
                             type: boolean
@@ -384,10 +384,8 @@ spec:
                             description: Plugin configuration secretRef.
                             type: string
                         required:
-                        - config
                         - enable
                         - name
-                        - secretRef
                         type: object
                       type: array
                     protocol:

config/rbac/role.yaml

@@ -54,44 +54,6 @@ rules:
   verbs:
   - get
   - update
-- apiGroups:
-  - apisix.apache.org.github.com
-  resources:
-  - apisixconsumers
-  - apisixglobalrules
-  - apisixroutes
-  - apisixtls
-  - apisixupstreams
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - apisix.apache.org.github.com
-  resources:
-  - apisixconsumers/finalizers
-  - apisixglobalrules/finalizers
-  - apisixroutes/finalizers
-  - apisixtls/finalizers
-  - apisixupstreams/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - apisix.apache.org.github.com
-  resources:
-  - apisixconsumers/status
-  - apisixglobalrules/status
-  - apisixroutes/status
-  - apisixtls/status
-  - apisixupstreams/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - coordination.k8s.io
   resources:

config/samples/config.yaml

@@ -25,7 +25,7 @@ enable_http2: false                     # Whether to enable HTTP/2 for the serve
 probe_addr: ":8081"                     # The address the probe endpoint binds to.
                                         # The default value is ":8081".
 
-secure_metrics: ""                      # The secure metrics configuration.
+secure_metrics: false                      # The secure metrics configuration.
                                         # The default value is "" (empty).
 
 exec_adc_timeout: 15s                   # The timeout for the ADC to execute.

docs/crd/api.md

@@ -1632,6 +1632,8 @@ them if they are set on the port level.
 _Appears in:_
 - [ApisixUpstreamSpec](#apisixupstreamspec)
 
+
+
 #### UpstreamTimeout
 
 

go.mod

@@ -27,7 +27,6 @@ require (
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/net v0.28.0
-	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.15.4
 	k8s.io/api v0.31.1
@@ -202,6 +201,7 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
 	google.golang.org/grpc v1.66.2 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect

internal/controller/apisixconsumer_controller.go

@@ -32,10 +32,6 @@ type ApisixConsumerReconciler struct {
 	Log    logr.Logger
 }
 
-// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixconsumers,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixconsumers/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=apisix.apache.org.github.com,resources=apisixconsumers/finalizers,verbs=update
-
 // Reconcile FIXME: implement the reconcile logic (For now, it dose nothing other than directly accepting)
 func (r *ApisixConsumerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	r.Log.Info("reconcile", "request", req.NamespacedName)