Fix api (#365)

Signed-off-by: Tamal Saha <[email protected]>
kmodules · Sep 21, 2023 · ac68abc · ac68abc
1 parent 1608cca
commit ac68abc
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 190 deletions.
diff --git a/apis/core/fuzzer/fuzzer.go b/apis/core/fuzzer/fuzzer.go
@@ -18,7 +18,6 @@ package fuzzer
 
 import (
 	"kmodules.xyz/resource-metadata/apis/core/v1alpha1"
-	v1alpha12 "kmodules.xyz/resource-metadata/apis/meta/v1alpha1"
 
 	fuzz "github.com/google/gofuzz"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
@@ -31,9 +30,6 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 		func(s *v1alpha1.PodView, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again
 		},
-		func(s *v1alpha12.Project, c fuzz.Continue) {
-			c.FuzzNoCustom(s) // fuzz self without calling this function again
-		},
 		func(s *v1alpha1.ResourceSummary, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again
 		},

diff --git a/apis/meta/fuzzer/fuzzer.go b/apis/meta/fuzzer/fuzzer.go
@@ -29,5 +29,8 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 		func(s *v1alpha1.ResourceDescriptor, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again
 		},
+		func(s *v1alpha1.Project, c fuzz.Continue) {
+			c.FuzzNoCustom(s) // fuzz self without calling this function again
+		},
 	}
 }
diff --git a/apis/meta/v1alpha1/project_types.go b/apis/meta/v1alpha1/project_types.go
@@ -17,9 +17,9 @@ limitations under the License.
 package v1alpha1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
-	"kmodules.xyz/resource-metadata/apis/core/v1alpha1"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -83,7 +83,3 @@ type ProjectList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Project `json:"items"`
 }
-
-func init() {
-	v1alpha1.SchemeBuilder.Register(&Project{}, &ProjectList{})
-}
diff --git a/apis/meta/v1alpha1/register.go b/apis/meta/v1alpha1/register.go
@@ -50,6 +50,8 @@ func Resource(resource string) schema.GroupResource {
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&ChartPresetQuery{},
+		&Project{},
+		&ProjectList{},
 		&ResourceDescriptor{},
 		&ResourceDescriptorList{},
 		&ResourceTableDefinition{},

diff --git a/client/clientset/versioned/typed/core/v1alpha1/fake/fake_project.go b/client/clientset/versioned/typed/core/v1alpha1/fake/fake_project.go
diff --git a/crds/core.k8s.appscode.com_projects.yaml b/crds/core.k8s.appscode.com_projects.yaml
diff --git a/...e.k8s.appscode.com/v1alpha1/projects.yaml → ...a.k8s.appscode.com/v1alpha1/projects.yaml b/...e.k8s.appscode.com/v1alpha1/projects.yaml → ...a.k8s.appscode.com/v1alpha1/projects.yaml
@@ -3,14 +3,14 @@ kind: ResourceDescriptor
 metadata:
   creationTimestamp: null
   labels:
-    k8s.io/group: core.k8s.appscode.com
+    k8s.io/group: meta.k8s.appscode.com
     k8s.io/kind: Project
     k8s.io/resource: projects
     k8s.io/version: v1alpha1
-  name: core.k8s.appscode.com-v1alpha1-projects
+  name: meta.k8s.appscode.com-v1alpha1-projects
 spec:
   resource:
-    group: core.k8s.appscode.com
+    group: meta.k8s.appscode.com
     kind: Project
     name: projects
     scope: Cluster
@@ -44,6 +44,39 @@ spec:
         spec:
           description: ProjectSpec defines the desired state of Project
           properties:
+            monitoring:
+              properties:
+                alertmanagerRef:
+                  description: ObjectReference contains enough information to let you inspect or modify the referred object.
+                  properties:
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                  required:
+                  - name
+                  type: object
+                alertmanagerURL:
+                  type: string
+                grafanaURL:
+                  type: string
+                prometheusRef:
+                  description: ObjectReference contains enough information to let you inspect or modify the referred object.
+                  properties:
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                  required:
+                  - name
+                  type: object
+                prometheusURL:
+                  type: string
+              type: object
             namespaceSelector:
               description: A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.
               properties:
@@ -79,6 +112,42 @@ spec:
               items:
                 type: string
               type: array
+            presets:
+              items:
+                properties:
+                  ref:
+                    description: ObjectReference contains enough information to let you inspect or modify the referred object.
+                    properties:
+                      name:
+                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                        type: string
+                      namespace:
+                        description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                        type: string
+                    required:
+                    - name
+                    type: object
+                  resource:
+                    description: ResourceID identifies a resource
+                    properties:
+                      group:
+                        type: string
+                      kind:
+                        description: Kind is the serialized kind of the resource.  It is normally CamelCase and singular.
+                        type: string
+                      name:
+                        description: 'Name is the plural name of the resource to serve.  It must match the name of the CustomResourceDefinition-registration too: plural.group and it must be all lowercase.'
+                        type: string
+                      scope:
+                        description: ResourceScope is an enum defining the different scopes available to a custom resource
+                        type: string
+                      version:
+                        type: string
+                    required:
+                    - group
+                    type: object
+                type: object
+              type: array
             type:
               default: User
               enum:

diff --git a/...e.k8s.appscode.com/v1alpha1/projects.yaml → ...a.k8s.appscode.com/v1alpha1/projects.yaml b/...e.k8s.appscode.com/v1alpha1/projects.yaml → ...a.k8s.appscode.com/v1alpha1/projects.yaml
@@ -3,14 +3,14 @@ kind: ResourceEditor
 metadata:
   creationTimestamp: null
   labels:
-    k8s.io/group: core.k8s.appscode.com
+    k8s.io/group: meta.k8s.appscode.com
     k8s.io/kind: Project
     k8s.io/resource: projects
     k8s.io/version: v1alpha1
-  name: core.k8s.appscode.com-v1alpha1-projects
+  name: meta.k8s.appscode.com-v1alpha1-projects
 spec:
   resource:
-    group: core.k8s.appscode.com
+    group: meta.k8s.appscode.com
     kind: Project
     name: projects
     scope: Cluster

diff --git a/...e.k8s.appscode.com/v1alpha1/projects.yaml → ...a.k8s.appscode.com/v1alpha1/projects.yaml b/...e.k8s.appscode.com/v1alpha1/projects.yaml → ...a.k8s.appscode.com/v1alpha1/projects.yaml
@@ -3,15 +3,15 @@ kind: ResourceTableDefinition
 metadata:
   creationTimestamp: null
   labels:
-    k8s.io/group: core.k8s.appscode.com
+    k8s.io/group: meta.k8s.appscode.com
     k8s.io/kind: Project
     k8s.io/resource: projects
     k8s.io/version: v1alpha1
-  name: core.k8s.appscode.com-v1alpha1-projects
+  name: meta.k8s.appscode.com-v1alpha1-projects
 spec:
   defaultView: true
   resource:
-    group: core.k8s.appscode.com
+    group: meta.k8s.appscode.com
     kind: Project
     name: projects
     scope: Cluster