Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-08-19-025745_amd64-2024-08-19_arm64-2024-08-20 #3795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
microshift-rebase-script wants to merge 4 commits into from
Closed

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-08-19-025745_amd64-2024-08-19_arm64-2024-08-20 #3795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ef7699
update last_rebase.sh
Aug 21, 2024
9ab2695
update component images
Aug 21, 2024
1697768
update manifests
Aug 21, 2024
2e4c66b
update buildfiles
Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-08-19-001830
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-08-20-184926
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-2024-08-18-202010
OCP_VERSION := 4.15.0-0.nightly-2024-08-19-025745
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b
digest: sha256:d5e1287cd0ba44466fb2cbfe6fe4b30853e66bcc305f350e2d22935c34e59e86
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d
digest: sha256:677a5e8fe58683126b15d66faaf59fba0639d2020011aea5875c7e570860e1cc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:90f28c6db1bd814bfdf04d5d1f11de050c90629e03d3dc15aed668adf2b97e24
digest: sha256:014a7093733834d0c6860df666f562d2f7c37369d6feaa22aa3884ed98949e22

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:677a5e8fe58683126b15d66faaf59fba0639d2020011aea5875c7e570860e1cc
- 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:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5e1287cd0ba44466fb2cbfe6fe4b30853e66bcc305f350e2d22935c34e59e86
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-08-19-001830"
"base": "4.15.0-0.nightly-arm64-2024-08-20-184926"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90f28c6db1bd814bfdf04d5d1f11de050c90629e03d3dc15aed668adf2b97e24"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5e1287cd0ba44466fb2cbfe6fe4b30853e66bcc305f350e2d22935c34e59e86",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:677a5e8fe58683126b15d66faaf59fba0639d2020011aea5875c7e570860e1cc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:014a7093733834d0c6860df666f562d2f7c37369d6feaa22aa3884ed98949e22"
}
}
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-08-18-202010"
"base": "4.15.0-0.nightly-2024-08-19-025745"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f",
Expand Down
22 changes: 11 additions & 11 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-08-19-001830"
"base": "4.15.0-0.nightly-arm64-2024-08-20-184926"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efc54fd99b86fd49a6d02efd073aad9cda04ea8c985bd985f67cfabccdfdd7d7",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fc7e89bececb5158f03a2b77ce339b00fb240f76602a6a3cb88548dc4a753e9",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:594451364463fe99b04fb36b2ca8ae848805d9b234b7e14f6698859491224cf9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90f28c6db1bd814bfdf04d5d1f11de050c90629e03d3dc15aed668adf2b97e24",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d50f944bd4e96c58aa6c89e7902c62fa0a72171d6dfe098bd6d20a0a657a6f1",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f90998dac2652c4a92a48129f3a11606f66ad34f3c87de910346524b8408016a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7522d3521c758119d2d54718838114c3b9f7a20774c09760307483abb494387e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:014a7093733834d0c6860df666f562d2f7c37369d6feaa22aa3884ed98949e22",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d74a4745b3208ce5af07ff10de4d9138216737ef2afda1572e536adc1e04db8b",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80b1e5adc0d1cbf3a51a773d0c660ae6f94780a0c64b165a3a773ed0a1745320",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7b46cbb0e1b50ef6844d44361f13b8abef737ba6d86e7fd5f165919c55e7f78",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75dc168f6eccd0d4a8d066665f40b53c8e51d7292d72c478d620a75c7a98c2ad",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37a7a50e9249a4d733d5583749f9e60e55fa8ae62758a7a080508b05b75bff6a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:040b6d1274fd92c7100452e3663aeffc4d615266c6145dd4be324d8196df7bc1",
"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:6884e1a297cf8f0d6675466437c3db273af282006ac79e9bf321fd19387f375d",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:976b9b88fb3fa571e203e66c431251d4c864a1b46bed713d44256dd7c2e9a1ba",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74c9f0bfc57654a2be6e69b54f5ffdcdcc253571feb0e5c8fd08baad81c47488"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26f213d4c4a5a1119e2badd234564e7f10c6935d08dd60ed6e1753415e1b7fd1",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08c83c13dfae7671ae60eed8236779aaceb3ccecce6dfa2d8d37a45599a32449",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4b42fc2ddc5353dcddd8a3e6f57744b4133b255d4e0efc48ed24d0a44302ec6"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-08-18-202010"
"base": "4.15.0-0.nightly-2024-08-19-025745"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bb60567d8656acb417e5c02c5ad2effde241e88803ff94ec73aed0e3f67c608",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:80b1e5adc0d1cbf3a51a773d0c660ae6f94780a0c64b165a3a773ed0a1745320"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37a7a50e9249a4d733d5583749f9e60e55fa8ae62758a7a080508b05b75bff6a"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-08-18-202010" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-08-19-001830"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-08-19-025745" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-08-20-184926"