Skip to content

Commit

Permalink
Switch to Fedora 36
Browse files Browse the repository at this point in the history
The commit of fedora-coreos-config consumed here already assumes
Fedora 36 contents.
  • Loading branch information
LorbusChris committed Jun 7, 2022
1 parent 8c82b57 commit 56d93ee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ COPY manifests/ /manifests/
COPY bootstrap/ /bootstrap/
LABEL io.openshift.release.operator=true \
io.openshift.build.version-display-names="machine-os=Fedora CoreOS" \
io.openshift.build.versions="machine-os=411.35.0"
io.openshift.build.versions="machine-os=411.36.0"
ENTRYPOINT ["/noentry"]
8 changes: 4 additions & 4 deletions crio.repo
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[crio]
name=crio
type=rpm
baseurl=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.23/Fedora_35/
baseurl=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.23/Fedora_36/
gpgcheck=1
gpgkey=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.23/Fedora_35/repodata/repomd.xml.key
gpgkey=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.23/Fedora_36/repodata/repomd.xml.key
enabled=1
[cri-tools]
name=cri-tools
type=rpm-md
baseurl=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Fedora_35/
baseurl=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Fedora_36/
gpgcheck=1
gpgkey=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Fedora_35/repodata/repomd.xml.key
gpgkey=https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Fedora_36/repodata/repomd.xml.key
enabled=1
4 changes: 2 additions & 2 deletions manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include:
# OKD owned packages
- okd-packages.yaml

releasever: 35
releasever: 36
ref: fedora/${basearch}/coreos/okd
repos:
- fedora
Expand All @@ -32,7 +32,7 @@ packages:
- fedora-coreos-pinger

# We include hours/minutes to avoid version number reuse
automatic-version-prefix: "411.35.<date:%Y%m%d%H%M>"
automatic-version-prefix: "411.36.<date:%Y%m%d%H%M>"
# This ensures we're semver-compatible which OpenShift wants
automatic-version-suffix: "-"
mutate-os-release: "4.11"
Expand Down

0 comments on commit 56d93ee

Please sign in to comment.