Skip to content

Commit 4b9ef2c

Browse files
committed
Generation should not be a required field
In the InstallPlan, the Generation field should not be required and may be omitted. Bugzilla Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1825349
1 parent 2248cc6 commit 4b9ef2c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ spec:
6767
- approval
6868
- approved
6969
- clusterServiceVersionNames
70-
- generation
7170
properties:
7271
approval:
7372
description: Approval is the user approval policy for an InstallPlan.
@@ -140,6 +139,7 @@ spec:
140139
type: object
141140
required:
142141
- catalogSourceRef
142+
- identifier
143143
- path
144144
- replaces
145145
properties:
@@ -212,6 +212,10 @@ spec:
212212
type:
213213
description: Type of condition.
214214
type: string
215+
identifier:
216+
description: Identifier is the catalog-unique name of the operator
217+
(the name of the CSV for bundles that contain CSVs)
218+
type: string
215219
path:
216220
description: Path refers to the location of a bundle to pull.
217221
It's typically an image reference.

manifests/0000_50_olm_04-installplan.crd.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ spec:
6767
- approval
6868
- approved
6969
- clusterServiceVersionNames
70-
- generation
7170
properties:
7271
approval:
7372
description: Approval is the user approval policy for an InstallPlan.
@@ -301,4 +300,3 @@ spec:
301300
description: StepStatus is the current status of a particular
302301
resource an in InstallPlan
303302
type: string
304-

pkg/api/apis/operators/v1alpha1/installplan_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type InstallPlanSpec struct {
2828
ClusterServiceVersionNames []string `json:"clusterServiceVersionNames"`
2929
Approval Approval `json:"approval"`
3030
Approved bool `json:"approved"`
31-
Generation int `json:"generation"`
31+
Generation int `json:"generation,omitempty"`
3232
}
3333

3434
// InstallPlanPhase is the current status of a InstallPlan as a whole.

0 commit comments

Comments
 (0)