Merge pull request #397 from johnbieren/fix_rsc

johnbieren · web-flow · commit 896670944816 · 2024-03-05T13:11:41.000-05:00
fix: move default RSC to manager dir
diff --git a/api/v1alpha1/releaseserviceconfig_types.go b/api/v1alpha1/releaseserviceconfig_types.go
@@ -21,7 +21,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-const ReleaseServiceConfigResourceName string = "config"
+const ReleaseServiceConfigResourceName string = "release-service-config"
 
 // ReleaseServiceConfigSpec defines the desired state of ReleaseServiceConfig.
 type ReleaseServiceConfigSpec struct {
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -1,6 +1,7 @@
 resources:
 - manager.yaml
 - network_policy.yaml
+- release_service_config.yaml
 
 generatorOptions:
   disableNameSuffixHash: true
diff --git a/config/manager/release_service_config.yaml b/config/manager/release_service_config.yaml
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
@@ -2,7 +2,6 @@
 # used to generate the 'manifests/' directory in a bundle.
 resources:
 - bases/release-service.clusterserviceversion.yaml
-- release_service_config.yaml
 - ../default
 - ../samples
 - ../scorecard

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`22`	`22`	`)`
`23`	`23`
`24`		`-const ReleaseServiceConfigResourceName string = "config"`
	`24`	`+const ReleaseServiceConfigResourceName string = "release-service-config"`
`25`	`25`
`26`	`26`	`// ReleaseServiceConfigSpec defines the desired state of ReleaseServiceConfig.`
`27`	`27`	`type ReleaseServiceConfigSpec struct {`