chore: add codegen

Makefile

@@ -314,6 +314,11 @@ controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessar
 $(CONTROLLER_GEN): $(LOCALBIN)
 	$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,$(CONTROLLER_TOOLS_VERSION))
 
+.PHONY: update-codegen
+update-codegen:
+	@echo "Updating codegen"
+	./scripts/update-codegen.sh
+
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download setup-envtest locally if necessary.
 $(ENVTEST): $(LOCALBIN)

api/v1alpha1/backendtrafficpolicy_types.go

@@ -21,6 +21,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // BackendTrafficPolicy defines configuration for traffic handling policies applied to backend services.
@@ -124,7 +125,3 @@ type BackendTrafficPolicyList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []BackendTrafficPolicy `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&BackendTrafficPolicy{}, &BackendTrafficPolicyList{})
-}

api/v1alpha1/consumer_types.go

@@ -22,6 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // Consumer defines configuration for a consumer.
@@ -89,7 +90,3 @@ type ConsumerList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Consumer `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&Consumer{}, &ConsumerList{})
-}

api/v1alpha1/gatewayproxy_types.go

@@ -168,7 +168,3 @@ type GatewayProxyPlugin struct {
 	// Config defines the plugin's configuration details.
 	Config apiextensionsv1.JSON `json:"config,omitempty"`
 }
-
-func init() {
-	SchemeBuilder.Register(&GatewayProxy{}, &GatewayProxyList{})
-}

api/v1alpha1/httproutepolicy_types.go

@@ -58,7 +58,3 @@ type HTTPRoutePolicyList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []HTTPRoutePolicy `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&HTTPRoutePolicy{}, &HTTPRoutePolicyList{})
-}

api/v1alpha1/pluginconfig_types.go

@@ -58,7 +58,3 @@ type Plugin struct {
 	// Config is plugin configuration details.
 	Config apiextensionsv1.JSON `json:"config,omitempty" yaml:"config,omitempty"`
 }
-
-func init() {
-	SchemeBuilder.Register(&PluginConfig{}, &PluginConfigList{})
-}

api/v2/apisixconsumer_types.go

@@ -22,40 +22,27 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// ApisixConsumerSpec defines the desired state of ApisixConsumer.
-type ApisixConsumerSpec struct {
-	// IngressClassName is the name of an IngressClass cluster resource.
-	// The controller uses this field to decide whether the resource should be managed.
-	IngressClassName string `json:"ingressClassName,omitempty" yaml:"ingressClassName,omitempty"`
-
-	// AuthParameter defines the authentication credentials and configuration for this consumer.
-	AuthParameter ApisixConsumerAuthParameter `json:"authParameter" yaml:"authParameter"`
-}
-
-// ApisixConsumerStatus defines the observed state of ApisixConsumer.
-type ApisixConsumerStatus = ApisixStatus
-
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:shortName=ac
-
-// ApisixConsumer defines configuration of a consumer and their authentication details.
+// ApisixConsumer is the Schema for the apisixconsumers API.
 type ApisixConsumer struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// ApisixConsumerSpec defines the consumer authentication configuration.
-	Spec   ApisixConsumerSpec   `json:"spec,omitempty"`
-	Status ApisixConsumerStatus `json:"status,omitempty"`
+	Spec   ApisixConsumerSpec `json:"spec,omitempty"`
+	Status ApisixStatus       `json:"status,omitempty"`
 }
 
-// +kubebuilder:object:root=true
+// ApisixConsumerSpec defines the desired state of ApisixConsumer.
+type ApisixConsumerSpec struct {
+	// IngressClassName is the name of an IngressClass cluster resource.
+	// The controller uses this field to decide whether the resource should be managed.
+	IngressClassName string `json:"ingressClassName,omitempty" yaml:"ingressClassName,omitempty"`
 
-// ApisixConsumerList contains a list of ApisixConsumer.
-type ApisixConsumerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ApisixConsumer `json:"items"`
+	// AuthParameter defines the authentication credentials and configuration for this consumer.
+	AuthParameter ApisixConsumerAuthParameter `json:"authParameter" yaml:"authParameter"`
 }
 
 type ApisixConsumerAuthParameter struct {
@@ -194,6 +181,11 @@ type ApisixConsumerLDAPAuthValue struct {
 	UserDN string `json:"user_dn" yaml:"user_dn"`
 }
 
-func init() {
-	SchemeBuilder.Register(&ApisixConsumer{}, &ApisixConsumerList{})
+// +kubebuilder:object:root=true
+
+// ApisixConsumerList contains a list of ApisixConsumer.
+type ApisixConsumerList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ApisixConsumer `json:"items"`
 }

api/v2/apisixglobalrule_types.go

@@ -21,31 +21,27 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// ApisixGlobalRuleSpec defines configuration for global plugins.
-type ApisixGlobalRuleSpec struct {
-	// IngressClassName is the name of an IngressClass cluster resource.
-	// The controller uses this field to decide whether the resource should be managed.
-	IngressClassName string `json:"ingressClassName,omitempty" yaml:"ingressClassName,omitempty"`
-	// Plugins contain a list of global plugins.
-	// +kubebuilder:validation:Required
-	Plugins []ApisixRoutePlugin `json:"plugins" yaml:"plugins"`
-}
-
-// ApisixGlobalRuleStatus defines the observed state of ApisixGlobalRule.
-type ApisixGlobalRuleStatus = ApisixStatus
-
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:shortName=agr
-
-// ApisixGlobalRule defines configuration for global plugins.
+// ApisixGlobalRule is the Schema for the apisixglobalrules API.
 type ApisixGlobalRule struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// ApisixGlobalRuleSpec defines the global plugin configuration.
-	Spec   ApisixGlobalRuleSpec   `json:"spec,omitempty"`
-	Status ApisixGlobalRuleStatus `json:"status,omitempty"`
+	Spec   ApisixGlobalRuleSpec `json:"spec,omitempty"`
+	Status ApisixStatus         `json:"status,omitempty"`
+}
+
+// ApisixGlobalRuleSpec defines the desired state of ApisixGlobalRule.
+type ApisixGlobalRuleSpec struct {
+	// IngressClassName is the name of an IngressClass cluster resource.
+	// The controller uses this field to decide whether the resource should be managed.
+	IngressClassName string `json:"ingressClassName,omitempty" yaml:"ingressClassName,omitempty"`
+	// Plugins contain a list of global plugins.
+	// +kubebuilder:validation:Required
+	Plugins []ApisixRoutePlugin `json:"plugins" yaml:"plugins"`
 }
 
 // +kubebuilder:object:root=true
@@ -56,7 +52,3 @@ type ApisixGlobalRuleList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ApisixGlobalRule `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&ApisixGlobalRule{}, &ApisixGlobalRuleList{})
-}