diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index afdf307443..15999b0dd1 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-10-233714 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-11-220225 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 96d3195fad..4e0c23d6d0 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2024-07-09-221327 +OCP_VERSION := 4.17.0-0.nightly-2024-07-11-154858 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 1da16c6001..6e7d606638 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-10-233714" + "base": "4.17.0-0.nightly-arm64-2024-07-11-220225" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b9f3ed107b736e87a74b8f9f2d9c98ef022f4e599ba1475a10816c00b528a81", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 4ffc7e5b34..acdeec8228 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-2024-07-09-221327" + "base": "4.17.0-0.nightly-2024-07-11-154858" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:993cc8b6336d06dcabdfa4b22f295f9b3211e054c7020f8d2cf411a54fc795ab", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index b483e97bb2..66250bcc3b 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d8442abc5b86b5256128f77cb8d266c56c610b98727988893671f71a1dd3fece + digest: sha256:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e8b90cb27650065b8d5618fa0063d5519ed8991e70b693c74110d061422019cd + digest: sha256:d37df72a476a4fb5e247b007d6db6f18e4962741d4415e5607036fdb54916444 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8b90cb27650065b8d5618fa0063d5519ed8991e70b693c74110d061422019cd + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d37df72a476a4fb5e247b007d6db6f18e4962741d4415e5607036fdb54916444 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8442abc5b86b5256128f77cb8d266c56c610b98727988893671f71a1dd3fece + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 233e0081dd..8e6af022fb 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a7f072e77ce81ae9e69ba9df5d97646276a978bf631c801207daf1c6ce8a3794 + digest: sha256:69e1a347e2cf27adbe679981edafbd1062ca1e8566479de6dc528648a7fb6705 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ec4d8719fabdab099f374aba55d88b4dbd101f98e2a07c9c881a379946774cfb + digest: sha256:ae0b49f0f349fc6729539d68763e3b1432f0ae2f4083db4dc8b7fb0b62ba1802 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:cc2e02535158da03168faa2808c5a12c0cd1593533382d1b29f4c5d6fcfc3602 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec4d8719fabdab099f374aba55d88b4dbd101f98e2a07c9c881a379946774cfb + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae0b49f0f349fc6729539d68763e3b1432f0ae2f4083db4dc8b7fb0b62ba1802 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7f072e77ce81ae9e69ba9df5d97646276a978bf631c801207daf1c6ce8a3794 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69e1a347e2cf27adbe679981edafbd1062ca1e8566479de6dc528648a7fb6705 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 33970aa917..5d15cbcfb5 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-10-233714" + "base": "4.17.0-0.nightly-arm64-2024-07-11-220225" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8442abc5b86b5256128f77cb8d266c56c610b98727988893671f71a1dd3fece", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8b90cb27650065b8d5618fa0063d5519ed8991e70b693c74110d061422019cd", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d37df72a476a4fb5e247b007d6db6f18e4962741d4415e5607036fdb54916444", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 8108be8171..fd3323fd80 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-2024-07-09-221327" + "base": "4.17.0-0.nightly-2024-07-11-154858" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7f072e77ce81ae9e69ba9df5d97646276a978bf631c801207daf1c6ce8a3794", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec4d8719fabdab099f374aba55d88b4dbd101f98e2a07c9c881a379946774cfb", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69e1a347e2cf27adbe679981edafbd1062ca1e8566479de6dc528648a7fb6705", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae0b49f0f349fc6729539d68763e3b1432f0ae2f4083db4dc8b7fb0b62ba1802", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc2e02535158da03168faa2808c5a12c0cd1593533382d1b29f4c5d6fcfc3602" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 6f20108ea4..202d0484e4 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-10-233714" + "base": "4.17.0-0.nightly-arm64-2024-07-11-220225" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9486a7f6436d4f4783bc27420b3d481cf9560e228ea701ec781aa5c72475978", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:319490525c6351b11f6646653d444f85428d08ade8521ad453990302e4afd41b", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76866dfe083fddfeb6c01782050ddb66580bccb0b0e659fcfda20823dad261d0", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:659ca58144cdf5a0a3b0d2e5d1c4c1a4b2a3ebbeb9c8c9364943504a658f4fc8", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:478745b3283d6cca5537b65bcfb5e8cffefc12c02795dc747e187add23016dfb", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c61a847436e73293ba6b1b821c87472e920b1944cbc6c2d285d9f2e5ddc8f89e", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d47677da68854575c87f0b545d6fde48135b10facf94f448c631cceca606914", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ff7539db47ad662df593fc13c4a95d73f4dc603e8743760063de1367725a731", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index b2e9992569..766519bb57 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,11 +1,11 @@ { "release": { - "base": "4.17.0-0.nightly-2024-07-09-221327" + "base": "4.17.0-0.nightly-2024-07-11-154858" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9250065a3a18b749588f3cdf01f22447d66cf65a7557f481446671d7245fcd04", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:280bcb34ddef25554a1c2f12c87de85fa91c2907dce36e54edbb1210c35567f7", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec61845fa9729701a7175ea1a9863c1f107b443ef206ec5b6faf931bf18f5b2c", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:881652d6daf58b9a7a9d186ec4f9d6c984921e3a86d46ecafa6da92b7f584bd4", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc2e02535158da03168faa2808c5a12c0cd1593533382d1b29f4c5d6fcfc3602", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:adb7f2c008bf38d587a38e216de79814ffaefa242e90bb4e09604778b78a9298", diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 9ea3952eb6..2ea3a29f28 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.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:c61a847436e73293ba6b1b821c87472e920b1944cbc6c2d285d9f2e5ddc8f89e" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d47677da68854575c87f0b545d6fde48135b10facf94f448c631cceca606914" 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 537f1ef27e..bfbbd923c0 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,24 +1,29 @@ -- api embedded-component 33ed71ab039fca2a3292968abddde1065bf61784 to 329ea37556495281bb92beae131a449e798a4380 - - a4504d1 2024-07-03T13:44:31+05:30 Update placementGroupPartition to pointer - - 36495ac 2024-07-02T12:55:16-06:00 FeatureGateAWS added +- api embedded-component 329ea37556495281bb92beae131a449e798a4380 to 465787efd0d69f12beaad9410a3812d823e78c2b + - 2cc2fb7 2024-07-08T14:42:19-04:00 NE-1530: IngressController LB Subnet Selection in AWS -- cluster-network-operator embedded-component e3fd660cc7920e0512ea358ccc88588173e5dbb6 to 1cd8678b38fb0b7ac51fae98fc512e7224bc5965 - - 25784c4 2024-07-05T08:50:22+02:00 network: regen CRDs with controller-gen 0.15.0 - - ea114d7 2024-07-05T08:49:21+02:00 ipam, virt: enable the feature depending on openshift feat gate - - ea8deac 2024-06-10T16:57:57+00:00 Fix IC distributed control plane alerts +- cluster-ingress-operator embedded-component a5b1a32aa89bf183341aae32b2134a36513ad358 to f0722916474a5ca78ba8e14fafc793988be14850 + - 1ae7e8c 2024-07-02T19:47:50-04:00 Delete & recreate canary route to clear spec.host -- operator-framework-olm embedded-component e988d05124bf81bd9dfaf89f6473e5e4adba22c9 to 6e34f41a6856ecc6b17129bd7d3370c0de1255d3 - - 4b28f596 2024-07-03T16:22:06+08:00 Update operator-framework-tools.Dockerfile - - 8b98b631 2024-07-03T11:20:49+08:00 Update operator-framework-tools.Dockerfile +- cluster-kube-apiserver-operator embedded-component a88d4ae8e0a9c8d3457e8488d9da7f04680240d3 to 890ef6e36bc331247d64c3d2a34619eb8e604e54 + - d6e9553 2024-07-10T13:44:04+02:00 p/o/podsecurityreadinesscontroller: add disabled syncer + - acf9f46 2024-07-10T13:44:03+02:00 p/o/psreadinesscontroller: make ctrl owner aware + - 3e89c96 2024-07-04T16:46:51+02:00 p/o/psreadinesscontroller: minor refactoring -- oc image-amd64 e3a4fad528bca4fc8d9b832e442e0847ce63c721 to a2e5b09d7d14b77c14f1b32550f8c5a0328e73b3 - - fb18fb8e 2024-06-24T10:31:36-07:00 pkg/cli/admin/upgrade/rollback: Drop this command - - e77658e7 2024-06-20T07:35:30-04:00 Inject ReleaseArch into openshift-install +- machine-config-operator embedded-component 0f53196f6480481d3f5a04e217a143a56d4db79e to a1213dbb6b25f634494e17c7c30d9605558565be + - b16f1b50 2024-07-10T13:23:23-04:00 OCPBUGS-35436: Remove disable-mglru.service + - 42a2e797 2024-07-08T19:20:08-04:00 templates: run disable-mglru conditionally -- oc image-arm64 e3a4fad528bca4fc8d9b832e442e0847ce63c721 to a2e5b09d7d14b77c14f1b32550f8c5a0328e73b3 - - fb18fb8e 2024-06-24T10:31:36-07:00 pkg/cli/admin/upgrade/rollback: Drop this command - - e77658e7 2024-06-20T07:35:30-04:00 Inject ReleaseArch into openshift-install +- operator-framework-olm embedded-component 6e34f41a6856ecc6b17129bd7d3370c0de1255d3 to 79f360bfe22a46a390f578a239f909f5faaf954c + - 79fd14fa 2024-07-11T00:03:16+00:00 mark flaky test as flaky (#3340) + - e84d34d6 2024-07-10T00:03:31+00:00 build(deps): bump golang.org/x/net from 0.26.0 to 0.27.0 (#3341) -- router image-arm64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 to 467f906b561be9faa422b30339a7a3d939782a67 +- router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 to a7313722c6e0541fcc00e92c459dd5d32a4a1534 - 4b3e265 2024-05-25T18:01:19+00:00 Updating openshift-enterprise-haproxy-router-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/openshift-enterprise-haproxy-router.yml + - 889bddf 2024-05-25T13:14:15+00:00 Updating ose-haproxy-router-base-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-haproxy-router-base.yml + +- router image-arm64 467f906b561be9faa422b30339a7a3d939782a67 to a7313722c6e0541fcc00e92c459dd5d32a4a1534 + - 889bddf 2024-05-25T13:14:15+00:00 Updating ose-haproxy-router-base-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-haproxy-router-base.yml + +- kubernetes image-arm64 421e90ed9ef07c1a797386e662255dfb830a6b9f to 61de516d1eb19a8e392045f2e1dbcf3bf8e8580c + - 76b0e3eab 2024-07-09T18:12:04+02:00 UPSTREAM: : inject k8s version from hyperkube Dockerfile diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 71947f4bb0..d612c08191 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,8 +1,8 @@ -https://github.com/openshift/api embedded-component 329ea37556495281bb92beae131a449e798a4380 +https://github.com/openshift/api embedded-component 465787efd0d69f12beaad9410a3812d823e78c2b https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 3bd59c8d4e96176aa8db2f5ce84e731354838243 https://github.com/openshift/cluster-dns-operator embedded-component 3c5bb64b9b5f9b4c3132c4c38d74155037009370 -https://github.com/openshift/cluster-ingress-operator embedded-component a5b1a32aa89bf183341aae32b2134a36513ad358 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a88d4ae8e0a9c8d3457e8488d9da7f04680240d3 +https://github.com/openshift/cluster-ingress-operator embedded-component f0722916474a5ca78ba8e14fafc793988be14850 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 890ef6e36bc331247d64c3d2a34619eb8e604e54 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0a9ed573e35751455bfb24842fd2de0b05379ed0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 98ca953ba6955401023e219f37e0af49879355d2 https://github.com/openshift/cluster-network-operator embedded-component 1cd8678b38fb0b7ac51fae98fc512e7224bc5965 @@ -12,9 +12,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 43de97b https://github.com/openshift/etcd embedded-component 1fb3165305efc8d986344b555b22592e6e6c1786 https://github.com/openshift/kubernetes embedded-component 421e90ed9ef07c1a797386e662255dfb830a6b9f https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 -https://github.com/openshift/machine-config-operator embedded-component 0f53196f6480481d3f5a04e217a143a56d4db79e +https://github.com/openshift/machine-config-operator embedded-component a1213dbb6b25f634494e17c7c30d9605558565be https://github.com/openshift/openshift-controller-manager embedded-component dc54a288f78e85e880ee37da2877629efd65c8c6 -https://github.com/openshift/operator-framework-olm embedded-component 6e34f41a6856ecc6b17129bd7d3370c0de1255d3 +https://github.com/openshift/operator-framework-olm embedded-component 79f360bfe22a46a390f578a239f909f5faaf954c https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-amd64 a2e5b09d7d14b77c14f1b32550f8c5a0328e73b3 @@ -22,7 +22,7 @@ https://github.com/openshift/coredns image-amd64 f80a0b3882f36832a33f07b72000795 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 -https://github.com/openshift/router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 +https://github.com/openshift/router image-amd64 a7313722c6e0541fcc00e92c459dd5d32a4a1534 https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216 https://github.com/openshift/ovn-kubernetes image-amd64 1d4ea50a317fa4a1fd01122a6c2cab5e76b01e97 https://github.com/openshift/kubernetes image-amd64 421e90ed9ef07c1a797386e662255dfb830a6b9f @@ -32,8 +32,8 @@ https://github.com/openshift/coredns image-arm64 f80a0b3882f36832a33f07b72000795 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 -https://github.com/openshift/router image-arm64 467f906b561be9faa422b30339a7a3d939782a67 +https://github.com/openshift/router image-arm64 a7313722c6e0541fcc00e92c459dd5d32a4a1534 https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216 https://github.com/openshift/ovn-kubernetes image-arm64 1d4ea50a317fa4a1fd01122a6c2cab5e76b01e97 -https://github.com/openshift/kubernetes image-arm64 421e90ed9ef07c1a797386e662255dfb830a6b9f +https://github.com/openshift/kubernetes image-arm64 61de516d1eb19a8e392045f2e1dbcf3bf8e8580c https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 45b48c7129..7a6e94b55f 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.17.0-0.nightly-2024-07-09-221327" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-10-233714" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-11-154858" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-11-220225"