diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 21133e852b..962d23936a 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-05-230942 +OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-06-223044 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 82125e3399..37ed177191 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-2023-06-05-164816 +OCP_VERSION := 4.13.0-0.nightly-2023-06-06-194351 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index b61dcd64b6..7c0d9481c4 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,11 +1,11 @@ { "release": { - "base": "4.13.0-0.nightly-arm64-2023-06-05-230942" + "base": "4.13.0-0.nightly-arm64-2023-06-06-223044" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:735f70c9a041a4a960723c847debee91b3ca95050f00d651c723f4c37f4666af", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:011ab195a192346c1af6012deff8651ffc51e293559d5ac99ee0f6a93a5976f4", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d55d026aaa5cf82c2d292fce43f3feb20b51a6cf92aaebf02f518325d7856e82", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bb4dcffd4313b4a2b71a2e6feddced31ef5c7101fd637ccef584bf4cc4ee7a8", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c95a513fea425ceb0cae260310d68973b8a78f9ebdf29e9547d8150eed174ba", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:264a1f06d6b92dcbe73d07fa71fcdca40aec9e01f52cb35e0614948fac03a9c3", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index be05dd6c0f..85d9562e9a 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,11 +1,11 @@ { "release": { - "base": "4.13.0-0.nightly-2023-06-05-164816" + "base": "4.13.0-0.nightly-2023-06-06-194351" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a53b9de5f1ebf995a053f9ea36126339fe0c943cd8bfedf9f197c4f5b4356d70", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6887eeea92da94a928ed5d4079767c7a821406ef4742ae96822e967f3d62a9cb", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2572af11342785cfe626632c098e6dadd7417cebceb1e14e8482b1f7c8ae3bb8", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9580dd59a2ebc861cb57c614b710f4c7ba0dbe045d3913bd69fdeb1729af9ef", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2c996db015285504e1203f33beb5385e9efbe93c34cc4ea69bab6fe5f9df0e4", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc4532552cb43368eca38f79f84f020e28e75df1397d488815ba3110fefc90f4", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..ceb02a1cdc 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,8 @@ +# router image-amd64 e28644631982fb4596e065d3ae85099f0886829d to 065deab84f342615db2d2f5c78a19ae04bb43912 +9af59fceebfe478ed69fede910e5a5d92ae586bf 2023-05-23T15:10:16+00:00 Revert to pkix.CertificateList instead of x509.RevocationList +971e6124169ec10e6e6aa9e39002066cf025f10d 2023-05-23T15:10:16+00:00 Cache current CRLs in memory instead of re-parsing from disk +876f51adeed692dc01009d15972884190360c3a1 2023-05-23T15:10:16+00:00 Download and manage CRLs in openshift-router +# router image-arm64 e28644631982fb4596e065d3ae85099f0886829d to 065deab84f342615db2d2f5c78a19ae04bb43912 +9af59fceebfe478ed69fede910e5a5d92ae586bf 2023-05-23T15:10:16+00:00 Revert to pkix.CertificateList instead of x509.RevocationList +971e6124169ec10e6e6aa9e39002066cf025f10d 2023-05-23T15:10:16+00:00 Cache current CRLs in memory instead of re-parsing from disk +876f51adeed692dc01009d15972884190360c3a1 2023-05-23T15:10:16+00:00 Download and manage CRLs in openshift-router diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index e2de7c2ef7..e68078728c 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -14,14 +14,14 @@ https://github.com/openshift/route-controller-manager embedded-component 6667a6c https://github.com/openshift/service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a https://github.com/openshift/oc image-amd64 05d83eff7e17160e679898a2a5cd6019ec252c49 https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb -https://github.com/openshift/router image-amd64 e28644631982fb4596e065d3ae85099f0886829d +https://github.com/openshift/router image-amd64 065deab84f342615db2d2f5c78a19ae04bb43912 https://github.com/openshift/kube-rbac-proxy image-amd64 11b1439d48a47a408ae7e2dd851989f7b7b4f595 https://github.com/openshift/ovn-kubernetes image-amd64 a69523609f7bbfa2a487e0d1bef52e194c282f90 https://github.com/openshift/kubernetes image-amd64 7a891f05c7beb9527024c7616d95f6ff5c309f27 https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a https://github.com/openshift/oc image-arm64 05d83eff7e17160e679898a2a5cd6019ec252c49 https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb -https://github.com/openshift/router image-arm64 e28644631982fb4596e065d3ae85099f0886829d +https://github.com/openshift/router image-arm64 065deab84f342615db2d2f5c78a19ae04bb43912 https://github.com/openshift/kube-rbac-proxy image-arm64 11b1439d48a47a408ae7e2dd851989f7b7b4f595 https://github.com/openshift/ovn-kubernetes image-arm64 a69523609f7bbfa2a487e0d1bef52e194c282f90 https://github.com/openshift/kubernetes image-arm64 7a891f05c7beb9527024c7616d95f6ff5c309f27 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index d7fdd1059b..88453076ce 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.13.0-0.nightly-2023-06-05-164816" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-05-230942" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-06-06-194351" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-06-223044" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"