Skip to content

Commit

Permalink
DNM: test against RHEL 9.6
Browse files Browse the repository at this point in the history
Part of https://issues.redhat.com/browse/COS-3086.

Hopefully this is the last time we have to do this! (This should become
obsoleted by openshift/enhancements#1637).
  • Loading branch information
jlebon committed Dec 16, 2024
1 parent 36e2d57 commit e7c68f8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmd/machine-config-operator/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func runBootstrapCmd(_ *cobra.Command, _ []string) {
// To help debugging, immediately log version
klog.Infof("Version: %+v (%s)", version.Raw, version.Hash)

baseOSContainerImageTag := "rhel-coreos"
baseOSContainerImageTag := "rhel-coreos-next"
if version.IsFCOS() {
baseOSContainerImageTag = "fedora-coreos"
} else if version.IsSCOS() {
Expand Down
4 changes: 2 additions & 2 deletions install/0000_80_machine-config_05_osimageurl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ data:
releaseVersion: 0.0.1-snapshot
# This (will eventually) replace the below when https://github.com/openshift/enhancements/pull/1032
# progresses towards the default.
baseOSContainerImage: "placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos"
baseOSExtensionsContainerImage: "placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos-extensions"
baseOSContainerImage: "placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos-next"
baseOSExtensionsContainerImage: "placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos-next-extensions"
# The OS payload used for 4.10 and below; more information in
# https://github.com/openshift/machine-config-operator/blob/master/docs/OSUpgrades.md
# (The original issue was https://github.com/openshift/machine-config-operator/issues/183 )
Expand Down
8 changes: 4 additions & 4 deletions install/image-references
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ spec:
from:
kind: DockerImage
name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:kube-rbac-proxy
- name: rhel-coreos
- name: rhel-coreos-next
from:
kind: DockerImage
name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos
- name: rhel-coreos-extensions
name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos-next
- name: rhel-coreos-next-extensions
from:
kind: DockerImage
name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos-extensions
name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:rhel-coreos-next-extensions
- name: keepalived-ipfailover
from:
kind: DockerImage
Expand Down

0 comments on commit e7c68f8

Please sign in to comment.