Skip to content

NO-ISSUE: Remove dead code #6203

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 1 commit into from
Jun 30, 2026
+0 −32
Merged

NO-ISSUE: Remove dead code #6203

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
32 changes: 0 additions & 32 deletions pkg/daemon/rpm-ostree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,38 +229,6 @@ func (r *RpmOstreeClient) RebaseLayeredFromContainerStorage(podmanImageInfo *Pod
return runRpmOstree("rebase", "--experimental", "ostree-unverified-image:containers-storage:"+podmanImageInfo.RepoDigest)
}

// DeploymentVersion wraps rpm-ostree deployment information to provide
// version checking methods similar to the osrelease package.
type DeploymentVersion struct {
// osName is the osname field from the deployment
osName string
// version is the version field from the deployment
version string
}

// NewTargetOSVersionFromDeployment creates a DeploymentVersion from the given deployment
func NewTargetOSVersionFromDeployment(deployment *rpmostreeclient.Deployment) *DeploymentVersion {
return &DeploymentVersion{
osName: deployment.OSName,
version: deployment.Version,
}
}

// BaseVersionMajor returns the first number in a `.` separated version.
func (t *DeploymentVersion) BaseVersionMajor() string {
return strings.Split(t.version, ".")[0]
}

// IsEL is true if the OS is an Enterprise Linux variant of CoreOS
func (t *DeploymentVersion) IsEL() bool {
return t.osName == "rhcos" || t.osName == "scos"
}

// IsEL10 is true if the target OS is RHCOS 10 or SCOS 10
func (t *DeploymentVersion) IsEL10() bool {
return t.IsEL() && (strings.HasPrefix(t.version, "10.") || t.version == "10")
}

// patchPoliciesForContainerStorage temporarily overrides the container image policy visible
// to rpm-ostreed to ensure pulls from the "containers-storage" transport are allowed for the
// given image.
Expand Down