Skip to content

OS Streams with image-service using rhcos version #10742

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

Draft
giladravid16 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

OS Streams with image-service using rhcos version #10742

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
5 changes: 5 additions & 0 deletions api/hiveextension/v1beta1/agentclusterinstall_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,11 @@ type AgentClusterInstallSpec struct {
// LoadBalancer defines the load balancer used by the cluster for ingress traffic.
// +optional
LoadBalancer *LoadBalancer `json:"loadBalancer,omitempty"`

// OSStream is the OS stream to use for this cluster (e.g. rhel-9, rhel-10).
// If unset, the default OS stream for the OpenShift version is used.
// +optional
OSStream string `json:"osStream,omitempty"`
}

// IgnitionEndpoint stores the data to of the custom ignition endpoint.
Expand Down
7 changes: 7 additions & 0 deletions api/v1beta1/agentserviceconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ type OSImage struct {
// The CPU architecture of the image (x86_64/arm64/etc).
// +optional
CPUArchitecture string `json:"cpuArchitecture"`
// OSStream is the OS stream of this image (e.g. rhel-9, rhel-10).
// +optional
OSStream string `json:"osStream,omitempty"`
// DefaultOSStream indicates whether this OS image is the default stream
// for its OpenShift version and CPU architecture.
// +optional
DefaultOSStream *bool `json:"defaultOsStream,omitempty"`
}

