From 91e3dc1532c3a3b4ff3854ca31a73fb48e0d8311 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 May 2024 05:13:18 +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 4c77995086..5ea7d5adb2 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.16.0-0.nightly-2024-05-07-025557" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-05-07-235628" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-05-07-025557" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-05-08-222442" From 0075eb45ae44051b97c87d77861d153cb0726e26 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 May 2024 05:13:19 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 20 +++++--------------- scripts/auto-rebase/commits.txt | 4 ++-- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 273a43dadf..a5481ceefc 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,17 +1,7 @@ -- cluster-network-operator embedded-component 4ce35caa8b689db45d65aae76881fd01ad5b46f1 to 21291740019b0ef308fdd090c229d12efce33c80 - - 6aa2f0f 2024-05-06T09:34:02+02:00 Check every MachineConfigPool for IPsec plugin existence +- oc image-arm64 941fe49866979576189f764217deae6029e15e9b to 1e4757fd86487950dc14b59a3379bb70fdcd9b4c + - 7f3ee03b 2024-04-30T16:33:41-07:00 OTA-1275: cli/admin/release/git: use optimized git flags -- kubernetes embedded-component d1ec84aa4c0ca46e90b22b364a62d38c78487c12 to 681e46bbc98c439e0915762fec0e98bb9cf1cc5c - - 8fc74eee3 2024-05-03T17:09:26-07:00 UPSTREAM: : Provide SCC access via RBAC - -- kubernetes image-amd64 d1ec84aa4c0ca46e90b22b364a62d38c78487c12 to 681e46bbc98c439e0915762fec0e98bb9cf1cc5c - - 8fc74eee3 2024-05-03T17:09:26-07:00 UPSTREAM: : Provide SCC access via RBAC - -- kubernetes image-arm64 d1ec84aa4c0ca46e90b22b364a62d38c78487c12 to 6c10b2df178d8497ea61ca6749a73b31fee740a7 - - ebe33c3c4 2024-05-07T10:49:06+02:00 UPSTREAM: : add native build to installer image - - 8fc74eee3 2024-05-03T17:09:26-07:00 UPSTREAM: : Provide SCC access via RBAC - -- service-ca-operator image-arm64 cb3093f23618be6898e540b97855450cc198db2d to 0e9c5426da942853a94e5f9242bd66d3f2b7fff8 - - da2d8c6 2024-04-18T15:10:17-04:00 fix replace - - a1de422 2024-02-21T15:23:10-05:00 apply hypershift cluster-profile +- service-ca-operator image-arm64 0e9c5426da942853a94e5f9242bd66d3f2b7fff8 to 538c7b98a689e573b61e1abb1cb649da470c5fac + - f406c2e 2024-05-08T09:18:21+02:00 go mod tidy && go mod vendor + - 73317e8 2024-03-12T18:25:23+00:00 Updating ose-service-ca-operator-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/688f7221d1f0f47c4a31c596c974186c1a1c61c5/images/ose-service-ca-operator.yml diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index d72f7255f1..684f88de64 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -26,7 +26,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 04d0a78154b45ce300e1768 https://github.com/openshift/ovn-kubernetes image-amd64 e7517c1c125d482c01e53baf0670ba777ca2c9d2 https://github.com/openshift/kubernetes image-amd64 681e46bbc98c439e0915762fec0e98bb9cf1cc5c https://github.com/openshift/service-ca-operator image-amd64 cb3093f23618be6898e540b97855450cc198db2d -https://github.com/openshift/oc image-arm64 941fe49866979576189f764217deae6029e15e9b +https://github.com/openshift/oc image-arm64 1e4757fd86487950dc14b59a3379bb70fdcd9b4c https://github.com/openshift/coredns image-arm64 f937ebfb6b8a31fc194597a1ade0e93e73e474b5 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 @@ -35,4 +35,4 @@ https://github.com/openshift/router image-arm64 56ab14f257e123317c00ce7ba5b4ecae https://github.com/openshift/kube-rbac-proxy image-arm64 04d0a78154b45ce300e176836bd47c6004603e88 https://github.com/openshift/ovn-kubernetes image-arm64 e7517c1c125d482c01e53baf0670ba777ca2c9d2 https://github.com/openshift/kubernetes image-arm64 6c10b2df178d8497ea61ca6749a73b31fee740a7 -https://github.com/openshift/service-ca-operator image-arm64 0e9c5426da942853a94e5f9242bd66d3f2b7fff8 +https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac From 4c944a2d11faaeee09f190b0a6c02610d0ddfeb8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 May 2024 05:13:50 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 455eb69468..80c1378f05 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:3026370ec5ff5d3bafad30af8d9f2843088cb9b184e7ecedb8dc199c48d9087d" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cce317c7fb456c067bdcb7f7afd3e951a6e23fa97a68b472727ca54db2a275d" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 9a9863b1a0c8ef79fa1daf814668ac13cdbc72e2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 May 2024 05:13:52 +0000 Subject: [PATCH 4/5] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 ++--- .../kustomization.aarch64.yaml | 10 ++++----- .../release-olm-aarch64.json | 8 +++---- assets/release/release-aarch64.json | 22 +++++++++---------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 987536e566..c074153690 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:42466d8108c08c7219eb8e50e60b7e27d0c73432d8b0b063e6a06d2b28b4ea41 + digest: sha256:c1cb0bde9c8832c036b59a1247647951ad22888ee27be527e47f1a87ba346956 - name: container-networking-plugins newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6d85d8b5bd6575252f8f363c248fb38df84617be4125a385a9d66d8ffc90c61d + digest: sha256:aa68223db8e915175cb1d9942bd2618ce11cbbe91ea92f094860a1b7a606aed3 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index edfa03d1ba..720633638e 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-05-07-235628" + "base": "4.16.0-0.nightly-arm64-2024-05-08-222442" }, "images": { - "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42466d8108c08c7219eb8e50e60b7e27d0c73432d8b0b063e6a06d2b28b4ea41", - "container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d85d8b5bd6575252f8f363c248fb38df84617be4125a385a9d66d8ffc90c61d" + "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1cb0bde9c8832c036b59a1247647951ad22888ee27be527e47f1a87ba346956", + "container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa68223db8e915175cb1d9942bd2618ce11cbbe91ea92f094860a1b7a606aed3" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 7b610df658..c1457ca5a8 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:dc5f4825688d8dee7fa8ac1ed46a26d9fec7304c0f90f66c17fee28e993f12bf + digest: sha256:9636e592c48c7a996b2d7347ae11d3238a70d45411b22488c5ab286bc37fa3b8 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ad46c0c4d070b171f52c51412b45bfb0e1ca3080faea8ab17e104b708495a31a + digest: sha256:674878f7f675bd7c60745f962e444b182b25f9393a81a52ba59552e409e65bc6 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6a8725f121224d014b55f6cfd31a91f54441b0f2ed2587f237571e0b3f25dbd3 + digest: sha256:3efa9cffb515812d7a79284e64d9f2cb203589ace5d7a3a720c4f9b897d4b8d8 patches: - patch: |- @@ -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:ad46c0c4d070b171f52c51412b45bfb0e1ca3080faea8ab17e104b708495a31a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:674878f7f675bd7c60745f962e444b182b25f9393a81a52ba59552e409e65bc6 - 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:dc5f4825688d8dee7fa8ac1ed46a26d9fec7304c0f90f66c17fee28e993f12bf + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9636e592c48c7a996b2d7347ae11d3238a70d45411b22488c5ab286bc37fa3b8 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 475b77b554..2c053179e3 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.16.0-0.nightly-arm64-2024-05-07-235628" + "base": "4.16.0-0.nightly-arm64-2024-05-08-222442" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc5f4825688d8dee7fa8ac1ed46a26d9fec7304c0f90f66c17fee28e993f12bf", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad46c0c4d070b171f52c51412b45bfb0e1ca3080faea8ab17e104b708495a31a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a8725f121224d014b55f6cfd31a91f54441b0f2ed2587f237571e0b3f25dbd3" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9636e592c48c7a996b2d7347ae11d3238a70d45411b22488c5ab286bc37fa3b8", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:674878f7f675bd7c60745f962e444b182b25f9393a81a52ba59552e409e65bc6", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efa9cffb515812d7a79284e64d9f2cb203589ace5d7a3a720c4f9b897d4b8d8" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 7b80f5dc23..f6a0cb814f 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-05-07-235628" + "base": "4.16.0-0.nightly-arm64-2024-05-08-222442" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52c5cb36de43798469f0742a9bc157799cb95240b0719d6842a9176f6b66e9c3", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65600e4617bca1acd3e17c00cdb44ae23dc9a56327dfedb7ba0071563c696e6d", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90c53910479054c69eae7b5e07aa1a4a72a834c4ec351c55e142b078f6e185d6", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a8725f121224d014b55f6cfd31a91f54441b0f2ed2587f237571e0b3f25dbd3", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e823f5508a821f7bd4ea5ca9f5553a3bb94af30b919659404cd8f0ec899f556e", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67fb2efb64a7fcaed1bb9626189119a695d8c74e2a5fa9f1f455ff18e06f4443", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec1badf0dbc6c6470ed5c5c28b7132f4e266f96d5bbff3dce9ac626cf376a5b8", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efa9cffb515812d7a79284e64d9f2cb203589ace5d7a3a720c4f9b897d4b8d8", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06e4c3d47feda77ea98a61e925e9519fa801482febaacfe9ab6c7db932e33943", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3026370ec5ff5d3bafad30af8d9f2843088cb9b184e7ecedb8dc199c48d9087d", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d36a6e8b942f951b4f1551c892637aa4bebedb8b5ad700f6ed40cf5c9e41809", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:171fcea4e66c5dc23cef4d7ca198959cc6d95766ac9faf5fe00baa288573be59", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cce317c7fb456c067bdcb7f7afd3e951a6e23fa97a68b472727ca54db2a275d", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4829d6cdcc28287d128b305db86eaca078cc5c7e92612ea0473e71836f18ff35", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdd7c620797846a3a441b6106fc41d0247368e8613516ae634922eb3d3f42392", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60135fe7527420bf498a6680685d57342f95d5c01b608938cb5eacb753244209", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d0d30779fd12fdfc2ffc0ac3734cf02623cae8241d71a461ca8bd91b0e65b34" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93acad1a4688d27bb231dcc78282c6bec428ad70e5a8cb23e330ee042a71b460", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8c08fc793bf130bb0e7fb8ef88fea2d97f851783c4e847b0e699d43089583c9", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5e7056c069b0aeb8631789da582a28ec3d14fd924e749da6296753b57f17470" } } From 1e5a0e38ddd9b697f04828624a6d96cd1a0e03eb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 May 2024 05:13:53 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.version.aarch64.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e95a2358a1..56f76d4fed 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2024-05-07-235628 +OCP_VERSION := 4.16.0-0.nightly-arm64-2024-05-08-222442