Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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-21-182413
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
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-21-233556
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:d0777ac76beb8c7ec347c7678552727f1b35463f8b7e0892369539d60db6ff4e
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d
digest: sha256:6029176b3e9ae4fe065bc9148cef20dcfb0747a5382f577ce20a6d92e38f9aa3
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:90f28c6db1bd814bfdf04d5d1f11de050c90629e03d3dc15aed668adf2b97e24
digest: sha256:eb2aa583026f6bc72e30907cabc5a3602a049a3988ece9ee48405de8eb7a0d94

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:6029176b3e9ae4fe065bc9148cef20dcfb0747a5382f577ce20a6d92e38f9aa3
- 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:d0777ac76beb8c7ec347c7678552727f1b35463f8b7e0892369539d60db6ff4e
target:
kind: Deployment
labelSelector: app=catalog-operator
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:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f
digest: sha256:a733988fd919248066cf5cfbea50bfec4e3be3b03c41361fe7b824ccd539c842
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893
digest: sha256:3f642a726b18713143acb1cb925076022f3a2f92036abc1d17919d8fbd6b30cb
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff
digest: sha256:9d82f824c6e96602bc4b423d11f31998bb0789b8a7d9ab820997270c9f93b43c

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:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f642a726b18713143acb1cb925076022f3a2f92036abc1d17919d8fbd6b30cb
- 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:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a733988fd919248066cf5cfbea50bfec4e3be3b03c41361fe7b824ccd539c842
target:
kind: Deployment
labelSelector: app=catalog-operator
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-21-182413"
},
"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:d0777ac76beb8c7ec347c7678552727f1b35463f8b7e0892369539d60db6ff4e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6029176b3e9ae4fe065bc9148cef20dcfb0747a5382f577ce20a6d92e38f9aa3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb2aa583026f6bc72e30907cabc5a3602a049a3988ece9ee48405de8eb7a0d94"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-08-18-202010"
"base": "4.15.0-0.nightly-2024-08-21-233556"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a733988fd919248066cf5cfbea50bfec4e3be3b03c41361fe7b824ccd539c842",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f642a726b18713143acb1cb925076022f3a2f92036abc1d17919d8fbd6b30cb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d82f824c6e96602bc4b423d11f31998bb0789b8a7d9ab820997270c9f93b43c"
}
}
22 changes: 11 additions & 11 deletions assets/release/release-aarch64.json
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-21-182413"
},
"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:8860fe46b8eb0d334a43da15c98d27061dba77a6f1eebe08e52d027e48a92962",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e02fc11ec5b281737832fd65b66eb77dd3d214fd40e8e10f943a6df2d71aafe",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:152b6e161627dd496dcdde848e64482874c2f321f87711e7212372dcaf760126",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb2aa583026f6bc72e30907cabc5a3602a049a3988ece9ee48405de8eb7a0d94",
"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:d1e11588f95c11591a94b38d856cee810078a7a46f84a88300c4766382d2bc11",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f5a412bf31bd73cb3f88f3a0331254bb90494dbac1ca515ce3f75263bdc99ef",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ef058d924f95141236bbcde34a845a1f2f3d5d4e06f6fe02b87771199da0ea7",
"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:347e68473da4db4ecd8a8517c0a739a851d838f4f2954cd5b98c381ebaa7f9b2",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb49e057eed474dbcf3128871935256e292a78078dc5fbb82ae6a648ece43ec",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a892372b1283e421d86423806525f870d9d0683a08d151492c90370829e31229"
}
}
22 changes: 11 additions & 11 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-08-18-202010"
"base": "4.15.0-0.nightly-2024-08-21-233556"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bb60567d8656acb417e5c02c5ad2effde241e88803ff94ec73aed0e3f67c608",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f249e969fc8c39cef5641619573cb3dbfc3ef920d6617d7836830653e1d72fe",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46ecf2871f92e44b2ac4a28682c96a01863e291ffbbb4ba5fbde5f20e53de171",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8442242b4ffccbcfea5838515e571a659722bc1eba5478c05b19e89da64c2eb2",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a459dc49c781913cfad0931f25b0c86914a01c8c18c8534e57b19dadcee6a1a6",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fec5533c975243477bd2157a989f1cae32d57657f56fa4e5849edefd2d2d3fc1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d82f824c6e96602bc4b423d11f31998bb0789b8a7d9ab820997270c9f93b43c",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d814e97131444982f18053125fc337d73a3117b1606052c417d34d9f5b01868",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa70d58bc05e560d2cc66ee66877e11e73cc4377a2dfd2a3ad583b1e28572ebe",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e92f614e3053f7495e1ecd3c1d678c56b7c08a04a0228f349c5ba6d43d7b9b0",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad0226fb229b9ad73d19ce516a22fcbede9584034a13c98b486ce603a87d13cc",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ac9d1f8c6ff440499d9474409c78b7961e592e74ba5aa2bd108a8d1773ae285",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75da5eadef5e0add274d4b9c69713379b4d0681c822d5e9f0218aaa15e4d9337",
"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:dd922c18153fc88890db15c9f0f6636c90eb6d24b6c06b133a95b07f81490550",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfc08dba030466e47ae1a2683fa031d5e3c3909c7407ec51ea612b9e781ed17d",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e790fec324bdb691fe5b245d6fc03a0a358a5b4705b9ac39047e43f5b34ad19"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad603c6c5188453bfe1afb5f4d63933be18abb7963bba0e905b9eb0abbd1da0d",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84f5272a5a4f42414376be9eca6d53d6b28873781b4ef32fd6cbd295093cf565",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:162b5ebc357d52ef573bc2a031a5e1c8aae51d3584a63a4be9360911d6c03151"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_amd64.conf
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:aa70d58bc05e560d2cc66ee66877e11e73cc4377a2dfd2a3ad583b1e28572ebe"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ac9d1f8c6ff440499d9474409c78b7961e592e74ba5aa2bd108a8d1773ae285"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_arm64.conf
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:2f5a412bf31bd73cb3f88f3a0331254bb90494dbac1ca515ce3f75263bdc99ef"
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
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-21-233556" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-08-21-182413"