This is an automated email from the ASF dual-hosted git repository.
robocanic pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/develop by this push:
new 4085134a refractor: refractor resource name (#1304)
4085134a is described below
commit 4085134a32c7820c0cd1bedd6e4b01e476d0e590
Author: robb <[email protected]>
AuthorDate: Sun Jul 20 21:04:27 2025 +0800
refractor: refractor resource name (#1304)
---
.../apis/mesh/v1alpha1/affinityroute_types.go | 26 +++++++++++-----------
.../apis/mesh/v1alpha1/application_types.go | 26 +++++++++++-----------
.../apis/mesh/v1alpha1/conditionroute_types.go | 26 +++++++++++-----------
.../apis/mesh/v1alpha1/dynamicconfig_types.go | 26 +++++++++++-----------
.../resource/apis/mesh/v1alpha1/instance_types.go | 26 +++++++++++-----------
.../resource/apis/mesh/v1alpha1/mapping_types.go | 26 +++++++++++-----------
.../resource/apis/mesh/v1alpha1/service_types.go | 26 +++++++++++-----------
.../resource/apis/mesh/v1alpha1/tagroute_types.go | 26 +++++++++++-----------
.../resource/apis/system/v1alpha1/config_types.go | 26 +++++++++++-----------
.../apis/system/v1alpha1/datasource_types.go | 26 +++++++++++-----------
.../resource/apis/system/v1alpha1/secret_types.go | 26 +++++++++++-----------
.../resource/apis/system/v1alpha1/zone_types.go | 26 +++++++++++-----------
.../apis/system/v1alpha1/zoneinsight_types.go | 26 +++++++++++-----------
tools/resource-gen/main.go | 6 ++---
14 files changed, 172 insertions(+), 172 deletions(-)
diff --git a/pkg/core/resource/apis/mesh/v1alpha1/affinityroute_types.go
b/pkg/core/resource/apis/mesh/v1alpha1/affinityroute_types.go
index 0d86c09a..3ac8bc57 100644
--- a/pkg/core/resource/apis/mesh/v1alpha1/affinityroute_types.go
+++ b/pkg/core/resource/apis/mesh/v1alpha1/affinityroute_types.go
@@ -32,7 +32,7 @@ import (
const AffinityRouteKind = "AffinityRoute"
-type AffinityRoute struct {
+type AffinityRouteResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type AffinityRoute struct {
// +kubebuilder:validation:Optional
Spec *meshproto.AffinityRoute `json:"spec,omitempty"`
// Status is the status of the Dubbo AffinityRoute resource.
- Status AffinityRouteStatus `json:"status,omitempty"`
+ Status AffinityRouteResourceStatus `json:"status,omitempty"`
}
-type AffinityRouteStatus struct {
+type AffinityRouteResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type AffinityRouteList struct {
+type AffinityRouteResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []AffinityRoute `json:"items"`
+ Items []AffinityRouteResource `json:"items"`
}
-func (r *AffinityRoute) GetKind() string {
+func (r *AffinityRouteResource) GetKind() string {
return r.Kind
}
-func (r *AffinityRoute) GetMesh() string {
+func (r *AffinityRouteResource) GetMesh() string {
return r.Mesh
}
-func (r *AffinityRoute) SetMesh(mesh string) {
+func (r *AffinityRouteResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *AffinityRoute) GetResourceKey() string {
+func (r *AffinityRouteResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *AffinityRoute) GetMeta() metav1.ObjectMeta {
+func (r *AffinityRouteResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *AffinityRoute) SetMeta(m metav1.ObjectMeta) {
+func (r *AffinityRouteResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *AffinityRoute) GetSpec() coremodel.ResourceSpec {
+func (r *AffinityRouteResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *AffinityRoute) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *AffinityRouteResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*meshproto.AffinityRoute); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/mesh/v1alpha1/application_types.go
b/pkg/core/resource/apis/mesh/v1alpha1/application_types.go
index 45589dd0..13c821b9 100644
--- a/pkg/core/resource/apis/mesh/v1alpha1/application_types.go
+++ b/pkg/core/resource/apis/mesh/v1alpha1/application_types.go
@@ -32,7 +32,7 @@ import (
const ApplicationKind = "Application"
-type Application struct {
+type ApplicationResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type Application struct {
// +kubebuilder:validation:Optional
Spec *meshproto.Application `json:"spec,omitempty"`
// Status is the status of the Dubbo Application resource.
- Status ApplicationStatus `json:"status,omitempty"`
+ Status ApplicationResourceStatus `json:"status,omitempty"`
}
-type ApplicationStatus struct {
+type ApplicationResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Cluster
-type ApplicationList struct {
+type ApplicationResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []Application `json:"items"`
+ Items []ApplicationResource `json:"items"`
}
-func (r *Application) GetKind() string {
+func (r *ApplicationResource) GetKind() string {
return r.Kind
}
-func (r *Application) GetMesh() string {
+func (r *ApplicationResource) GetMesh() string {
return r.Mesh
}
-func (r *Application) SetMesh(mesh string) {
+func (r *ApplicationResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *Application) GetResourceKey() string {
+func (r *ApplicationResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *Application) GetMeta() metav1.ObjectMeta {
+func (r *ApplicationResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *Application) SetMeta(m metav1.ObjectMeta) {
+func (r *ApplicationResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *Application) GetSpec() coremodel.ResourceSpec {
+func (r *ApplicationResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *Application) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *ApplicationResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*meshproto.Application); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/mesh/v1alpha1/conditionroute_types.go
b/pkg/core/resource/apis/mesh/v1alpha1/conditionroute_types.go
index 651e27a2..43e70709 100644
--- a/pkg/core/resource/apis/mesh/v1alpha1/conditionroute_types.go
+++ b/pkg/core/resource/apis/mesh/v1alpha1/conditionroute_types.go
@@ -32,7 +32,7 @@ import (
const ConditionRouteKind = "ConditionRoute"
-type ConditionRoute struct {
+type ConditionRouteResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type ConditionRoute struct {
// +kubebuilder:validation:Optional
Spec *meshproto.ConditionRoute `json:"spec,omitempty"`
// Status is the status of the Dubbo ConditionRoute resource.
- Status ConditionRouteStatus `json:"status,omitempty"`
+ Status ConditionRouteResourceStatus `json:"status,omitempty"`
}
-type ConditionRouteStatus struct {
+type ConditionRouteResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type ConditionRouteList struct {
+type ConditionRouteResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []ConditionRoute `json:"items"`
+ Items []ConditionRouteResource `json:"items"`
}
-func (r *ConditionRoute) GetKind() string {
+func (r *ConditionRouteResource) GetKind() string {
return r.Kind
}
-func (r *ConditionRoute) GetMesh() string {
+func (r *ConditionRouteResource) GetMesh() string {
return r.Mesh
}
-func (r *ConditionRoute) SetMesh(mesh string) {
+func (r *ConditionRouteResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *ConditionRoute) GetResourceKey() string {
+func (r *ConditionRouteResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *ConditionRoute) GetMeta() metav1.ObjectMeta {
+func (r *ConditionRouteResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *ConditionRoute) SetMeta(m metav1.ObjectMeta) {
+func (r *ConditionRouteResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *ConditionRoute) GetSpec() coremodel.ResourceSpec {
+func (r *ConditionRouteResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *ConditionRoute) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *ConditionRouteResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*meshproto.ConditionRoute); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/mesh/v1alpha1/dynamicconfig_types.go
b/pkg/core/resource/apis/mesh/v1alpha1/dynamicconfig_types.go
index 879433de..a639b8e7 100644
--- a/pkg/core/resource/apis/mesh/v1alpha1/dynamicconfig_types.go
+++ b/pkg/core/resource/apis/mesh/v1alpha1/dynamicconfig_types.go
@@ -32,7 +32,7 @@ import (
const DynamicConfigKind = "DynamicConfig"
-type DynamicConfig struct {
+type DynamicConfigResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type DynamicConfig struct {
// +kubebuilder:validation:Optional
Spec *meshproto.DynamicConfig `json:"spec,omitempty"`
// Status is the status of the Dubbo DynamicConfig resource.
- Status DynamicConfigStatus `json:"status,omitempty"`
+ Status DynamicConfigResourceStatus `json:"status,omitempty"`
}
-type DynamicConfigStatus struct {
+type DynamicConfigResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type DynamicConfigList struct {
+type DynamicConfigResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []DynamicConfig `json:"items"`
+ Items []DynamicConfigResource `json:"items"`
}
-func (r *DynamicConfig) GetKind() string {
+func (r *DynamicConfigResource) GetKind() string {
return r.Kind
}
-func (r *DynamicConfig) GetMesh() string {
+func (r *DynamicConfigResource) GetMesh() string {
return r.Mesh
}
-func (r *DynamicConfig) SetMesh(mesh string) {
+func (r *DynamicConfigResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *DynamicConfig) GetResourceKey() string {
+func (r *DynamicConfigResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *DynamicConfig) GetMeta() metav1.ObjectMeta {
+func (r *DynamicConfigResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *DynamicConfig) SetMeta(m metav1.ObjectMeta) {
+func (r *DynamicConfigResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *DynamicConfig) GetSpec() coremodel.ResourceSpec {
+func (r *DynamicConfigResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *DynamicConfig) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *DynamicConfigResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*meshproto.DynamicConfig); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/mesh/v1alpha1/instance_types.go
b/pkg/core/resource/apis/mesh/v1alpha1/instance_types.go
index e38cc702..05bd3f11 100644
--- a/pkg/core/resource/apis/mesh/v1alpha1/instance_types.go
+++ b/pkg/core/resource/apis/mesh/v1alpha1/instance_types.go
@@ -32,7 +32,7 @@ import (
const InstanceKind = "Instance"
-type Instance struct {
+type InstanceResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type Instance struct {
// +kubebuilder:validation:Optional
Spec *meshproto.Instance `json:"spec,omitempty"`
// Status is the status of the Dubbo Instance resource.
- Status InstanceStatus `json:"status,omitempty"`
+ Status InstanceResourceStatus `json:"status,omitempty"`
}
-type InstanceStatus struct {
+type InstanceResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Cluster
-type InstanceList struct {
+type InstanceResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []Instance `json:"items"`
+ Items []InstanceResource `json:"items"`
}
-func (r *Instance) GetKind() string {
+func (r *InstanceResource) GetKind() string {
return r.Kind
}
-func (r *Instance) GetMesh() string {
+func (r *InstanceResource) GetMesh() string {
return r.Mesh
}
-func (r *Instance) SetMesh(mesh string) {
+func (r *InstanceResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *Instance) GetResourceKey() string {
+func (r *InstanceResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *Instance) GetMeta() metav1.ObjectMeta {
+func (r *InstanceResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *Instance) SetMeta(m metav1.ObjectMeta) {
+func (r *InstanceResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *Instance) GetSpec() coremodel.ResourceSpec {
+func (r *InstanceResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *Instance) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *InstanceResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*meshproto.Instance); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/mesh/v1alpha1/mapping_types.go
b/pkg/core/resource/apis/mesh/v1alpha1/mapping_types.go
index 52596333..06b159d7 100644
--- a/pkg/core/resource/apis/mesh/v1alpha1/mapping_types.go
+++ b/pkg/core/resource/apis/mesh/v1alpha1/mapping_types.go
@@ -32,7 +32,7 @@ import (
const MappingKind = "Mapping"
-type Mapping struct {
+type MappingResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type Mapping struct {
// +kubebuilder:validation:Optional
Spec *meshproto.Mapping `json:"spec,omitempty"`
// Status is the status of the Dubbo Mapping resource.
- Status MappingStatus `json:"status,omitempty"`
+ Status MappingResourceStatus `json:"status,omitempty"`
}
-type MappingStatus struct {
+type MappingResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Cluster
-type MappingList struct {
+type MappingResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []Mapping `json:"items"`
+ Items []MappingResource `json:"items"`
}
-func (r *Mapping) GetKind() string {
+func (r *MappingResource) GetKind() string {
return r.Kind
}
-func (r *Mapping) GetMesh() string {
+func (r *MappingResource) GetMesh() string {
return r.Mesh
}
-func (r *Mapping) SetMesh(mesh string) {
+func (r *MappingResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *Mapping) GetResourceKey() string {
+func (r *MappingResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *Mapping) GetMeta() metav1.ObjectMeta {
+func (r *MappingResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *Mapping) SetMeta(m metav1.ObjectMeta) {
+func (r *MappingResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *Mapping) GetSpec() coremodel.ResourceSpec {
+func (r *MappingResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *Mapping) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *MappingResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*meshproto.Mapping); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/mesh/v1alpha1/service_types.go
b/pkg/core/resource/apis/mesh/v1alpha1/service_types.go
index 63004a46..e44661e3 100644
--- a/pkg/core/resource/apis/mesh/v1alpha1/service_types.go
+++ b/pkg/core/resource/apis/mesh/v1alpha1/service_types.go
@@ -32,7 +32,7 @@ import (
const ServiceKind = "Service"
-type Service struct {
+type ServiceResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type Service struct {
// +kubebuilder:validation:Optional
Spec *meshproto.Service `json:"spec,omitempty"`
// Status is the status of the Dubbo Service resource.
- Status ServiceStatus `json:"status,omitempty"`
+ Status ServiceResourceStatus `json:"status,omitempty"`
}
-type ServiceStatus struct {
+type ServiceResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Cluster
-type ServiceList struct {
+type ServiceResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []Service `json:"items"`
+ Items []ServiceResource `json:"items"`
}
-func (r *Service) GetKind() string {
+func (r *ServiceResource) GetKind() string {
return r.Kind
}
-func (r *Service) GetMesh() string {
+func (r *ServiceResource) GetMesh() string {
return r.Mesh
}
-func (r *Service) SetMesh(mesh string) {
+func (r *ServiceResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *Service) GetResourceKey() string {
+func (r *ServiceResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *Service) GetMeta() metav1.ObjectMeta {
+func (r *ServiceResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *Service) SetMeta(m metav1.ObjectMeta) {
+func (r *ServiceResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *Service) GetSpec() coremodel.ResourceSpec {
+func (r *ServiceResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *Service) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *ServiceResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*meshproto.Service); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/mesh/v1alpha1/tagroute_types.go
b/pkg/core/resource/apis/mesh/v1alpha1/tagroute_types.go
index 735a0113..e195f5e6 100644
--- a/pkg/core/resource/apis/mesh/v1alpha1/tagroute_types.go
+++ b/pkg/core/resource/apis/mesh/v1alpha1/tagroute_types.go
@@ -32,7 +32,7 @@ import (
const TagRouteKind = "TagRoute"
-type TagRoute struct {
+type TagRouteResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type TagRoute struct {
// +kubebuilder:validation:Optional
Spec *meshproto.TagRoute `json:"spec,omitempty"`
// Status is the status of the Dubbo TagRoute resource.
- Status TagRouteStatus `json:"status,omitempty"`
+ Status TagRouteResourceStatus `json:"status,omitempty"`
}
-type TagRouteStatus struct {
+type TagRouteResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type TagRouteList struct {
+type TagRouteResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []TagRoute `json:"items"`
+ Items []TagRouteResource `json:"items"`
}
-func (r *TagRoute) GetKind() string {
+func (r *TagRouteResource) GetKind() string {
return r.Kind
}
-func (r *TagRoute) GetMesh() string {
+func (r *TagRouteResource) GetMesh() string {
return r.Mesh
}
-func (r *TagRoute) SetMesh(mesh string) {
+func (r *TagRouteResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *TagRoute) GetResourceKey() string {
+func (r *TagRouteResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *TagRoute) GetMeta() metav1.ObjectMeta {
+func (r *TagRouteResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *TagRoute) SetMeta(m metav1.ObjectMeta) {
+func (r *TagRouteResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *TagRoute) GetSpec() coremodel.ResourceSpec {
+func (r *TagRouteResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *TagRoute) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *TagRouteResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*meshproto.TagRoute); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/system/v1alpha1/config_types.go
b/pkg/core/resource/apis/system/v1alpha1/config_types.go
index a64fdd73..fd57d660 100644
--- a/pkg/core/resource/apis/system/v1alpha1/config_types.go
+++ b/pkg/core/resource/apis/system/v1alpha1/config_types.go
@@ -32,7 +32,7 @@ import (
const ConfigKind = "Config"
-type Config struct {
+type ConfigResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type Config struct {
// +kubebuilder:validation:Optional
Spec *systemproto.Config `json:"spec,omitempty"`
// Status is the status of the Dubbo Config resource.
- Status ConfigStatus `json:"status,omitempty"`
+ Status ConfigResourceStatus `json:"status,omitempty"`
}
-type ConfigStatus struct {
+type ConfigResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type ConfigList struct {
+type ConfigResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []Config `json:"items"`
+ Items []ConfigResource `json:"items"`
}
-func (r *Config) GetKind() string {
+func (r *ConfigResource) GetKind() string {
return r.Kind
}
-func (r *Config) GetMesh() string {
+func (r *ConfigResource) GetMesh() string {
return r.Mesh
}
-func (r *Config) SetMesh(mesh string) {
+func (r *ConfigResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *Config) GetResourceKey() string {
+func (r *ConfigResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *Config) GetMeta() metav1.ObjectMeta {
+func (r *ConfigResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *Config) SetMeta(m metav1.ObjectMeta) {
+func (r *ConfigResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *Config) GetSpec() coremodel.ResourceSpec {
+func (r *ConfigResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *Config) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *ConfigResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*systemproto.Config); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/system/v1alpha1/datasource_types.go
b/pkg/core/resource/apis/system/v1alpha1/datasource_types.go
index d9eddf5d..87b962d0 100644
--- a/pkg/core/resource/apis/system/v1alpha1/datasource_types.go
+++ b/pkg/core/resource/apis/system/v1alpha1/datasource_types.go
@@ -32,7 +32,7 @@ import (
const DataSourceKind = "DataSource"
-type DataSource struct {
+type DataSourceResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type DataSource struct {
// +kubebuilder:validation:Optional
Spec *systemproto.DataSource `json:"spec,omitempty"`
// Status is the status of the Dubbo DataSource resource.
- Status DataSourceStatus `json:"status,omitempty"`
+ Status DataSourceResourceStatus `json:"status,omitempty"`
}
-type DataSourceStatus struct {
+type DataSourceResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type DataSourceList struct {
+type DataSourceResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []DataSource `json:"items"`
+ Items []DataSourceResource `json:"items"`
}
-func (r *DataSource) GetKind() string {
+func (r *DataSourceResource) GetKind() string {
return r.Kind
}
-func (r *DataSource) GetMesh() string {
+func (r *DataSourceResource) GetMesh() string {
return r.Mesh
}
-func (r *DataSource) SetMesh(mesh string) {
+func (r *DataSourceResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *DataSource) GetResourceKey() string {
+func (r *DataSourceResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *DataSource) GetMeta() metav1.ObjectMeta {
+func (r *DataSourceResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *DataSource) SetMeta(m metav1.ObjectMeta) {
+func (r *DataSourceResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *DataSource) GetSpec() coremodel.ResourceSpec {
+func (r *DataSourceResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *DataSource) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *DataSourceResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*systemproto.DataSource); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/system/v1alpha1/secret_types.go
b/pkg/core/resource/apis/system/v1alpha1/secret_types.go
index 4109be4a..dc2d9702 100644
--- a/pkg/core/resource/apis/system/v1alpha1/secret_types.go
+++ b/pkg/core/resource/apis/system/v1alpha1/secret_types.go
@@ -32,7 +32,7 @@ import (
const SecretKind = "Secret"
-type Secret struct {
+type SecretResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type Secret struct {
// +kubebuilder:validation:Optional
Spec *systemproto.Secret `json:"spec,omitempty"`
// Status is the status of the Dubbo Secret resource.
- Status SecretStatus `json:"status,omitempty"`
+ Status SecretResourceStatus `json:"status,omitempty"`
}
-type SecretStatus struct {
+type SecretResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type SecretList struct {
+type SecretResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []Secret `json:"items"`
+ Items []SecretResource `json:"items"`
}
-func (r *Secret) GetKind() string {
+func (r *SecretResource) GetKind() string {
return r.Kind
}
-func (r *Secret) GetMesh() string {
+func (r *SecretResource) GetMesh() string {
return r.Mesh
}
-func (r *Secret) SetMesh(mesh string) {
+func (r *SecretResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *Secret) GetResourceKey() string {
+func (r *SecretResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *Secret) GetMeta() metav1.ObjectMeta {
+func (r *SecretResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *Secret) SetMeta(m metav1.ObjectMeta) {
+func (r *SecretResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *Secret) GetSpec() coremodel.ResourceSpec {
+func (r *SecretResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *Secret) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *SecretResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*systemproto.Secret); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/system/v1alpha1/zone_types.go
b/pkg/core/resource/apis/system/v1alpha1/zone_types.go
index c55f4116..0f4aac30 100644
--- a/pkg/core/resource/apis/system/v1alpha1/zone_types.go
+++ b/pkg/core/resource/apis/system/v1alpha1/zone_types.go
@@ -32,7 +32,7 @@ import (
const ZoneKind = "Zone"
-type Zone struct {
+type ZoneResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type Zone struct {
// +kubebuilder:validation:Optional
Spec *systemproto.Zone `json:"spec,omitempty"`
// Status is the status of the Dubbo Zone resource.
- Status ZoneStatus `json:"status,omitempty"`
+ Status ZoneResourceStatus `json:"status,omitempty"`
}
-type ZoneStatus struct {
+type ZoneResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type ZoneList struct {
+type ZoneResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []Zone `json:"items"`
+ Items []ZoneResource `json:"items"`
}
-func (r *Zone) GetKind() string {
+func (r *ZoneResource) GetKind() string {
return r.Kind
}
-func (r *Zone) GetMesh() string {
+func (r *ZoneResource) GetMesh() string {
return r.Mesh
}
-func (r *Zone) SetMesh(mesh string) {
+func (r *ZoneResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *Zone) GetResourceKey() string {
+func (r *ZoneResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *Zone) GetMeta() metav1.ObjectMeta {
+func (r *ZoneResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *Zone) SetMeta(m metav1.ObjectMeta) {
+func (r *ZoneResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *Zone) GetSpec() coremodel.ResourceSpec {
+func (r *ZoneResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *Zone) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *ZoneResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*systemproto.Zone); ok {
r.Spec = spec
return nil
diff --git a/pkg/core/resource/apis/system/v1alpha1/zoneinsight_types.go
b/pkg/core/resource/apis/system/v1alpha1/zoneinsight_types.go
index 00eab490..d479206d 100644
--- a/pkg/core/resource/apis/system/v1alpha1/zoneinsight_types.go
+++ b/pkg/core/resource/apis/system/v1alpha1/zoneinsight_types.go
@@ -32,7 +32,7 @@ import (
const ZoneInsightKind = "ZoneInsight"
-type ZoneInsight struct {
+type ZoneInsightResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,50 +45,50 @@ type ZoneInsight struct {
// +kubebuilder:validation:Optional
Spec *systemproto.ZoneInsight `json:"spec,omitempty"`
// Status is the status of the Dubbo ZoneInsight resource.
- Status ZoneInsightStatus `json:"status,omitempty"`
+ Status ZoneInsightResourceStatus `json:"status,omitempty"`
}
-type ZoneInsightStatus struct {
+type ZoneInsightResourceStatus struct {
// define resource-specific status here
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced
-type ZoneInsightList struct {
+type ZoneInsightResourceList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []ZoneInsight `json:"items"`
+ Items []ZoneInsightResource `json:"items"`
}
-func (r *ZoneInsight) GetKind() string {
+func (r *ZoneInsightResource) GetKind() string {
return r.Kind
}
-func (r *ZoneInsight) GetMesh() string {
+func (r *ZoneInsightResource) GetMesh() string {
return r.Mesh
}
-func (r *ZoneInsight) SetMesh(mesh string) {
+func (r *ZoneInsightResource) SetMesh(mesh string) {
r.Mesh = mesh
}
-func (r *ZoneInsight) GetResourceKey() string {
+func (r *ZoneInsightResource) GetResourceKey() string {
return coremodel.BuildResourceKey(r.Mesh, r.Kind, r.Name)
}
-func (r *ZoneInsight) GetMeta() metav1.ObjectMeta {
+func (r *ZoneInsightResource) GetMeta() metav1.ObjectMeta {
return r.ObjectMeta
}
-func (r *ZoneInsight) SetMeta(m metav1.ObjectMeta) {
+func (r *ZoneInsightResource) SetMeta(m metav1.ObjectMeta) {
r.ObjectMeta = m
}
-func (r *ZoneInsight) GetSpec() coremodel.ResourceSpec {
+func (r *ZoneInsightResource) GetSpec() coremodel.ResourceSpec {
return r.Spec
}
-func (r *ZoneInsight) SetSpec(rs coremodel.ResourceSpec) error {
+func (r *ZoneInsightResource) SetSpec(rs coremodel.ResourceSpec) error {
if spec, ok := rs.(*systemproto.ZoneInsight); ok {
r.Spec = spec
return nil
diff --git a/tools/resource-gen/main.go b/tools/resource-gen/main.go
index 5647ce92..8c508629 100644
--- a/tools/resource-gen/main.go
+++ b/tools/resource-gen/main.go
@@ -88,7 +88,7 @@ type {{.ResourceType}}Resource struct {
Spec *{{$pkg}}.{{.ResourceType}} {{ $tk }}json:"spec,omitempty"{{ $tk
}}
{{- end}}
// Status is the status of the Dubbo {{.ResourceType}} resource.
- Status {{.ResourceType}}Status {{ $tk }}json:"status,omitempty"{{ $tk }}
+ Status {{.ResourceType}}ResourceStatus {{ $tk
}}json:"status,omitempty"{{ $tk }}
}
type {{.ResourceType}}ResourceStatus struct {
@@ -101,10 +101,10 @@ type {{.ResourceType}}ResourceStatus struct {
{{- else }}
// +kubebuilder:resource:scope=Namespaced
{{- end}}
-type {{.ResourceType}}List struct {
+type {{.ResourceType}}ResourceList struct {
metav1.TypeMeta {{ $tk }}json:",inline"{{ $tk }}
metav1.ListMeta {{ $tk }}json:"metadata,omitempty"{{ $tk }}
- Items []{{.ResourceType}} {{ $tk }}json:"items"{{ $tk }}
+ Items []{{.ResourceType}}Resource {{ $tk }}json:"items"{{ $tk
}}
}
func (r *{{.ResourceType}}Resource) GetKind() string {
