Merge pull request #101 from jchunkins/add_fields_csv

Add skips & relatedImages to CSV Spec

Author: kevinrizza

crds/operators.coreos.com_clusterserviceversions.yaml

@@ -4527,6 +4527,19 @@ spec:
                       type: string
                     url:
                       type: string
+                relatedImages:
+                  description: List any related images, or other container images that your Operator might require to perform their functions. This list should also include operand images as well. All image references should be specified by digest (SHA) and not by tag. This field is only used during catalog creation and plays no part in cluster runtime.
+                  type: array
+                  items:
+                    type: object
+                    required:
+                      - image
+                      - name
+                    properties:
+                      image:
+                        type: string
+                      name:
+                        type: string
                 replaces:
                   description: The name of a CSV this one replaces. Should match the `metadata.Name` field of the old CSV.
                   type: string
@@ -4560,6 +4573,11 @@ spec:
                       type: object
                       additionalProperties:
                         type: string
+                skips:
+                  description: The name(s) of one or more CSV(s) that should be skipped in the upgrade graph. Should match the `metadata.Name` field of the CSV that should be skipped. This field is only used during catalog creation and plays no part in cluster runtime.
+                  type: array
+                  items:
+                    type: string
                 version:
                   description: OperatorVersion is a wrapper around semver.Version which supports correct marshaling to YAML and JSON.
                   type: string

crds/zz_defs.go

@@ -307,6 +307,18 @@ type ClusterServiceVersionSpec struct {
 	// Cleanup specifies the cleanup behaviour when the CSV gets deleted
 	// +optional
 	Cleanup CleanupSpec `json:"cleanup,omitempty"`
+
+	// The name(s) of one or more CSV(s) that should be skipped in the upgrade graph.
+	// Should match the `metadata.Name` field of the CSV that should be skipped.
+	// This field is only used during catalog creation and plays no part in cluster runtime.
+	// +optional
+	Skips []string `json:"skips,omitempty"`
+
+	// List any related images, or other container images that your Operator might require to perform their functions.
+	// This list should also include operand images as well. All image references should be specified by
+	// digest (SHA) and not by tag. This field is only used during catalog creation and plays no part in cluster runtime.
+	// +optional
+	RelatedImages []RelatedImage `json:"relatedImages,omitempty"`
 }
 
 type CleanupSpec struct {
@@ -328,6 +340,11 @@ type Icon struct {
 	MediaType string `json:"mediatype"`
 }
 
+type RelatedImage struct {
+	Name  string `json:"name"`
+	Image string `json:"image"`
+}
+
 // ClusterServiceVersionPhase is a label for the condition of a ClusterServiceVersion at the current time.
 type ClusterServiceVersionPhase string