Skip to content

MULTIARCH-4559: config/v1/types_cluster_version.go: Add 'architecture' to the release structure #2024

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

Merged
openshift-merge-bot merged 3 commits into from
Nov 18, 2024
Merged

MULTIARCH-4559: config/v1/types_cluster_version.go: Add 'architecture' to the release structure #2024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1392f06
config/v1/types_cluster_version: Add 'architecture' to the release st…
wking Sep 10, 2024
31505ab
config/v1: Update generated assets for Release.architecture
wking Sep 11, 2024
7f3382e
config/v1/tests/clusterversions.config.openshift.io/ImageStreamImport…
wking Nov 15, 2024
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
441 changes: 441 additions & 0 deletions config/v1/tests/clusterversions.config.openshift.io/ImageStreamImportMode.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions config/v1/types_cluster_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,16 @@ type Update struct {
// Release represents an OpenShift release image and associated metadata.
// +k8s:deepcopy-gen=true
type Release struct {
// architecture is an optional field that indicates the
// value of the cluster architecture. In this context cluster
Comment thread
Prashanth684 marked this conversation as resolved.
// architecture means either a single architecture or a multi
// architecture.
// Valid values are 'Multi' and empty.
Copy link
Copy Markdown
Contributor

@deads2k deads2k Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may very well end up extended with more detail in the near future, but starting here is acceptable.

//
// +openshift:enable:FeatureGate=ImageStreamImportMode
// +optional
Architecture ClusterVersionArchitecture `json:"architecture,omitempty"`
Copy link
Copy Markdown
Contributor

@deads2k deads2k Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs featuregate.

Copy link
Copy Markdown
Member Author

@wking wking Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which feature gate would you like? The enhancement is pretty thin in that section.

Copy link
Copy Markdown
Contributor

@Prashanth684 Prashanth684 Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the ImageStreamImportMode featuregate implemented here: #1928

Copy link
Copy Markdown
Member Author

@wking wking Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feature gate added as of 7f3382e. The verify-crd-schema failures are all existing properties in the new-with-this-pull clusterversions.config.openshift.io/ImageStreamImportMode.yaml file, and they'll need the /override ci/prow/verify-crd-schema mentioned in the failure message.


// version is a semantic version identifying the update version. When this
// field is part of spec, version is optional if image is specified.
// +required
Expand Down
33 changes: 33 additions & 0 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 @@ -318,6 +318,17 @@ spec:
description: Release represents an OpenShift release image and associated
metadata.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down Expand Up @@ -493,6 +504,17 @@ spec:
release:
description: release is the target of the update.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down Expand Up @@ -668,6 +690,17 @@ spec:
If the cluster is not yet fully initialized desired will be set
with the information available, which may be an image or a tag.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down
33 changes: 33 additions & 0 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 @@ -318,6 +318,17 @@ spec:
description: Release represents an OpenShift release image and associated
metadata.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down Expand Up @@ -493,6 +504,17 @@ spec:
release:
description: release is the target of the update.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down Expand Up @@ -668,6 +690,17 @@ spec:
If the cluster is not yet fully initialized desired will be set
with the information available, which may be an image or a tag.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down
33 changes: 33 additions & 0 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 @@ -318,6 +318,17 @@ spec:
description: Release represents an OpenShift release image and associated
metadata.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down Expand Up @@ -493,6 +504,17 @@ spec:
release:
description: release is the target of the update.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down Expand Up @@ -668,6 +690,17 @@ spec:
If the cluster is not yet fully initialized desired will be set
with the information available, which may be an image or a tag.
properties:
architecture:
description: |-
architecture is an optional field that indicates the
value of the cluster architecture. In this context cluster
architecture means either a single architecture or a multi
architecture.
Valid values are 'Multi' and empty.
enum:
- Multi
- ""
type: string
channels:
description: |-
channels is the set of Cincinnati channels to which the release
Expand Down
1 change: 1 addition & 0 deletions config/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ clusterversions.config.openshift.io:
Capability: ""
Category: ""
FeatureGates:
- ImageStreamImportMode
- SignatureStores
FilenameOperatorName: cluster-version-operator
FilenameOperatorOrdering: "01"
Expand Down
Loading