Merge pull request #636 from ecordell/remove-all

fix(crds): remove category all from CRDs

Author: openshift-merge-robot

Documentation/design/architecture.md

@@ -6,11 +6,11 @@ Each of these Operators are responsible for managing the CRDs that are the basis
 
 | Resource                 | Short Name | Owner   | Description                                                                                |
 |--------------------------|------------|---------|--------------------------------------------------------------------------------------------|
-| ClusterServiceVersion | CSV        | OLM     | application metadata: name, version, icon, required resources, installation, etc...        |
-| InstallPlan           | IP         | Catalog | calculated list of resources to be created in order to automatically install/upgrade a CSV |
-| CatalogSource         | CS         | Catalog | a repository of CSVs, CRDs, and packages that define an application                        |
-| Subscription          | Sub        | Catalog | used to keep CSVs up to date by tracking a channel in a package                            |
-| OperatorGroup         | <None>     | OLM     | method to group multiple namespaces and prepare for use by an operator                     |
+| ClusterServiceVersion | csv        | OLM     | application metadata: name, version, icon, required resources, installation, etc...        |
+| InstallPlan           | ip         | Catalog | calculated list of resources to be created in order to automatically install/upgrade a CSV |
+| CatalogSource         | catsrc         | Catalog | a repository of CSVs, CRDs, and packages that define an application                        |
+| Subscription          | sub        | Catalog | used to keep CSVs up to date by tracking a channel in a package                            |
+| OperatorGroup         | og     | OLM     | method to group multiple namespaces and prepare for use by an operator                     |
 
 Each of these Operators are also responsible for creating resources:
 
@@ -147,4 +147,4 @@ Operator group target namespace information is made available to operators via a
 
 Each CSV in the operator namespace is copied into the target namespace(s), which is done in case a user does not have access to the operator namespace. The copied CSV is annotated with the operator group name and the operator namespace (the target namespace list is intentionally not included for security reasons).
 
-In summary, the goal of the above functionality is to assist in bringing multitenancy features to running operators in a cluster in the easiest most automated way. For creating your own operator group resource, refer to the operator group custom resource definition file in the templates directory.
+In summary, the goal of the above functionality is to assist in bringing multitenancy features to running operators in a cluster in the easiest most automated way. For creating your own operator group resource, refer to the operator group custom resource definition file in the templates directory.

deploy/chart/templates/0000_30_02-clusterserviceversion.crd.yaml

@@ -13,8 +13,8 @@ spec:
     listKind: ClusterServiceVersionList
     shortNames:
     - csv
+    - csvs
     categories:
-    - all
     - olm
   additionalPrinterColumns:
   - name: Display

deploy/chart/templates/0000_30_03-installplan.crd.yaml

@@ -18,8 +18,9 @@ spec:
     singular: installplan
     kind: InstallPlan
     listKind: InstallPlanList
+    shortNames:
+    - ip
     categories:
-    - all
     - olm
   additionalPrinterColumns:
   - name: CSV

deploy/chart/templates/0000_30_04-subscription.crd.yaml

@@ -18,8 +18,10 @@ spec:
     singular: subscription
     kind: Subscription
     listKind: SubscriptionList
+    shortNames:
+    - sub
+    - subs
     categories:
-    - all
     - olm
   additionalPrinterColumns:
   - name: Package

deploy/chart/templates/0000_30_05-catalogsource.crd.yaml

@@ -18,8 +18,9 @@ spec:
     singular: catalogsource
     kind: CatalogSource
     listKind: CatalogSourceList
+    shortNames:
+    - catsrc
     categories:
-    - all
     - olm
   additionalPrinterColumns:
   - name: Name

deploy/chart/templates/0000_30_10-olm-operator.deployment.yaml

@@ -60,5 +60,3 @@ spec:
       nodeSelector:
 {{ toYaml .Values.olm.nodeSelector | indent 8 }}
     {{- end }}
-      imagePullSecrets:
-        - name: coreos-pull-secret

deploy/chart/templates/0000_30_11-catalog-operator.deployment.yaml

@@ -55,5 +55,3 @@ spec:
       nodeSelector:
 {{ toYaml .Values.catalog.nodeSelector | indent 8 }}
     {{- end }}
-      imagePullSecrets:
-        - name: coreos-pull-secret

deploy/chart/templates/0000_30_13-operatorgroup.crd.yaml

@@ -14,6 +14,10 @@ spec:
     singular: operatorgroup
     kind: OperatorGroup
     listKind: OperatorGroupList
+    shortNames:
+      - og
+    categories:
+      - olm
   scope: Namespaced
   subresources:
     # status enables the status subresource.
@@ -74,4 +78,4 @@ spec:
           - lastUpdated
           type: object
       required:
-      - metadata
+      - metadata

manifests/0000_30_00-namespace.yaml

@@ -1,11 +1,12 @@
----
+##---
 # Source: olm/templates/0000_30_00-namespace.yaml
 apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-operator-lifecycle-manager
   labels:
     openshift.io/run-level: "1"
+    olm.components: "global"
 ---
 apiVersion: v1
 kind: Namespace

manifests/0000_30_01-olm-operator.serviceaccount.yaml

@@ -1,4 +1,4 @@
----
+##---
 # Source: olm/templates/0000_30_01-olm-operator.serviceaccount.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole