diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 22b42998fd..5647e8bf4a 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2024-05-09-233233 +OCP_VERSION := 4.14.0-0.nightly-arm64-2024-05-12-110958 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 82307db1b6..1f17df73f0 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2024-05-08-232852 +OCP_VERSION := 4.14.0-0.nightly-2024-05-10-212837 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 502ad6de04..23fbcacb10 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2024-05-09-233233" + "base": "4.14.0-0.nightly-arm64-2024-05-12-110958" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffef47121cd690f3b2016cb94af8b2014aac50cc378cfdab9e27591c621288b3", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:406f0b4cbe70650684dc44eaf39c12e6985e7c54cc4004d24efcb323f4887e66", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fff86d25e63f96eee91431a583a26cb82a811503f8b0d96815d588bb8417042", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42d8165730e24e6a4b120cee0567eb724d34e2ec4eaa1070a8ad80eb779c474f", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7709b7066f66b519e77a1e615e19958537930313b2a8e3d5bb20e6f3fb37b2b4", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4efd6f159326c742f4854a2ce52b3983ac58b6ef9861345fa8852a92f8499df", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c10dc91646e61dfb0c3222f39184bdaf7b2375a5190cd83782366b2cd8a1379", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 0cb6d0557b..49e4303381 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-2024-05-08-232852" + "base": "4.14.0-0.nightly-2024-05-10-212837" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49db0eed3d5d969ec4528d7f7d33797f12b67842b5ddf1106ddc3689735c76f5", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e46c7e0d8af569fab9fe948de968f21ddc0263b4ff246c917be53694755ad3e8", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c74efc7959189bc0af322d7092c26e87bae78127c5ba494931e62fef03d14bb", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e3d06707f6ba0c0ced664fa2c4f31deaabffb4e950ce9a027fb786c9efe537d", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3296b89f81f824dca30f8245a8424229ea6c6ab3b7d58f3d32dc668861a6a32a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecb873d4d4ac21b3a8aa48b98bcf6214f796a4bbc834d095b919e82ff27982fa", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2cdddc59047b295f52c470ec461d1a1a3610d2b05724e62879e0022d713add5c", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7860865c043ab3f16510f4246693e20bc61dbd1bcdee1917992a4461a88a8012", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8136bf3d40a77a272e2f08f4e7f83569f9c42afadb5981e148b49f1c4d7929a2", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88c834d35e735f86ae61e2a6339870dfdfa6fa47efdc12f2bb977dea06791279", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bdca4e6d8e452061cfb16978d85235dcfe329ae120d7528db4ed043353e759f", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33084541533347f29a642a863042b007c372a39cca42645c9add98aba21a451c", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80508d71cdefd1111e0ad05f1dd006d8896fc3e56e814dd1eb588cd40a04f1de", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:829a8e4d34404abbd22fddb6ebfa0f74daa55f2697fb147da77b83fc8b473d8c", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:7ee0257998b7f804fcde9c095b4dc240c510eb316d7223e8485f701b5c9f2fbf", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:b453a5c76ba4e975a978e31a51531b1d6233723b0d944622caf7844dedf9ad5a", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9722ed11f7c5039cc0e452f0db45788ed79247bbd951b135f1f48240ec033b9e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d16c72a1ddfca4f6ffb7ad1cff5d50521e00fe19f47e457dc059e548e1de434a", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6879d223beb7aa8796b2beb1de5f9e0ee47e1113e367fe3470215c3778d3c3cf" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69a57f5f715a61d8f525e3e8c1ab638a3f03f2128be78b80460388bbef152575", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a62fe2bd0f0139c0f2780835ad264986918d25b99e0e90d164d40ce0dfae7b2", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c304233953429c4ce953fdd0b6eaf2063b855dd67e6006d0ba6440bbbc6517fc" } } diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 54672ca803..09dd9e5b9c 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88c834d35e735f86ae61e2a6339870dfdfa6fa47efdc12f2bb977dea06791279" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33084541533347f29a642a863042b007c372a39cca42645c9add98aba21a451c" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 5f80e0c711..97412ca607 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,8 @@ -- router image-arm64 e1e59b3337700e2b94c8d5c5e5414519f9785614 to e17abdff0095edee65e3be926f98b758aa3c87bb +- router image-amd64 e1e59b3337700e2b94c8d5c5e5414519f9785614 to e17abdff0095edee65e3be926f98b758aa3c87bb - f0ad69e 2024-05-08T07:45:09+00:00 OCPBUGS-29690: Count active services before setting weight to 1 +- ovn-kubernetes image-arm64 255b35826c736426a2f39ea1bbc72adeb19cf1e6 to 9e8b26ff12e0bd2b22a0e0d8262c561b7d828e17 + - 07b0774 2024-05-08T14:17:27-04:00 bump OVS version + - 21431f2 2024-05-07T16:33:20+02:00 Fix endpoint selection for externalTrafficPolicy=local + - f918596 2024-04-10T15:33:57+02:00 Full implementation of KEP-1669 ProxyTerminatingEndpoints + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ee25c5d5de..a19d6471f5 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -20,7 +20,7 @@ https://github.com/openshift/coredns image-amd64 7d3fa777871ed2e5a70715e7f3e71d3 https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541 -https://github.com/openshift/router image-amd64 e1e59b3337700e2b94c8d5c5e5414519f9785614 +https://github.com/openshift/router image-amd64 e17abdff0095edee65e3be926f98b758aa3c87bb https://github.com/openshift/kube-rbac-proxy image-amd64 1a646b98d8864e53accb726531d86f084ab13977 https://github.com/openshift/ovn-kubernetes image-amd64 255b35826c736426a2f39ea1bbc72adeb19cf1e6 https://github.com/openshift/kubernetes image-amd64 fd36fb9acf9a99270f4fca3f5817fd52c8bc58b4 @@ -32,6 +32,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/router image-arm64 e17abdff0095edee65e3be926f98b758aa3c87bb https://github.com/openshift/kube-rbac-proxy image-arm64 1a646b98d8864e53accb726531d86f084ab13977 -https://github.com/openshift/ovn-kubernetes image-arm64 255b35826c736426a2f39ea1bbc72adeb19cf1e6 +https://github.com/openshift/ovn-kubernetes image-arm64 9e8b26ff12e0bd2b22a0e0d8262c561b7d828e17 https://github.com/openshift/kubernetes image-arm64 fd36fb9acf9a99270f4fca3f5817fd52c8bc58b4 https://github.com/openshift/service-ca-operator image-arm64 3c3f82f7112ee4b5656e5c554f9887acdf881175 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 9bec00830e..01ed3c298c 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-05-08-232852" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-05-09-233233" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-05-10-212837" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-05-12-110958"