Rename CatalogSource to Catalog

cmd/manager/main.go

@@ -94,7 +94,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&corecontrollers.CatalogSourceReconciler{
+	if err = (&corecontrollers.CatalogReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Cfg:      mgr.GetConfig(),

config/crd/bases/catalogd.operatorframework.io_catalogsources.yaml → config/crd/bases/catalogd.operatorframework.io_catalogs.yaml

@@ -4,20 +4,20 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.11.4
-  name: catalogsources.catalogd.operatorframework.io
+  name: catalogs.catalogd.operatorframework.io
 spec:
   group: catalogd.operatorframework.io
   names:
-    kind: CatalogSource
-    listKind: CatalogSourceList
-    plural: catalogsources
-    singular: catalogsource
+    kind: Catalog
+    listKind: CatalogList
+    plural: catalogs
+    singular: catalog
   scope: Cluster
   versions:
   - name: v1beta1
     schema:
       openAPIV3Schema:
-        description: CatalogSource is the Schema for the catalogsources API
+        description: Catalog is the Schema for the Catalogs API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -32,7 +32,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: CatalogSourceSpec defines the desired state of CatalogSource
+            description: CatalogSpec defines the desired state of Catalog
             properties:
               image:
                 description: Image is the Catalog image that contains Operators' metadata
@@ -49,10 +49,10 @@ spec:
             - image
             type: object
           status:
-            description: CatalogSourceStatus defines the observed state of CatalogSource
+            description: CatalogStatus defines the observed state of Catalog
             properties:
               conditions:
-                description: Conditions store the status conditions of the CatalogSource
+                description: Conditions store the status conditions of the Catalog
                   instances
                 items:
                   description: "Condition contains details for one aspect of the current

config/crd/kustomization.yaml

@@ -4,5 +4,5 @@
 resources:
 - bases/catalogd.operatorframework.io_bundlemetadata.yaml
 - bases/catalogd.operatorframework.io_packages.yaml
-- bases/catalogd.operatorframework.io_catalogsources.yaml
+- bases/catalogd.operatorframework.io_catalogs.yaml
 #+kubebuilder:scaffold:crdkustomizeresource

config/rbac/role.yaml

@@ -42,7 +42,7 @@ rules:
 - apiGroups:
   - catalogd.operatorframework.io
   resources:
-  - catalogsources
+  - catalogs
   verbs:
   - create
   - delete
@@ -54,13 +54,13 @@ rules:
 - apiGroups:
   - catalogd.operatorframework.io
   resources:
-  - catalogsources/finalizers
+  - catalogs/finalizers
   verbs:
   - update
 - apiGroups:
   - catalogd.operatorframework.io
   resources:
-  - catalogsources/status
+  - catalogs/status
   verbs:
   - get
   - patch

config/samples/core_v1beta1_catalogsource.yaml → config/samples/core_v1beta1_catalog.yaml

@@ -1,13 +1,13 @@
 apiVersion: catalogd.operatorframework.io/v1beta1
-kind: CatalogSource
+kind: Catalog
 metadata: 
   labels:
-    app.kubernetes.io/name: catalogsource
-    app.kubernetes.io/instance: catalogsource-sample
+    app.kubernetes.io/name: catalog
+    app.kubernetes.io/instance: catalog-sample
     app.kubernetes.io/part-of: catalogd
     app.kuberentes.io/managed-by: kustomize
     app.kubernetes.io/created-by: catalogd
-  name: catalogsource-sample
+  name: catalog-sample
 spec:
   image: quay.io/operatorhubio/catalog:latest
   pollingInterval: 45m

pkg/apis/core/v1beta1/catalogsource_types.go → pkg/apis/core/v1beta1/catalog_types.go

@@ -31,27 +31,27 @@ const (
 //+kubebuilder:resource:scope=Cluster
 //+kubebuilder:subresource:status
 
-// CatalogSource is the Schema for the catalogsources API
-type CatalogSource struct {
+// Catalog is the Schema for the Catalogs API
+type Catalog struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   CatalogSourceSpec   `json:"spec,omitempty"`
-	Status CatalogSourceStatus `json:"status,omitempty"`
+	Spec   CatalogSpec   `json:"spec,omitempty"`
+	Status CatalogStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 
-// CatalogSourceList contains a list of CatalogSource
-type CatalogSourceList struct {
+// CatalogList contains a list of Catalog
+type CatalogList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 
-	Items []CatalogSource `json:"items"`
+	Items []Catalog `json:"items"`
 }
 
-// CatalogSourceSpec defines the desired state of CatalogSource
-type CatalogSourceSpec struct {
+// CatalogSpec defines the desired state of Catalog
+type CatalogSpec struct {
 
 	// Image is the Catalog image that contains Operators' metadata in the FBC format
 	// https://olm.operatorframework.io/docs/reference/file-based-catalogs/#docs
@@ -64,12 +64,12 @@ type CatalogSourceSpec struct {
 	PollingInterval *metav1.Duration `json:"pollingInterval,omitempty"`
 }
 
-// CatalogSourceStatus defines the observed state of CatalogSource
-type CatalogSourceStatus struct {
-	// Conditions store the status conditions of the CatalogSource instances
+// CatalogStatus defines the observed state of Catalog
+type CatalogStatus struct {
+	// Conditions store the status conditions of the Catalog instances
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
 }
 
 func init() {
-	SchemeBuilder.Register(&CatalogSource{}, &CatalogSourceList{})
+	SchemeBuilder.Register(&Catalog{}, &CatalogList{})
 }