Merge pull request #238 from a-hilaly/rgs/scoped

barney-s · web-flow · commit d49e630ea6aa · 2025-01-29T17:22:56.000-08:00
make `ResourceGraphDefinition` cluster scoped
diff --git a/api/v1alpha1/types.go b/api/v1alpha1/types.go
@@ -141,7 +141,7 @@ type Dependency struct {
 // +kubebuilder:printcolumn:name="STATE",type=string,priority=0,JSONPath=`.status.state`
 // +kubebuilder:printcolumn:name="TOPOLOGICALORDER",type=string,priority=1,JSONPath=`.status.topologicalOrder`
 // +kubebuilder:printcolumn:name="AGE",type="date",priority=0,JSONPath=".metadata.creationTimestamp"
-// +kubebuilder:resource:shortName=rgd
+// +kubebuilder:resource:shortName=rgd,scope=Cluster
 
 // ResourceGraphDefinition is the Schema for the resourcegraphdefinitions API
 type ResourceGraphDefinition struct {
diff --git a/config/crd/bases/kro.run_resourcegraphdefinitions.yaml b/config/crd/bases/kro.run_resourcegraphdefinitions.yaml
@@ -14,7 +14,7 @@ spec:
     shortNames:
     - rgd
     singular: resourcegraphdefinition
-  scope: Namespaced
+  scope: Cluster
   versions:
   - additionalPrinterColumns:
     - jsonPath: .spec.schema.apiVersion
diff --git a/helm/crds/kro.run_resourcegraphdefinitions.yaml b/helm/crds/kro.run_resourcegraphdefinitions.yaml
@@ -14,7 +14,7 @@ spec:
     shortNames:
     - rgd
     singular: resourcegraphdefinition
-  scope: Namespaced
+  scope: Cluster
   versions:
   - additionalPrinterColumns:
     - jsonPath: .spec.schema.apiVersion
diff --git a/pkg/testutil/generator/resourcegraphdefinition.go b/pkg/testutil/generator/resourcegraphdefinition.go
@@ -40,13 +40,6 @@ func NewResourceGraphDefinition(name string, opts ...ResourceGraphDefinitionOpti
 	return rgd
 }
 
-// WithNamespace sets the namespace of the ResourceGraphDefinition
-func WithNamespace(namespace string) ResourceGraphDefinitionOption {
-	return func(rgd *krov1alpha1.ResourceGraphDefinition) {
-		rgd.Namespace = namespace
-	}
-}
-
 // WithSchema sets the definition and status of the ResourceGraphDefinition
 func WithSchema(kind, version string, spec, status map[string]interface{}) ResourceGraphDefinitionOption {
 	rawSpec, err := json.Marshal(spec)
diff --git a/test/integration/suites/ackekscluster/generator.go b/test/integration/suites/ackekscluster/generator.go
@@ -28,7 +28,6 @@ func eksCluster(
 	func(namespace, name, version string) *unstructured.Unstructured,
 ) {
 	resourcegraphdefinition := generator.NewResourceGraphDefinition(name,
-		generator.WithNamespace(namespace),
 		generator.WithSchema(
 			"EKSCluster", "v1alpha1",
 			map[string]interface{}{
diff --git a/test/integration/suites/core/conditional_test.go b/test/integration/suites/core/conditional_test.go
@@ -53,7 +53,6 @@ var _ = Describe("Conditions", func() {
 
 	It("should not create deployment, service, and configmap due to condition deploymentEnabled == false", func() {
 		rgd := generator.NewResourceGraphDefinition("test-conditions",
-			generator.WithNamespace(namespace),
 			generator.WithSchema(
 				"TestConditions", "v1alpha1",
 				map[string]interface{}{
@@ -202,8 +201,7 @@ var _ = Describe("Conditions", func() {
 		createdRGD := &krov1alpha1.ResourceGraphDefinition{}
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, createdRGD)
 			g.Expect(err).ToNot(HaveOccurred())
 
@@ -354,8 +352,7 @@ var _ = Describe("Conditions", func() {
 		// Verify ResourceGraphDefinition is deleted
 		Eventually(func() bool {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, &krov1alpha1.ResourceGraphDefinition{})
 			return errors.IsNotFound(err)
 		}, 20*time.Second, time.Second).Should(BeTrue())
diff --git a/test/integration/suites/core/crd_test.go b/test/integration/suites/core/crd_test.go
@@ -50,7 +50,6 @@ var _ = Describe("CRD", func() {
 		It("should create CRD when ResourceGraphDefinition is created", func() {
 			// Create a simple ResourceGraphDefinition
 			rgd := generator.NewResourceGraphDefinition("test-crd",
-				generator.WithNamespace(namespace),
 				generator.WithSchema(
 					"TestResource", "v1alpha1",
 					map[string]interface{}{
@@ -100,7 +99,6 @@ var _ = Describe("CRD", func() {
 		It("should update CRD when ResourceGraphDefinition is updated", func() {
 			// Create initial ResourceGraphDefinition
 			rgd := generator.NewResourceGraphDefinition("test-crd-update",
-				generator.WithNamespace(namespace),
 				generator.WithSchema(
 					"TestUpdate", "v1alpha1",
 					map[string]interface{}{
@@ -123,8 +121,7 @@ var _ = Describe("CRD", func() {
 			// Update ResourceGraphDefinition with new fields
 			Eventually(func(g Gomega) {
 				err := env.Client.Get(ctx, types.NamespacedName{
-					Name:      rgd.Name,
-					Namespace: namespace,
+					Name: rgd.Name,
 				}, rgd)
 				g.Expect(err).ToNot(HaveOccurred())
 
@@ -154,7 +151,6 @@ var _ = Describe("CRD", func() {
 		It("should delete CRD when ResourceGraphDefinition is deleted", func() {
 			// Create ResourceGraphDefinition
 			rgd := generator.NewResourceGraphDefinition("test-crd-delete",
-				generator.WithNamespace(namespace),
 				generator.WithSchema(
 					"TestDelete", "v1alpha1",
 					map[string]interface{}{
diff --git a/test/integration/suites/core/lifecycle_test.go b/test/integration/suites/core/lifecycle_test.go
@@ -47,7 +47,6 @@ var _ = Describe("Update", func() {
 
 		// Create ResourceGraphDefinition for a simple deployment service
 		rgd := generator.NewResourceGraphDefinition("test-update",
-			generator.WithNamespace(namespace),
 			generator.WithSchema(
 				"TestUpdate", "v1alpha1",
 				map[string]interface{}{
@@ -100,8 +99,7 @@ var _ = Describe("Update", func() {
 		createdRGD := &krov1alpha1.ResourceGraphDefinition{}
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, createdRGD)
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(createdRGD.Status.State).To(Equal(krov1alpha1.ResourceGraphDefinitionStateActive))
diff --git a/test/integration/suites/core/readiness_test.go b/test/integration/suites/core/readiness_test.go
@@ -54,7 +54,6 @@ var _ = Describe("Readiness", func() {
 	It(`should wait for deployment to have deployment.spec.replicas 
 		== deployment.status.availableReplicas before creating service`, func() {
 		rgd := generator.NewResourceGraphDefinition("test-readiness",
-			generator.WithNamespace(namespace),
 			generator.WithSchema(
 				"TestReadiness", "v1alpha1",
 				map[string]interface{}{
@@ -143,8 +142,7 @@ var _ = Describe("Readiness", func() {
 		createdRGD := &krov1alpha1.ResourceGraphDefinition{}
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, createdRGD)
 			g.Expect(err).ToNot(HaveOccurred())
 
@@ -286,8 +284,7 @@ var _ = Describe("Readiness", func() {
 		// Verify ResourceGraphDefinition is deleted
 		Eventually(func() bool {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, &krov1alpha1.ResourceGraphDefinition{})
 			return errors.IsNotFound(err)
 		}, 20*time.Second, time.Second).Should(BeTrue())
diff --git a/test/integration/suites/core/recover_test.go b/test/integration/suites/core/recover_test.go
@@ -53,7 +53,6 @@ var _ = Describe("Recovery", func() {
 	It("should recover from invalid state and use latest valid configuration", func() {
 		// Create initial valid ResourceGraphDefinition
 		rgd := generator.NewResourceGraphDefinition("test-recovery",
-			generator.WithNamespace(namespace),
 			generator.WithSchema(
 				"TestRecovery", "v1alpha1",
 				map[string]interface{}{
@@ -81,8 +80,7 @@ var _ = Describe("Recovery", func() {
 		// Verify initial ResourceGraphDefinition becomes active
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, rgd)
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(rgd.Status.State).To(Equal(krov1alpha1.ResourceGraphDefinitionStateActive))
@@ -91,8 +89,7 @@ var _ = Describe("Recovery", func() {
 		// Update to invalid state with a cyclic dependency
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, rgd)
 			g.Expect(err).ToNot(HaveOccurred())
 
@@ -127,8 +124,7 @@ var _ = Describe("Recovery", func() {
 		// Verify ResourceGraphDefinition becomes inactive
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, rgd)
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(rgd.Status.State).To(Equal(krov1alpha1.ResourceGraphDefinitionStateInactive))
@@ -137,8 +133,7 @@ var _ = Describe("Recovery", func() {
 		// Update to new valid state with different configuration
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, rgd)
 			g.Expect(err).ToNot(HaveOccurred())
 
@@ -191,8 +186,7 @@ var _ = Describe("Recovery", func() {
 		// Verify ResourceGraphDefinition becomes active again
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, rgd)
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(rgd.Status.State).To(Equal(krov1alpha1.ResourceGraphDefinitionStateActive))
@@ -248,8 +242,7 @@ var _ = Describe("Recovery", func() {
 		// Verify ResourceGraphDefinition is deleted
 		Eventually(func() bool {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, &krov1alpha1.ResourceGraphDefinition{})
 			return errors.IsNotFound(err)
 		}, 20*time.Second, time.Second).Should(BeTrue())
diff --git a/test/integration/suites/core/status_test.go b/test/integration/suites/core/status_test.go
@@ -48,7 +48,6 @@ var _ = Describe("Status", func() {
 
 	It("should have correct conditions when ResourceGraphDefinition is created", func() {
 		rgd := generator.NewResourceGraphDefinition("test-status",
-			generator.WithNamespace(namespace),
 			generator.WithSchema(
 				"TestStatus", "v1alpha1",
 				map[string]interface{}{
@@ -70,8 +69,7 @@ var _ = Describe("Status", func() {
 		// Verify ResourceGraphDefinition status
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, rgd)
 			g.Expect(err).ToNot(HaveOccurred())
 
@@ -88,7 +86,6 @@ var _ = Describe("Status", func() {
 
 	It("should reflect failure conditions when definition is invalid", func() {
 		rgd := generator.NewResourceGraphDefinition("test-status-fail",
-			generator.WithNamespace(namespace),
 			generator.WithSchema(
 				"TestStatusFail", "v1alpha1",
 				map[string]interface{}{
@@ -102,8 +99,7 @@ var _ = Describe("Status", func() {
 
 		Eventually(func(g Gomega) {
 			err := env.Client.Get(ctx, types.NamespacedName{
-				Name:      rgd.Name,
-				Namespace: namespace,
+				Name: rgd.Name,
 			}, rgd)
 			g.Expect(err).ToNot(HaveOccurred())
 
diff --git a/test/integration/suites/core/topology_test.go b/test/integration/suites/core/topology_test.go
@@ -48,7 +48,6 @@ var _ = Describe("Topology", func() {
 
 	It("should correctly order AWS resources in dependency graph", func() {
 		rgd := generator.NewResourceGraphDefinition("test-topology",
-			generator.WithNamespace(namespace),
 			generator.WithSchema(
 				"TestTopology", "v1alpha1",
 				map[string]interface{}{
@@ -172,7 +171,6 @@ var _ = Describe("Topology", func() {
 
 	It("should detect cyclic dependencies in AWS resource definitions", func() {
 		rgd := generator.NewResourceGraphDefinition("test-topology-cyclic",
-			generator.WithNamespace(namespace),
 			generator.WithSchema(
 				"TestTopologyCyclic", "v1alpha1",
 				map[string]interface{}{
diff --git a/test/integration/suites/core/validation_test.go b/test/integration/suites/core/validation_test.go
diff --git a/test/integration/suites/deploymentservice/generator.go b/test/integration/suites/deploymentservice/generator.go
diff --git a/test/integration/suites/deploymentservice/suite_test.go b/test/integration/suites/deploymentservice/suite_test.go
diff --git a/test/integration/suites/networkingstack/generator.go b/test/integration/suites/networkingstack/generator.go
diff --git a/test/integration/suites/networkingstack/suite_test.go b/test/integration/suites/networkingstack/suite_test.go
