From 5a14bd6a8fc5ad27dd4e6a631430cdcf6a66bb77 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 21 Aug 2024 04:17:13 +0000 Subject: [PATCH 1/5] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 6750607f1f..155b1c200f 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-08-18-192734" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-08-18-233442" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-08-20-170445" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-08-21-002445" From 1a0c5b5a4808c0d283f6c33b8e3c5690e58c49dd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 21 Aug 2024 04:17:13 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 113f932c0d..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,15 +0,0 @@ -- cluster-openshift-controller-manager-operator embedded-component 3985c55f99e1ea013be2db096059c09b2ed98118 to accd87730fd3652584bef210626cab3b6d49271f - - 101c467 2024-05-08T15:49:44+05:30 OCPBUGS-33295, OCPBUGS-33296: updates opentelemetry packages - -- kubernetes embedded-component e82605653d24a933925b80debd6d2b7ab4ccfbc6 to 98fe96234f91093996b929e8c93f678756d56101 - - 923cec83e 2024-08-12T11:09:11+02:00 UPSTREAM: : Add OpenShift tooling, images, configs and docs - -- machine-config-operator embedded-component 2801dd2b31e893055e182391aeb74e455f1cf5a2 to 4bb028c4f2d0181b9647b48a286485bfc5774150 - - 70db920c 2024-08-12T18:41:15+00:00 Revert "MCD-pull: run after network-online.target in Azure" - -- coredns image-amd64 7d3fa777871ed2e5a70715e7f3e71d3f01785330 to fdd6037bf7380a48358b269d78bc8c61c311342c - - c950ff7 2024-07-23T14:18:28+00:00 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755 - -- kubernetes image-amd64 e82605653d24a933925b80debd6d2b7ab4ccfbc6 to 98fe96234f91093996b929e8c93f678756d56101 - - 923cec83e 2024-08-12T11:09:11+02:00 UPSTREAM: : Add OpenShift tooling, images, configs and docs - From 454b4f34b777dd37ccbb8260dc38afd29aabc36b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 21 Aug 2024 04:17:51 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 64cfc0591a..615b6f0577 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:efe42e291a648d7ad22e7c623bbf7406bda177c38e7f582499251a86a9dce706" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4398024b8aab3b6050940933f371cce29f1c270709d9f5e23c27405e2575c428" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index d65f51b095..a8a88546f0 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/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:db3910185cec338e2c8be35bf3f2bfbf3a4fa2dd024e315f1f068ff8d3cad32f" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e55f9d0ab1f69c1ab050400dd7fc06b8cfa3280354e4e59ec0d244e2b5f452e3" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From dc46a818b6deaba93e27f8775e7e03669217eebd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 21 Aug 2024 04:17:52 +0000 Subject: [PATCH 4/5] update manifests --- assets/release/release-aarch64.json | 22 +++++++++++----------- assets/release/release-x86_64.json | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index acc18389ff..bfea5f90ab 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2024-08-18-233442" + "base": "4.14.0-0.nightly-arm64-2024-08-21-002445" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d74a1dfa943100b3f649e84992350cc805860b52697f8d8c9e28ff275fece766", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6e7d580d865c72c58a4fe66af99868433207cb4a4182bc3edd7f22ed0722fd5", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:571a967940e4cdcaf151a90b61717401ccbf6fe80d2fc56f84dd98b9efbd5368", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b123198e782846b0abb397beb86fa9199793fe988a72aba0a62ec015c0537f2e", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:414f59d765cd0f505d3d0cf2b51e8d755cc88a4fe4757127ef082ff1a33525ad", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:94e911f75e7c737e64de590889db1c208ca238ffa54ee79da7abcaf5199f2aca", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:101ffd77e947ffdd30019571e243b9d7425eee5fdb25a6d4a16ed50756bf32fc", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e4260d7bf7b8a4306d44b326152ad5525776324db9078ad620ec453a2b3e135", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f85cbc80feaf0a96a01fe7c26373a66279a3791897a3795c9a588a224e0582e", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db3910185cec338e2c8be35bf3f2bfbf3a4fa2dd024e315f1f068ff8d3cad32f", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be003aa7e081becb8f7205f45638913d73850022ed0d2b66e82a97b8b5b203bb", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42d56cfe4d692772d02b8e416efb483aee5a2106aa34ccadc591fda9d0426cd5", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e55f9d0ab1f69c1ab050400dd7fc06b8cfa3280354e4e59ec0d244e2b5f452e3", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b860a39f33207f0f62f425ad7228d3fe42e04a5da085a92ecd041b34c6c686a6", "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:7c6f867b05ebe11b2c46383d50d24c37982bca078fdb9cdfe6b9c539e6cc6345", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7d6d9cd96b4aa2e3e72f96581088feaa450adcbd9be9cfe1cb619c447c45d97", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64fa52f54441e29b522a7c9f13149c075fd279a3b8dafb207e93d2e13ec02d29" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a700dd594dd25dd0b0d8f8f6cbf7feea2a92589ecadcdcb52695451cc62c7282", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:395552243d1790a0c511c62ee89dbc15207671397c45695bb9ec624006582e32", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:373768db99fa8c26255375a4a6a6c533c419b665b7fb080e8e6b974215c3673c" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 32005116b3..09bf425c94 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-08-18-192734" + "base": "4.14.0-0.nightly-2024-08-20-170445" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3201dcdd34d4197f0a92afaaa7c74ff0af7f57d1c3d9bbe83cd9131b7a427c89", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e055d9a92c03629b755ff42558f60d8a88d35aa6a7ab53b243d5fbc2b3c5c8a9", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13a44c62d9e27108d27e3fa1ef9776d42c90fff655dcadedcb764208543cc6c8", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce251e21dad42ee62554710a5cab2ecba7c20de32bfa4de3b40be42bf9f1b2ae", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b40ad8a600c6e0c1cc4930d4cc8e007bfe392ee424b0a4b80f47f63bed94c25a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3ee4e0ee7f0383523b7436eba74157995b64dfa42d77ee242a3f83d14d592bf", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2341aabf97c7485f78723021d89399697ea2d6199a60d467fe5c4b543db8291", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:611b632e832d993d95c0e38b2d7a3e3c723ff5b463413090f41060b865827c44", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9751c53240739ed8cf1954029adc60c8e628a282f9396083c72d4570d9daa09", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efe42e291a648d7ad22e7c623bbf7406bda177c38e7f582499251a86a9dce706", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:004d2557bfafee34a8db5a9f9db3fd9ab3634e75d92b045f4095a2465a4832f8", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:650cbb2364ee9525d571455d06a8c4e647f8c8468b3f300829c8766525aae458", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4398024b8aab3b6050940933f371cce29f1c270709d9f5e23c27405e2575c428", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d417dced0bb5626c25729ff483d8f390d083f7c3c651ddd0f20fd4bed72ca9d8", "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:a419e15342318f7e47a40733a10e64083ffb54460ef30dd09d2724c9d6650604", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51b6307b204bbca1ee98c47cdac5f013e860d6c47a0822943640c71774d249fe", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff09c1d3778a04ed0c8d13e487bc9e39f7c7d6c06c8ea7b30a75afab3099fba2" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3941c27d12eff08e280bb991db31186329129857f5bd14e2fbf25f63b5927859", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8d845981b1c5f1e9efc15132f23f1c6ed21d3cfb71eb969b6e57691b346d135", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fed230ce320e3a04fbdc65135571c46505f2d92eddd8f9e509db4afc1b0e3c85" } } From 13eaf8aee8b8fbc7f2c652ba4dc34748c07aba44 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 21 Aug 2024 04:17:53 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index d7ca6e679d..4c4b4ea91c 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2024-08-18-233442 +OCP_VERSION := 4.14.0-0.nightly-arm64-2024-08-21-002445 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 19a93259ce..b9a433f4b3 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2024-08-18-192734 +OCP_VERSION := 4.14.0-0.nightly-2024-08-20-170445