type MustGatherImage struct {
Expand Down
6 changes: 6 additions & 0 deletions api/v1beta1/infraenv_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ type InfraEnvSpec struct {
// +optional
OSImageVersion string `json:"osImageVersion,omitempty"`

// OSStream is the OS stream to use when generating the InfraEnv (e.g. rhel-9, rhel-10).
// If unset and ClusterRef is set, the cluster's OS stream is used.
// Note: OSStream can't be specified along with ClusterRef while creating an InfraEnv.
// +optional
OSStream string `json:"osStream,omitempty"`

// MirrorRegistryRef references a ConfigMap containing mirror registry configuration in TOML format.
// The referenced ConfigMap should contain 'registries.conf' and optionally 'ca-bundle.crt' keys.
// This configuration is embedded into the discovery image so that agents can pull container images
Expand Down
9 changes: 8 additions & 1 deletion api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions api/vendor/github.com/openshift/assisted-service/models/cluster.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions api/vendor/github.com/openshift/assisted-service/models/cluster_create_params.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions api/vendor/github.com/openshift/assisted-service/models/infra_env.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions api/vendor/github.com/openshift/assisted-service/models/infra_env_create_params.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions api/vendor/github.com/openshift/assisted-service/models/infra_env_update_params.go
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions api/vendor/github.com/openshift/assisted-service/models/os_image.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions api/vendor/github.com/openshift/assisted-service/models/v2_cluster_update_params.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions client/vendor/github.com/openshift/assisted-service/models/cluster.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions client/vendor/github.com/openshift/assisted-service/models/cluster_create_params.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions client/vendor/github.com/openshift/assisted-service/models/infra_env.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions client/vendor/github.com/openshift/assisted-service/models/infra_env_create_params.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions client/vendor/github.com/openshift/assisted-service/models/infra_env_update_params.go
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions client/vendor/github.com/openshift/assisted-service/models/os_image.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions client/vendor/github.com/openshift/assisted-service/models/v2_cluster_update_params.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion cmd/agentbasedinstaller/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func RegisterInfraEnv(ctx context.Context, log *log.Logger, bmInventory *client.
if modelsCluster != nil {
clusterID = modelsCluster.ID
}
infraEnvParams := controllers.CreateInfraEnvParams(&infraEnv, models.ImageType(imageTypeISO), pullSecret, clusterID, "")
infraEnvParams := controllers.CreateInfraEnvParams(&infraEnv, models.ImageType(imageTypeISO), pullSecret, clusterID, "", "")

fileInfo, _ := os.Stat(nmStateConfigPath)
if fileInfo != nil {
Expand Down
9 changes: 9 additions & 0 deletions config/crd/bases/agent-install.openshift.io_agentserviceconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,11 +775,20 @@ spec:
cpuArchitecture:
description: The CPU architecture of the image (x86_64/arm64/etc).
type: string
defaultOsStream:
description: |-
DefaultOSStream indicates whether this OS image is the default stream
for its OpenShift version and CPU architecture.
type: boolean
openshiftVersion:
description: |-
OpenshiftVersion is the Major.Minor version of OpenShift that this image
is to be associated with.
type: string
osStream:
description: OSStream is the OS stream of this image (e.g. rhel-9,
rhel-10).
type: string
rootFSUrl:
description: |-
rootFSUrl specifies the path to the root filesystem.
Expand Down
9 changes: 9 additions & 0 deletions config/crd/bases/agent-install.openshift.io_hypershiftagentserviceconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,11 +793,20 @@ spec:
cpuArchitecture:
description: The CPU architecture of the image (x86_64/arm64/etc).
type: string
defaultOsStream:
description: |-
DefaultOSStream indicates whether this OS image is the default stream
for its OpenShift version and CPU architecture.
type: boolean
openshiftVersion:
description: |-
OpenshiftVersion is the Major.Minor version of OpenShift that this image
is to be associated with.
type: string
osStream:
description: OSStream is the OS stream of this image (e.g. rhel-9,
rhel-10).
type: string
rootFSUrl:
description: |-
rootFSUrl specifies the path to the root filesystem.
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/agent-install.openshift.io_infraenvs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,12 @@ spec:
(i.e. OSImageVersion should equal to an OpenshiftVersion in OSImages list).
Note: OSImageVersion can't be specified along with ClusterRef while creating an InfraEnv.
type: string
osStream:
description: |-
OSStream is the OS stream to use when generating the InfraEnv (e.g. rhel-9, rhel-10).
If unset and ClusterRef is set, the cluster's OS stream is used.
Note: OSStream can't be specified along with ClusterRef while creating an InfraEnv.
type: string
proxy:
description: |-
Proxy defines the proxy settings for agents and clusters that use the InfraEnv. If
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/extensions.hive.openshift.io_agentclusterinstalls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,11 @@ spec:
For single-node installations (none or external platform), set to true or leave empty.
type: boolean
type: object
osStream:
description: |-
OSStream is the OS stream to use for this cluster (e.g. rhel-9, rhel-10).
If unset, the default OS stream for the OpenShift version is used.
type: string
platformType:
description: PlatformType is the name for the specific platform upon
which to perform the installation.
Expand Down
29 changes: 29 additions & 0 deletions config/crd/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,11 @@ spec:
For single-node installations (none or external platform), set to true or leave empty.
type: boolean
type: object
osStream:
description: |-
OSStream is the OS stream to use for this cluster (e.g. rhel-9, rhel-10).
If unset, the default OS stream for the OpenShift version is used.
type: string
platformType:
description: PlatformType is the name for the specific platform upon
which to perform the installation.
Expand Down Expand Up @@ -2218,11 +2223,20 @@ spec:
cpuArchitecture:
description: The CPU architecture of the image (x86_64/arm64/etc).
type: string
defaultOsStream:
description: |-
DefaultOSStream indicates whether this OS image is the default stream
for its OpenShift version and CPU architecture.
type: boolean
openshiftVersion:
description: |-
OpenshiftVersion is the Major.Minor version of OpenShift that this image
is to be associated with.
type: string
osStream:
description: OSStream is the OS stream of this image (e.g. rhel-9,
rhel-10).
type: string
rootFSUrl:
description: |-
rootFSUrl specifies the path to the root filesystem.
Expand Down Expand Up @@ -3090,11 +3104,20 @@ spec:
cpuArchitecture:
description: The CPU architecture of the image (x86_64/arm64/etc).
type: string
defaultOsStream:
description: |-
DefaultOSStream indicates whether this OS image is the default stream
for its OpenShift version and CPU architecture.
type: boolean
openshiftVersion:
description: |-
OpenshiftVersion is the Major.Minor version of OpenShift that this image
is to be associated with.
type: string
osStream:
description: OSStream is the OS stream of this image (e.g. rhel-9,
rhel-10).
type: string
rootFSUrl:
description: |-
rootFSUrl specifies the path to the root filesystem.
Expand Down Expand Up @@ -3422,6 +3445,12 @@ spec:
(i.e. OSImageVersion should equal to an OpenshiftVersion in OSImages list).
Note: OSImageVersion can't be specified along with ClusterRef while creating an InfraEnv.
type: string
osStream:
description: |-
OSStream is the OS stream to use when generating the InfraEnv (e.g. rhel-9, rhel-10).
If unset and ClusterRef is set, the cluster's OS stream is used.
Note: OSStream can't be specified along with ClusterRef while creating an InfraEnv.
type: string
proxy:
description: |-
Proxy defines the proxy settings for agents and clusters that use the InfraEnv. If
Expand Down
9 changes: 9 additions & 0 deletions deploy/olm-catalog/manifests/agent-install.openshift.io_agentserviceconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,11 +775,20 @@ spec:
cpuArchitecture:
description: The CPU architecture of the image (x86_64/arm64/etc).
type: string
defaultOsStream:
description: |-
DefaultOSStream indicates whether this OS image is the default stream
for its OpenShift version and CPU architecture.
type: boolean
openshiftVersion:
description: |-
OpenshiftVersion is the Major.Minor version of OpenShift that this image
is to be associated with.
type: string
osStream:
description: OSStream is the OS stream of this image (e.g. rhel-9,
rhel-10).
type: string
rootFSUrl:
description: |-
rootFSUrl specifies the path to the root filesystem.
Expand Down
Loading