doc: fix layout of the doc (#171)

Signed-off-by: Per G. da Silva <[email protected]>

Author: camilamacedo86

Diff for: crds/operators.coreos.com_catalogsources.yaml

@@ -59,15 +59,26 @@ spec:
                 address:
                   description: 'Address is a host that OLM can use to connect to a pre-existing registry. Format: <registry-host or ip>:<port> Only used when SourceType = SourceTypeGrpc. Ignored when the Image field is set.'
                   type: string
-                config:
-                  description: Config adds additional optional settings, e.g. catalog source pod node selectors and tolerations
+                configMap:
+                  description: ConfigMap is the name of the ConfigMap to be used to back a configmap-server registry. Only used when SourceType = SourceTypeConfigmap or SourceTypeInternal.
+                  type: string
+                description:
+                  type: string
+                displayName:
+                  description: Metadata
+                  type: string
+                grpcPodConfig:
+                  description: GrpcPodConfig exposes different overrides for the pod spec of the CatalogSource Pod. Only used when SourceType = SourceTypeGrpc and Image is set.
                   type: object
                   properties:
                     nodeSelector:
                       description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
                       type: object
                       additionalProperties:
                         type: string
+                    priorityClassName:
+                      description: If specified, indicates the pod's priority. "system-node-critical" and "system-cluster-critical" are two special keywords which indicate the highest priorities with the former being the highest priority. Any other name must be defined by creating a PriorityClass object with that name. If not specified, the pod priority will be default or zero if there is no default.
+                      type: string
                     tolerations:
                       description: Tolerations are the catalog source's pod's tolerations.
                       type: array
@@ -91,14 +102,6 @@ spec:
                           value:
                             description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
                             type: string
-                configMap:
-                  description: ConfigMap is the name of the ConfigMap to be used to back a configmap-server registry. Only used when SourceType = SourceTypeConfigmap or SourceTypeInternal.
-                  type: string
-                description:
-                  type: string
-                displayName:
-                  description: Metadata
-                  type: string
                 icon:
                   type: object
                   required:

Diff for: crds/zz_defs.go

@@ -80,9 +80,10 @@ type CatalogSourceSpec struct {
 	// +Optional
 	Secrets []string `json:"secrets,omitempty"`
 
-	// Config adds additional optional settings, e.g. catalog source pod node selectors and tolerations
+	// GrpcPodConfig exposes different overrides for the pod spec of the CatalogSource Pod.
+	// Only used when SourceType = SourceTypeGrpc and Image is set.
 	// +Optional
-	Config *CatalogSourceConfig `json:"config,omitempty"`
+	GrpcPodConfig *GrpcPodConfig `json:"grpcPodConfig,omitempty"`
 
 	// Metadata
 	DisplayName string `json:"displayName,omitempty"`
@@ -91,8 +92,8 @@ type CatalogSourceSpec struct {
 	Icon        Icon   `json:"icon,omitempty"`
 }
 
-// CatalogSourceConfig contains configuration specified for a catalog source
-type CatalogSourceConfig struct {
+// GrpcPodConfig contains configuration specified for a catalog source
+type GrpcPodConfig struct {
 	// NodeSelector is a selector which must be true for the pod to fit on a node.
 	// Selector which must match a node's labels for the pod to be scheduled on that node.
 	// More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
@@ -102,6 +103,15 @@ type CatalogSourceConfig struct {
 	// Tolerations are the catalog source's pod's tolerations.
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
+
+	// If specified, indicates the pod's priority. "system-node-critical" and
+	// "system-cluster-critical" are two special keywords which indicate the
+	// highest priorities with the former being the highest priority. Any other
+	// name must be defined by creating a PriorityClass object with that name.
+	// If not specified, the pod priority will be default or zero if there is no
+	// default.
+	// +optional
+	PriorityClassName string `json:"priorityClassName,omitempty" protobuf:"bytes,24,opt,name=priorityClassName"`
 }
 
 // UpdateStrategy holds all the different types of catalog source update strategies

Diff for: pkg/operators/v1alpha1/catalogsource_types.go

@@ -52,11 +52,11 @@ func validateServiceAccounts(bundle *manifests.Bundle) []errors.Error {
 		sa := v1.ServiceAccount{}
 		if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &sa); err == nil {
 			if _, ok := saNamesFromCSV[sa.Name]; ok {
-				errs = append(errs, errors.ErrInvalidBundle(fmt.Sprintf("invalid service account found in bundle. " +
-					"This service account %s in your bundle is not valid, because a service account with the same name " +
-					"was already specified in your CSV. If this was unintentional, please remove the service account " +
-					"manifest from your bundle. If it was intentional to specify a separate service account, " +
-					"please rename the SA in either the bundle manifest or the CSV.",sa.Name), sa.Name))
+				errs = append(errs, errors.ErrInvalidBundle(fmt.Sprintf("invalid service account found in bundle. "+
+					"This service account %s in your bundle is not valid, because a service account with the same name "+
+					"was already specified in your CSV. If this was unintentional, please remove the service account "+
+					"manifest from your bundle. If it was intentional to specify a separate service account, "+
+					"please rename the SA in either the bundle manifest or the CSV.", sa.Name), sa.Name))
 			}
 		}
 	}