MCO-2116: Generate OSImageStream manifest#10357
MCO-2116: Generate OSImageStream manifest#10357openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@pablintino: This pull request references MCO-2116 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
|
Important Review skippedAuto reviews are limited based on label configuration. 🚫 Review skipped — only excluded labels are configured. (1)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughAdds a new OSImageStream writable asset and integrates it into OpenShift manifest generation; introduces DefaultOSImageStream constants for RHCOS and SCOS. The asset emits an OSImageStream CR when the OS Streams feature gate is enabled and the target is not SCOS. Changes
Sequence Diagram(s)sequenceDiagram
participant Generator
participant Deps as dependencies.Get
participant InstallConfig
participant OSIS as OSImageStream
participant Manifests
participant FS as FileWriter
Generator->>Manifests: Generate()
Manifests->>Deps: Request dependencies (InstallConfig, OSImageStream)
Deps->>InstallConfig: Provide InstallConfig
Deps->>OSIS: Provide OSImageStream instance
OSIS->>InstallConfig: Read feature gates, target, stream
alt feature gate enabled and not SCOS
OSIS->>OSIS: Build mcfgv1alpha.OSImageStream
OSIS->>OSIS: Marshal to YAML (99_osimagestream.yaml)
OSIS-->>Manifests: Return Files()
else
OSIS-->>Manifests: Return no files
end
Manifests->>FS: Append files and write outputs
FS-->>Generator: Files written
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~22 minutes 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
@pablintino: This pull request references MCO-2116 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@pkg/asset/manifests/osimagestream.go`:
- Around line 44-63: The OSImageStream CR is being created even when no stream
was chosen; update the generation logic that currently checks
features.FeatureGateOSStreams and installConfig.Config.IsSCOS to also skip when
installConfig.Config.OSImageStream is empty (or only whitespace). Specifically,
before constructing the mcfgv1alpha.OSImageStream (the osImageStream variable
and its Spec.DefaultStream), add a guard that returns nil if
installConfig.Config.OSImageStream is blank so no 99_osimagestream.yaml is
emitted with an empty spec.defaultStream.
In `@pkg/rhcos/stream_scos.go`:
- Around line 5-6: Add the missing import that provides the OSImageStream type:
import the package that defines OSImageStream and alias it as types (so the file
can reference types.OSImageStream) before declaring the DefaultOSImageStream
constant; update the import block in pkg/rhcos/stream_scos.go accordingly so
DefaultOSImageStream and types.OSImageStream resolve.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 27091357-7587-41b5-bb98-c07bb88b1dff
📒 Files selected for processing (4)
pkg/asset/manifests/openshift.gopkg/asset/manifests/osimagestream.gopkg/rhcos/stream.gopkg/rhcos/stream_scos.go
| // If one of the following are true the OSImageStream CR is not generated | ||
| // 1. The feature is not enabled | ||
| // 2. The target is OKD | ||
| if !installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateOSStreams) || installConfig.Config.IsSCOS() { | ||
| // FG disabled or not OCP | ||
| return nil | ||
| } | ||
|
|
||
| osImageStream := &mcfgv1alpha.OSImageStream{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: mcfgv1alpha.SchemeGroupVersion.String(), | ||
| Kind: "OSImageStream", | ||
| }, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "cluster", | ||
| }, | ||
| Spec: &mcfgv1alpha.OSImageStreamSpec{ | ||
| DefaultStream: string(installConfig.Config.OSImageStream), | ||
| }, | ||
| } |
There was a problem hiding this comment.
Skip OSImageStream generation when no stream was selected.
This currently emits 99_osimagestream.yaml whenever the feature gate is on, even if installConfig.Config.OSImageStream is empty. That produces a CR with an empty spec.defaultStream, which does not match the PR objective of generating the manifest only when a stream was chosen.
Suggested fix
- if !installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateOSStreams) || installConfig.Config.IsSCOS() {
+ if !installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateOSStreams) ||
+ installConfig.Config.IsSCOS() ||
+ installConfig.Config.OSImageStream == "" {
// FG disabled or not OCP
return nil
}
@@
Spec: &mcfgv1alpha.OSImageStreamSpec{
- DefaultStream: string(installConfig.Config.OSImageStream),
+ DefaultStream: installConfig.Config.OSImageStream,
},
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| // If one of the following are true the OSImageStream CR is not generated | |
| // 1. The feature is not enabled | |
| // 2. The target is OKD | |
| if !installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateOSStreams) || installConfig.Config.IsSCOS() { | |
| // FG disabled or not OCP | |
| return nil | |
| } | |
| osImageStream := &mcfgv1alpha.OSImageStream{ | |
| TypeMeta: metav1.TypeMeta{ | |
| APIVersion: mcfgv1alpha.SchemeGroupVersion.String(), | |
| Kind: "OSImageStream", | |
| }, | |
| ObjectMeta: metav1.ObjectMeta{ | |
| Name: "cluster", | |
| }, | |
| Spec: &mcfgv1alpha.OSImageStreamSpec{ | |
| DefaultStream: string(installConfig.Config.OSImageStream), | |
| }, | |
| } | |
| // If one of the following are true the OSImageStream CR is not generated | |
| // 1. The feature is not enabled | |
| // 2. The target is OKD | |
| if !installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateOSStreams) || | |
| installConfig.Config.IsSCOS() || | |
| installConfig.Config.OSImageStream == "" { | |
| // FG disabled or not OCP | |
| return nil | |
| } | |
| osImageStream := &mcfgv1alpha.OSImageStream{ | |
| TypeMeta: metav1.TypeMeta{ | |
| APIVersion: mcfgv1alpha.SchemeGroupVersion.String(), | |
| Kind: "OSImageStream", | |
| }, | |
| ObjectMeta: metav1.ObjectMeta{ | |
| Name: "cluster", | |
| }, | |
| Spec: &mcfgv1alpha.OSImageStreamSpec{ | |
| DefaultStream: installConfig.Config.OSImageStream, | |
| }, | |
| } |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@pkg/asset/manifests/osimagestream.go` around lines 44 - 63, The OSImageStream
CR is being created even when no stream was chosen; update the generation logic
that currently checks features.FeatureGateOSStreams and
installConfig.Config.IsSCOS to also skip when installConfig.Config.OSImageStream
is empty (or only whitespace). Specifically, before constructing the
mcfgv1alpha.OSImageStream (the osImageStream variable and its
Spec.DefaultStream), add a guard that returns nil if
installConfig.Config.OSImageStream is blank so no 99_osimagestream.yaml is
emitted with an empty spec.defaultStream.
There was a problem hiding this comment.
This is expected. The CR should be generated always. If the user doesn't select a stream we should render the CR with the default stream the intaller uses.
There was a problem hiding this comment.
@pablintino, understood — always emit the CR and use the installer's default when no stream was chosen. My suggestion to skip was wrong.
That said, the current code still has a gap: when installConfig.Config.OSImageStream is empty it writes an empty spec.defaultStream instead of falling back to rhcos.DefaultOSImageStream. A small defaulting step before constructing the CR would cover that case:
stream := installConfig.Config.OSImageStream
if stream == "" {
stream = rhcos.DefaultOSImageStream
}
osImageStream := &mcfgv1alpha.OSImageStream{
...
Spec: &mcfgv1alpha.OSImageStreamSpec{
DefaultStream: string(stream),
},
}This keeps the "always generate" intent while ensuring a valid default is written.
( •ᴗ• )っ
📝 Learnings were identified and not saved (knowledge base disabled). Enable
|
@pablintino: This pull request references MCO-2116 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
There was a problem hiding this comment.
Actionable comments posted: 2
🧹 Nitpick comments (1)
pkg/asset/manifests/osimagestream.go (1)
3-16: Consider grouping imports by origin.Standard library imports (
context,path) are mixed with external and internal packages. Grouping them separately improves readability.♻️ Suggested organization
import ( "context" - "github.com/openshift/installer/pkg/rhcos" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "path" "github.com/openshift/api/features" "github.com/pkg/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" mcfgv1alpha "github.com/openshift/api/machineconfiguration/v1alpha1" "github.com/openshift/installer/pkg/asset" "github.com/openshift/installer/pkg/asset/installconfig" + "github.com/openshift/installer/pkg/rhcos" )🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@pkg/asset/manifests/osimagestream.go` around lines 3 - 16, Reorder the import block in osimagestream.go to group standard library packages together, third-party packages together, and internal repository packages together: place "context" and "path" in the first (standard) group, keep k8s and external libs (metav1, "github.com/openshift/api/features", "github.com/pkg/errors", "sigs.k8s.io/yaml") in the second group, and the project-specific imports ("github.com/openshift/installer/pkg/rhcos", mcfgv1alpha, "github.com/openshift/installer/pkg/asset", "github.com/openshift/installer/pkg/asset/installconfig") in the final group so the import block is clearly separated by origin.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@pkg/asset/manifests/osimagestream.go`:
- Around line 45-48: Update the misleading comment above the OSImageStream
generation check so it refers to IsSCOS() rather than "OKD": clarify that the
OSImageStream CR is not generated when the feature gate
features.FeatureGateOSStreams is disabled or when installConfig.Config.IsSCOS()
(SCOS/OKD target) is true; keep the logic using
installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateOSStreams)
and installConfig.Config.IsSCOS() unchanged, only change the comment text to
match the IsSCOS() method name (or explicitly mention both SCOS and OKD for
clarity).
- Around line 54-68: The computed fallback value `stream` is never used when
building the OSImageStream manifest, so DefaultStream is set from
installConfig.Config.OSImageStream (which may be empty); replace the direct use
of installConfig.Config.OSImageStream with the previously computed `stream`
variable when populating the OSImageStream.Spec.DefaultStream so the
rhcos.DefaultOSImageStream fallback is applied; update the construction of the
OSImageStream (OSImageStream, OSImageStreamSpec, DefaultStream) to reference
`stream` instead of installConfig.Config.OSImageStream.
---
Nitpick comments:
In `@pkg/asset/manifests/osimagestream.go`:
- Around line 3-16: Reorder the import block in osimagestream.go to group
standard library packages together, third-party packages together, and internal
repository packages together: place "context" and "path" in the first (standard)
group, keep k8s and external libs (metav1, "github.com/openshift/api/features",
"github.com/pkg/errors", "sigs.k8s.io/yaml") in the second group, and the
project-specific imports ("github.com/openshift/installer/pkg/rhcos",
mcfgv1alpha, "github.com/openshift/installer/pkg/asset",
"github.com/openshift/installer/pkg/asset/installconfig") in the final group so
the import block is clearly separated by origin.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 1a9c47e8-7d7c-45ea-becb-e96948c5349f
📒 Files selected for processing (4)
pkg/asset/manifests/openshift.gopkg/asset/manifests/osimagestream.gopkg/rhcos/stream.gopkg/rhcos/stream_scos.go
|
@pablintino: This pull request references MCO-2116 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
There was a problem hiding this comment.
♻️ Duplicate comments (1)
pkg/asset/manifests/osimagestream.go (1)
53-68:⚠️ Potential issue | 🔴 CriticalUse the computed fallback when populating
spec.defaultStream.Line 68 bypasses the fallback calculated on Lines 54-57, so an unset
OSImageStreamstill emitsspec.defaultStream: ""instead of the intended default.Suggested fix
Spec: &mcfgv1alpha.OSImageStreamSpec{ - DefaultStream: string(installConfig.Config.OSImageStream), + DefaultStream: string(stream), },🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@pkg/asset/manifests/osimagestream.go` around lines 53 - 68, The spec.defaultStream is being set from installConfig.Config.OSImageStream instead of the computed fallback stored in the local variable stream; update the OSImageStream creation (Spec.DefaultStream) to use the computed variable stream (convert to string if necessary) so the fallback (rhcos.DefaultOSImageStream) is emitted when the config value is empty.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Duplicate comments:
In `@pkg/asset/manifests/osimagestream.go`:
- Around line 53-68: The spec.defaultStream is being set from
installConfig.Config.OSImageStream instead of the computed fallback stored in
the local variable stream; update the OSImageStream creation
(Spec.DefaultStream) to use the computed variable stream (convert to string if
necessary) so the fallback (rhcos.DefaultOSImageStream) is emitted when the
config value is empty.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 0ad01fd0-dc57-4b17-88bf-f3f00621e0e2
📒 Files selected for processing (5)
hack/build-coreos-manifest.gopkg/asset/manifests/openshift.gopkg/asset/manifests/osimagestream.gopkg/rhcos/stream.gopkg/rhcos/stream_scos.go
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
|
@pablintino: This pull request references MCO-2116 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@pkg/rhcos/stream.go`:
- Around line 7-9: Create a new file pkg/rhcos/stream_okd.go with the build tag
"//go:build okd" and define the missing package-level constant
DefaultOSImageStream for the OKD build variant (analogous to stream_scos.go);
set DefaultOSImageStream to the OKD image stream constant (e.g.,
types.OSImageStreamOKD) so that the symbol DefaultOSImageStream is available
when building with the okd tag and pkg/asset/manifests/osimagestream.go can
compile.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 1f5d36a5-1120-482e-944c-d3a8df3e9827
📒 Files selected for processing (5)
hack/build-coreos-manifest.gopkg/asset/manifests/openshift.gopkg/asset/manifests/osimagestream.gopkg/rhcos/stream.gopkg/rhcos/stream_scos.go
🚧 Files skipped from review as they are similar to previous changes (1)
- pkg/asset/manifests/openshift.go
| // DefaultOSImageStream is the OS image stream used when the install-config | ||
| // does not specify one. | ||
| const DefaultOSImageStream = types.OSImageStreamRHCOS9 |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
fd --type f 'stream.*\.go$' pkg/rhcos | while IFS= read -r f; do
printf '\n== %s ==\n' "$f"
sed -n '1,30p' "$f"
done
printf '\n== DefaultOSImageStream declarations ==\n'
rg -n --type go -C2 '\bDefaultOSImageStream\b' pkg/rhcosRepository: openshift/installer
Length of output: 1802
🏁 Script executed:
# Check if DefaultOSImageStream is imported/used elsewhere
rg -n 'DefaultOSImageStream' --type go --max-count 20Repository: openshift/installer
Length of output: 462
🏁 Script executed:
# Check for okd build variant usage in CI/tooling
fd --type f '(Makefile|\.github|\.gitlab)' -x grep -l 'okd' {}Repository: openshift/installer
Length of output: 45
🏁 Script executed:
# Check if there's a build file or test that covers okd
fd --type f '\.(go|sh)$' -x grep -l 'okd' {} \; | head -20Repository: openshift/installer
Length of output: 459
🏁 Script executed:
# Check the osimagestream.go file to see its build constraint and usage
head -20 pkg/asset/manifests/osimagestream.go
sed -n '50,65p' pkg/asset/manifests/osimagestream.goRepository: openshift/installer
Length of output: 976
🏁 Script executed:
# Check if there's any okd-specific rhcos file or if okd is actually built
find . -path ./vendor -prune -o -type f -name '*okd*' -print | grep -E '\.(go|sh|yaml)$' | head -10Repository: openshift/installer
Length of output: 45
🏁 Script executed:
# Check build constraints on osimagestream.go
head -5 pkg/asset/manifests/osimagestream.go
# Check if osimagestream.go is part of okd or if the containing package has constraints
rg -n 'build' pkg/asset/manifests/ | head -20Repository: openshift/installer
Length of output: 2085
🏁 Script executed:
# Check what imports rhcos in manifests and their build constraints
rg -n 'pkg/rhcos' pkg/asset/manifests/ --type go -B3 | head -40Repository: openshift/installer
Length of output: 282
🏁 Script executed:
# Check if osimagestream.go is excluded from okd builds
head -3 pkg/asset/manifests/osimagestream.go
# Verify the complete build constraint situation
printf '\n=== stream.go build constraint ===\n'
head -1 pkg/rhcos/stream.go
printf '\n=== stream_scos.go build constraint ===\n'
head -1 pkg/rhcos/stream_scos.go
printf '\n=== osimagestream.go build constraint ===\n'
head -1 pkg/asset/manifests/osimagestream.goRepository: openshift/installer
Length of output: 270
🏁 Script executed:
# Check if okd builds are tested/used in the project
rg 'go:build.*okd|build.*okd' --type go | head -20Repository: openshift/installer
Length of output: 290
Add DefaultOSImageStream declaration for the okd build variant.
The constant is required by pkg/asset/manifests/osimagestream.go (line 57), which has no build constraint and always compiles. However, when building with //go:build okd, neither stream.go (excluded by !(okd || scos)) nor stream_scos.go (excluded by scos) provides this constant. This causes compilation to fail for okd builds.
Create pkg/rhcos/stream_okd.go with //go:build okd and define DefaultOSImageStream appropriately for OKD, similar to the pattern in stream_scos.go.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@pkg/rhcos/stream.go` around lines 7 - 9, Create a new file
pkg/rhcos/stream_okd.go with the build tag "//go:build okd" and define the
missing package-level constant DefaultOSImageStream for the OKD build variant
(analogous to stream_scos.go); set DefaultOSImageStream to the OKD image stream
constant (e.g., types.OSImageStreamOKD) so that the symbol DefaultOSImageStream
is available when building with the okd tag and
pkg/asset/manifests/osimagestream.go can compile.
There was a problem hiding this comment.
The build tags haven't changed from the already existing file. I don't think this issue should be part of this PR.
There was a problem hiding this comment.
@pablintino, understood — the build constraint on stream.go is pre-existing. The concern I raised is that osimagestream.go (new in this PR) has no build constraint and references DefaultOSImageStream, which is not defined for okd builds. That said, I respect that you'd prefer to keep scope limited here.
Would you like me to open a follow-up GitHub issue to track the missing DefaultOSImageStream for the okd build variant?
|
/test artifacts-images |
|
/test images |
patrickdillon
left a comment
patrickdillon
left a comment
There was a problem hiding this comment.
/approve
I left a few suggestions. I do think we are also waiting for #10321
| arch.RHELCoreOSExtensions = &rhcos.Extensions{} | ||
| } | ||
| arch.RHELCoreOSExtensions.Marketplace = mkt | ||
| stream.Architectures[name] = arch |
There was a problem hiding this comment.
I think this will become irrelevant, perhaps need a rebase once #10321 merges, right?
There was a problem hiding this comment.
Correct, this change should be gonne now.
|
|
||
| osImageStreamData, err := yaml.Marshal(osImageStream) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "failed to create %s manifests from InstallConfig", f.Name()) |
There was a problem hiding this comment.
errors wrap is deprecated, please replace with fmt.Errorf and don't introduce pkg/errors in this (unless using errors.As)
|
|
||
| // Name returns a human-friendly name for the asset. | ||
| func (*OSImageStream) Name() string { | ||
| return "OSImageStream" |
There was a problem hiding this comment.
nit:
| return "OSImageStream" | |
| return "OS Image Stream" |
| // If one of the following are true the OSImageStream CR is not generated | ||
| // 1. The feature is not enabled | ||
| // 2. The target is CentOS Stream CoreOS | ||
| if !installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateOSStreams) || installConfig.Config.IsSCOS() { |
There was a problem hiding this comment.
nit: I introduced a handier way of checking fgs, so you can now do something like:
| if !installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateOSStreams) || installConfig.Config.IsSCOS() { | |
| if ic := installConfig.Config; !ic.Enabled(features.FeatureGateOSStreams) || ic.IsSCOS() { |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: patrickdillon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
When the OSStreams feature gate is enabled and generate the OSImageStream CR in the openshift manifests so the cluster can boot with the desired stream. If not stream was selected the default one is picked. Signed-off-by: Pablo Rodriguez Nava <git@amail.pablintino.eu>
|
/test e2e-aws-ovn-rhel10-devpreview |
|
@gpei Thanks for launching the rhel 10 job. I guess that |
|
@pablintino: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
🤦♂️ I originally named the job |
|
/lgtm |
|
openshift/must-gather#533 for must gather support /verified by e2e-aws-ovn-rhel10-devpreview |
openshift-ci-robot
added
the
verified
|
@patrickdillon: This PR has been marked as verified by DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
openshift-merge-bot
Bot
merged commit ac9a370
into
openshift:main
@patrickdillon Not sure if you've already got a PR for this, I just submit |
4 participants
When the
OSStreamsfeature gate is enabled and the user has selected an OS image stream, generate theOSImageStreamCR in the openshift manifests so the cluster can boot with the desired stream.