Skip to content
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

Jump to bottom

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

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
2 commits
Select commit Hold shift + click to select a range
bfbe9bf
config/v1/types_cluster_version: Add 'architecture' to the release st…
wking Sep 10, 2024
f153ad8
config/v1: Update generated assets for Release.architecture
wking Sep 11, 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
9 changes: 9 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 @@ -691,6 +691,15 @@ 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
Prashanth684 marked this conversation as resolved.
Show resolved Hide resolved
// architecture means either a single architecture or a multi
// architecture.
// Valid values are 'Multi' and empty.
Copy link
Contributor

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.

//
// +optional
Architecture ClusterVersionArchitecture `json:"architecture,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Needs featuregate.

Copy link
Member Author

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
Contributor

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


// 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
28 changes: 28 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 @@ -298,6 +298,15 @@ 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 currently belongs.
Expand Down Expand Up @@ -479,6 +488,16 @@ 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 currently belongs.
Expand Down Expand Up @@ -643,6 +662,15 @@ spec:
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 currently belongs.
Expand Down
28 changes: 28 additions & 0 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 @@ -245,6 +245,15 @@ 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 currently belongs.
Expand Down Expand Up @@ -426,6 +435,16 @@ 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 currently belongs.
Expand Down Expand Up @@ -590,6 +609,15 @@ spec:
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 currently belongs.
Expand Down
28 changes: 28 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 @@ -298,6 +298,15 @@ 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 currently belongs.
Expand Down Expand Up @@ -479,6 +488,16 @@ 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 currently belongs.
Expand Down Expand Up @@ -643,6 +662,15 @@ spec:
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 currently belongs.
Expand Down
28 changes: 28 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 @@ -298,6 +298,15 @@ 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 currently belongs.
Expand Down Expand Up @@ -479,6 +488,16 @@ 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 currently belongs.
Expand Down Expand Up @@ -643,6 +662,15 @@ spec:
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 currently belongs.
Expand Down
28 changes: 28 additions & 0 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 @@ -247,6 +247,15 @@ 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 currently belongs.
Expand Down Expand Up @@ -428,6 +437,16 @@ 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 currently belongs.
Expand Down Expand Up @@ -592,6 +611,15 @@ spec:
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 currently belongs.
Expand Down
28 changes: 28 additions & 0 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 @@ -300,6 +300,15 @@ 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 currently belongs.
Expand Down Expand Up @@ -481,6 +490,16 @@ 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 currently belongs.
Expand Down Expand Up @@ -645,6 +664,15 @@ spec:
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 currently belongs.
Expand Down
11 changes: 6 additions & 5 deletions config/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions openapi/generated_openapi/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions openapi/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9772,6 +9772,10 @@
"image"
],
"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.",
"type": "string"
},
"channels": {
"description": "channels is the set of Cincinnati channels to which the release currently belongs.",
"type": "array",
Expand Down