Revise api

Signed-off-by: Tamal Saha <[email protected]>
kmodules · Sep 24, 2023 · eb6b14d · eb6b14d
1 parent 0325693
commit eb6b14d
Show file tree

Hide file tree

Showing 19 changed files with 236 additions and 129 deletions.
diff --git a/apis/core/v1alpha1/openapi_generated.go b/apis/core/v1alpha1/openapi_generated.go
diff --git a/apis/core/v1alpha1/project_types.go b/apis/core/v1alpha1/project_types.go
@@ -18,7 +18,7 @@ package v1alpha1
 
 import (
 	kmapi "kmodules.xyz/client-go/api/v1"
-	"kmodules.xyz/resource-metadata/apis/meta/v1alpha1"
+	"kmodules.xyz/resource-metadata/apis/shared"
 
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,11 +33,11 @@ const (
 // ProjectSpec defines the desired state of Project
 type ProjectSpec struct {
 	// +kubebuilder:default=User
-	Type              ProjectType              `json:"type,omitempty"`
-	Namespaces        []string                 `json:"namespaces,omitempty"`
-	NamespaceSelector *metav1.LabelSelector    `json:"namespaceSelector,omitempty"`
-	Monitoring        *ProjectMonitoring       `json:"monitoring,omitempty"`
-	Presets           []v1alpha1.SourceLocator `json:"presets,omitempty"`
+	Type              ProjectType            `json:"type,omitempty"`
+	Namespaces        []string               `json:"namespaces,omitempty"`
+	NamespaceSelector *metav1.LabelSelector  `json:"namespaceSelector,omitempty"`
+	Monitoring        *ProjectMonitoring     `json:"monitoring,omitempty"`
+	Presets           []shared.SourceLocator `json:"presets,omitempty"`
 }
 
 type ProjectMonitoring struct {

diff --git a/apis/core/v1alpha1/zz_generated.deepcopy.go b/apis/core/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/management/v1alpha1/openapi_generated.go b/apis/management/v1alpha1/openapi_generated.go
diff --git a/apis/meta/v1alpha1/openapi_generated.go b/apis/meta/v1alpha1/openapi_generated.go
diff --git a/apis/meta/v1alpha1/renderdashboard_types.go b/apis/meta/v1alpha1/renderdashboard_types.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	kmapi "kmodules.xyz/client-go/api/v1"
+	"kmodules.xyz/resource-metadata/apis/shared"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -53,7 +53,7 @@ type RenderDashboardRequest struct {
 	Source *runtime.RawExtension `json:"source,omitempty"`
 
 	// +optional
-	SourceLocator *SourceLocator `json:"sourceLocator,omitempty"`
+	SourceLocator *shared.SourceLocator `json:"sourceLocator,omitempty"`
 
 	// +optional
 	Name string `json:"name,omitempty"`
@@ -62,13 +62,6 @@ type RenderDashboardRequest struct {
 	EmbeddedLink bool `json:"embeddedLink,omitempty"`
 }
 
-type SourceLocator struct {
-	// +optional
-	Resource kmapi.ResourceID `json:"resource"`
-	// +optional
-	Ref kmapi.ObjectReference `json:"ref"`
-}
-
 type RenderDashboardResponse struct {
 	Dashboards []DashboardResponse `json:"dashboards"`
 }

diff --git a/apis/meta/v1alpha1/zz_generated.deepcopy.go b/apis/meta/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/shared/openapi_generated.go b/apis/shared/openapi_generated.go
diff --git a/apis/shared/types.go b/apis/shared/types.go
@@ -24,6 +24,13 @@ import (
 	helmshared "x-helm.dev/apimachinery/apis/shared"
 )
 
+type SourceLocator struct {
+	// +optional
+	Resource kmapi.ResourceID `json:"resource"`
+	// +optional
+	Ref kmapi.ObjectReference `json:"ref"`
+}
+
 type DeploymentParameters struct {
 	ProductID string                      `json:"productID,omitempty"`
 	PlanID    string                      `json:"planID,omitempty"`

diff --git a/apis/shared/zz_generated.deepcopy.go b/apis/shared/zz_generated.deepcopy.go