Skip to content

Revert "OCPBUGS-48641: config/v1/types_cluster_version: Explain image and version both set" #2227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xueqzhan wants to merge 1 commit into from
Closed

Revert "OCPBUGS-48641: config/v1/types_cluster_version: Explain image and version both set" #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions config/v1/types_cluster_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ type ClusterVersionSpec struct {
//
// Some of the fields are inter-related with restrictions and meanings described here.
// 1. image is specified, version is specified, architecture is specified. API validation error.
// 2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
// 2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used.
// 3. image is specified, version is not specified, architecture is specified. API validation error.
// 4. image is specified, version is not specified, architecture is not specified. image is used.
// 5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
Expand Down Expand Up @@ -702,16 +702,16 @@ type Update struct {
Architecture ClusterVersionArchitecture `json:"architecture"`

// version is a semantic version identifying the update version.
// version is required if architecture is specified.
// If both version and image are set, the version extracted from the referenced image must match the specified version.
// version is ignored if image is specified and required if
// architecture is specified.
//
// +optional
Version string `json:"version"`

// image is a container image location that contains the update.
// image should be used when the desired version does not exist in availableUpdates or history.
// When image is set, version is ignored. When image is set, version should be empty.
// When image is set, architecture cannot be specified.
// If both version and image are set, the version extracted from the referenced image must match the specified version.
//
// +optional
Image string `json:"image"`
Expand Down
8 changes: 4 additions & 4 deletions ...rd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ spec:

Some of the fields are inter-related with restrictions and meanings described here.
1. image is specified, version is specified, architecture is specified. API validation error.
2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used.
3. image is specified, version is not specified, architecture is specified. API validation error.
4. image is specified, version is not specified, architecture is not specified. image is used.
5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
Expand Down Expand Up @@ -181,14 +181,14 @@ spec:
description: |-
image is a container image location that contains the update.
image should be used when the desired version does not exist in availableUpdates or history.
When image is set, version is ignored. When image is set, version should be empty.
When image is set, architecture cannot be specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
type: string
version:
description: |-
version is a semantic version identifying the update version.
version is required if architecture is specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
version is ignored if image is specified and required if
architecture is specified.
type: string
type: object
x-kubernetes-validations:
Expand Down
8 changes: 4 additions & 4 deletions ...erated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ spec:

Some of the fields are inter-related with restrictions and meanings described here.
1. image is specified, version is specified, architecture is specified. API validation error.
2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used.
3. image is specified, version is not specified, architecture is specified. API validation error.
4. image is specified, version is not specified, architecture is not specified. image is used.
5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
Expand Down Expand Up @@ -181,14 +181,14 @@ spec:
description: |-
image is a container image location that contains the update.
image should be used when the desired version does not exist in availableUpdates or history.
When image is set, version is ignored. When image is set, version should be empty.
When image is set, architecture cannot be specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
type: string
version:
description: |-
version is a semantic version identifying the update version.
version is required if architecture is specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
version is ignored if image is specified and required if
architecture is specified.
type: string
type: object
x-kubernetes-validations:
Expand Down
8 changes: 4 additions & 4 deletions ...anifests/0000_00_cluster-version-operator_01_clusterversions-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ spec:

Some of the fields are inter-related with restrictions and meanings described here.
1. image is specified, version is specified, architecture is specified. API validation error.
2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used.
3. image is specified, version is not specified, architecture is specified. API validation error.
4. image is specified, version is not specified, architecture is not specified. image is used.
5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
Expand Down Expand Up @@ -181,14 +181,14 @@ spec:
description: |-
image is a container image location that contains the update.
image should be used when the desired version does not exist in availableUpdates or history.
When image is set, version is ignored. When image is set, version should be empty.
When image is set, architecture cannot be specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
type: string
version:
description: |-
version is a semantic version identifying the update version.
version is required if architecture is specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
version is ignored if image is specified and required if
architecture is specified.
type: string
type: object
x-kubernetes-validations:
Expand Down
8 changes: 4 additions & 4 deletions ...nifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ spec:

Some of the fields are inter-related with restrictions and meanings described here.
1. image is specified, version is specified, architecture is specified. API validation error.
2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used.
3. image is specified, version is not specified, architecture is specified. API validation error.
4. image is specified, version is not specified, architecture is not specified. image is used.
5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
Expand Down Expand Up @@ -181,14 +181,14 @@ spec:
description: |-
image is a container image location that contains the update.
image should be used when the desired version does not exist in availableUpdates or history.
When image is set, version is ignored. When image is set, version should be empty.
When image is set, architecture cannot be specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
type: string
version:
description: |-
version is a semantic version identifying the update version.
version is required if architecture is specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
version is ignored if image is specified and required if
architecture is specified.
type: string
type: object
x-kubernetes-validations:
Expand Down
8 changes: 4 additions & 4 deletions ...generated.featuregated-crd-manifests/clusterversions.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ spec:

Some of the fields are inter-related with restrictions and meanings described here.
1. image is specified, version is specified, architecture is specified. API validation error.
2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used.
3. image is specified, version is not specified, architecture is specified. API validation error.
4. image is specified, version is not specified, architecture is not specified. image is used.
5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
Expand Down Expand Up @@ -183,14 +183,14 @@ spec:
description: |-
image is a container image location that contains the update.
image should be used when the desired version does not exist in availableUpdates or history.
When image is set, version is ignored. When image is set, version should be empty.
When image is set, architecture cannot be specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
type: string
version:
description: |-
version is a semantic version identifying the update version.
version is required if architecture is specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
version is ignored if image is specified and required if
architecture is specified.
type: string
type: object
x-kubernetes-validations:
Expand Down
8 changes: 4 additions & 4 deletions ...featuregated-crd-manifests/clusterversions.config.openshift.io/ImageStreamImportMode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ spec:

Some of the fields are inter-related with restrictions and meanings described here.
1. image is specified, version is specified, architecture is specified. API validation error.
2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used.
3. image is specified, version is not specified, architecture is specified. API validation error.
4. image is specified, version is not specified, architecture is not specified. image is used.
5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
Expand Down Expand Up @@ -183,14 +183,14 @@ spec:
description: |-
image is a container image location that contains the update.
image should be used when the desired version does not exist in availableUpdates or history.
When image is set, version is ignored. When image is set, version should be empty.
When image is set, architecture cannot be specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
type: string
version:
description: |-
version is a semantic version identifying the update version.
version is required if architecture is specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
version is ignored if image is specified and required if
architecture is specified.
type: string
type: object
x-kubernetes-validations:
Expand Down
8 changes: 4 additions & 4 deletions ...rated.featuregated-crd-manifests/clusterversions.config.openshift.io/SignatureStores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ spec:

Some of the fields are inter-related with restrictions and meanings described here.
1. image is specified, version is specified, architecture is specified. API validation error.
2. image is specified, version is specified, architecture is not specified. The version extracted from the referenced image must match the specified version.
2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used.
3. image is specified, version is not specified, architecture is specified. API validation error.
4. image is specified, version is not specified, architecture is not specified. image is used.
5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image.
Expand Down Expand Up @@ -183,14 +183,14 @@ spec:
description: |-
image is a container image location that contains the update.
image should be used when the desired version does not exist in availableUpdates or history.
When image is set, version is ignored. When image is set, version should be empty.
When image is set, architecture cannot be specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
type: string
version:
description: |-
version is a semantic version identifying the update version.
version is required if architecture is specified.
If both version and image are set, the version extracted from the referenced image must match the specified version.
version is ignored if image is specified and required if
architecture is specified.
type: string
type: object
x-kubernetes-validations:
Expand Down
Loading