Skip to content
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

etcd to golang-1.22 #5441

Merged
merged 1 commit into from
Sep 26, 2024
Merged

etcd to golang-1.22 #5441

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
4 changes: 2 additions & 2 deletions images/ose-etcd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ content:
ci_alignment:
streams_prs:
ci_build_root:
stream: rhel-9-golang-1.21-ci-build-root
stream: rhel-9-golang-ci-build-root
okd_alignment:
dockerfile: Dockerfile.rhel
distgit:
Expand All @@ -42,7 +42,7 @@ enabled_repos:
for_payload: true
from:
builder:
- stream: rhel-9-golang-1.21
- stream: rhel-9-golang
member: openshift-enterprise-base-rhel9
labels:
License: Apache 2.0
Expand Down
12 changes: 6 additions & 6 deletions images/ose-installer-etcd-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ content:
streams_prs:
enabled: false
ci_build_root:
stream: rhel-9-golang-1.21-ci-build-root
stream: rhel-9-golang-ci-build-root
okd_alignment:
dockerfile: Dockerfile.installer
distgit:
Expand All @@ -44,11 +44,11 @@ from:
builder:
# IMPORTANT: etcd has unique approval to track its own etcd version. Other repos need arch
# approval to diverge from what kube apiserver uses for a given release.
- stream: rhel-9-golang-1.21
- stream: rhel-9-golang-1.21
- stream: rhel-9-golang-1.21
- stream: rhel-9-golang-1.21
- stream: rhel-9-golang-1.21
- stream: rhel-9-golang
- stream: rhel-9-golang
- stream: rhel-9-golang
- stream: rhel-9-golang
- stream: rhel-9-golang
member: openshift-enterprise-base-rhel9
labels:
License: GPLv2+
Expand Down
24 changes: 0 additions & 24 deletions streams.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,30 +133,6 @@ rhel-9-golang-1.21-ci-build-root:
transform: rhel-9/ci-build-root
upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.21-openshift-{MAJOR}.{MINOR}

# IMPORTANT: etcd has unique approval to track its own etcd version. Other repos need arch
# approval to diverge from what kube apiserver uses for a given release.
etcd_golang:
image: openshift/golang-builder:v1.19.13-202408070335.gfa00de2.el8
mirror: true
# No transform required as etcd does not yum install any packages.
# Leave this upstream information in place even if mirror/transform is disabled. Test Platform read the data.
upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-etcd-golang-1.19
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-etcd-golang-1.19
# To ensure consistency in our builds and allow CI to use the same build, mirror the upstream builder image from ocp/builder to ocp-private/builder-priv.
upstream_image_mirror:
- registry.ci.openshift.org/ocp-private/builder-priv:rhel-8-etcd-golang-1.19

etcd_rhel9_golang:
image: openshift/golang-builder:v1.19.13-202408070451.g3172d57.el9
mirror: true
# No transform required as etcd does not yum install
# Leave this upstream information in place even if mirror/transform is disabled. Test Platform read the data.
upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-etcd-golang-1.19
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-etcd-golang-1.19
# To ensure consistency in our builds and allow CI to use the same build, mirror the upstream builder image from ocp/builder to ocp-private/builder-priv.
upstream_image_mirror:
- registry.ci.openshift.org/ocp-private/builder-priv:rhel-9-etcd-golang-1.19

rhel8:
# the most recent release at present. since we yum update this, it does not need to float.
# it is important that we not build from unreleased builds and publish them.
Expand Down
Loading