Skip to content

Commit

Permalink
NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-02-13-161104_amd6…
Browse files Browse the repository at this point in the history
…4-2024-02-13_arm64-2024-02-13 (#3014)

* update last_rebase.sh

* update changelog

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <ci-robot@openshift.io>
  • Loading branch information
microshift-rebase-script[bot] and ci-robot committed Feb 14, 2024
1 parent 0091e34 commit cb76914
Show file tree
Hide file tree
Showing 11 changed files with 120 additions and 54 deletions.
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-02-07-031428
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-02-13-234426
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-02-07-062935
OCP_VERSION := 4.15.0-0.nightly-2024-02-13-161104
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:3ff5e2c1b48be07d24b5fa60bcd334ffd5f883907e52558dcbc0aab157029b49
digest: sha256:05bd69cceb5d34b42fbfc9147c50f88f4059cf227c85f8d4f45b84c402651a1e
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0bcec22cf62df1612990f6280c9293a7ab92d7dc0a73df5a2592bbc279060017
digest: sha256:a321eafe480a2a7ac771318c9053dce31281db9bf5386a9d6ef4adc23fdf1c67
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:087f964be2a732fe52d72e3cc4254ff559ef4c6f728f71dbd4a4e9869d60a5d9
digest: sha256:82f12d15f0332830a1d257931699dcc0e37cc72b1d3ac625e78b0790bde47baa

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:0bcec22cf62df1612990f6280c9293a7ab92d7dc0a73df5a2592bbc279060017
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a321eafe480a2a7ac771318c9053dce31281db9bf5386a9d6ef4adc23fdf1c67
- 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:3ff5e2c1b48be07d24b5fa60bcd334ffd5f883907e52558dcbc0aab157029b49
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05bd69cceb5d34b42fbfc9147c50f88f4059cf227c85f8d4f45b84c402651a1e
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:b258cf549b8c1ea7584603ed5aaa3c042cbc674258e394de6f72acc56246ae50
digest: sha256:1e1259dcc795c4fe275f82ae07a76625ba74c4e8d651048780b234822728968f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:28cd3179852be860b115642bd59029b2421e5d841f6322f14ab97a4603c0b61e
digest: sha256:87ee8d3ec97918f5986cf53feb35c801f144a0032d60e3535e1f6c0150dc8313
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:76eb5f85e29fefcd1b1b71ce67ef42e21c9b3b25ffb0f10282e7148e2079f180
digest: sha256:e5f868e7542c8811bce53bb1bd928693e16e41d91f3495d233908f96f8e2a77b

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:28cd3179852be860b115642bd59029b2421e5d841f6322f14ab97a4603c0b61e
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87ee8d3ec97918f5986cf53feb35c801f144a0032d60e3535e1f6c0150dc8313
- 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:b258cf549b8c1ea7584603ed5aaa3c042cbc674258e394de6f72acc56246ae50
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e1259dcc795c4fe275f82ae07a76625ba74c4e8d651048780b234822728968f
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-02-07-031428"
"base": "4.15.0-0.nightly-arm64-2024-02-13-234426"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ff5e2c1b48be07d24b5fa60bcd334ffd5f883907e52558dcbc0aab157029b49",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bcec22cf62df1612990f6280c9293a7ab92d7dc0a73df5a2592bbc279060017",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:087f964be2a732fe52d72e3cc4254ff559ef4c6f728f71dbd4a4e9869d60a5d9"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05bd69cceb5d34b42fbfc9147c50f88f4059cf227c85f8d4f45b84c402651a1e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a321eafe480a2a7ac771318c9053dce31281db9bf5386a9d6ef4adc23fdf1c67",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82f12d15f0332830a1d257931699dcc0e37cc72b1d3ac625e78b0790bde47baa"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-02-07-062935"
"base": "4.15.0-0.nightly-2024-02-13-161104"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b258cf549b8c1ea7584603ed5aaa3c042cbc674258e394de6f72acc56246ae50",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28cd3179852be860b115642bd59029b2421e5d841f6322f14ab97a4603c0b61e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76eb5f85e29fefcd1b1b71ce67ef42e21c9b3b25ffb0f10282e7148e2079f180"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e1259dcc795c4fe275f82ae07a76625ba74c4e8d651048780b234822728968f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87ee8d3ec97918f5986cf53feb35c801f144a0032d60e3535e1f6c0150dc8313",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5f868e7542c8811bce53bb1bd928693e16e41d91f3495d233908f96f8e2a77b"
}
}
16 changes: 8 additions & 8 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-02-07-031428"
"base": "4.15.0-0.nightly-arm64-2024-02-13-234426"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ec26589cc5095599474e1e2e107dc8ac91e4a615913fdb619769f1ccd34f704",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4ad166f97911ff39da653023dca713cbffc3a99c11ade7061a4ae9152a43868",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f08244d5d98029ad649602148954b21ea3448e881ec7a9fe8fca7861c334118a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b121e3d81f3eb17f8dd76caa184de50d4b3e6500ffdef2dfba71f0ad13ff917",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:087f964be2a732fe52d72e3cc4254ff559ef4c6f728f71dbd4a4e9869d60a5d9",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5eabb2eee4e56f190eab14928b1052e27afcf28bb8dd25f15676336de1d73b0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82f12d15f0332830a1d257931699dcc0e37cc72b1d3ac625e78b0790bde47baa",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a9189be85b9e82320b8f57e10c5f4e6202bc0a5329d07fd4eeb3b62a137bb58",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d22411b7ca6304d5382bc3298e3c602f53c6c7d842912ec5b34ef2d9e0938950",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05d80a0705450c7879b671497f50c9e2783b5d37dc8d7e9181df77ed06a55b0f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b07230dc57b4ae83677ce58feef27791de19c2e48b671d0b304b0100f7a4ecc",
"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:1afc9eb8804273600daac717217285f7fb9123a390a66800f9121f1858e88366",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18e5a8bd13abdfc3cd7c8826ba0858badd66378c7b40966084d79d8063cce0cb",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f784ea7f0df841e68667d147b908de7ecc08a03ea0b06d8d32955877a49e0d0d"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc5a848283cc6643677069e197068eb725775a6c01be74eb2bf5acfb31d7df51",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e82d8e58cb9691380c6e136319286073df6a2d6652782d3a5f3243f37017402c",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3221c154a209779516e15333bf8422031206083ed3fce65f8dcb3afa6b0bd659"
}
}
16 changes: 8 additions & 8 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-02-07-062935"
"base": "4.15.0-0.nightly-2024-02-13-161104"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c72ef70d0732e4d00a6725e9038a4e1975651de7e08880b7d2f26c4870907a95",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34aecf85264e97c42b9e39c0a9424a9dea4fea2eb0d515fbcca1d5769fba934b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a677d4baf4f98ec8d1124a3eb3c40aa5bdb75ac07b6b9c56d1569a52f2c2cb2e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe869dbfa1466ef9e18cb55b104644f6d525505aba8323e16ebca481ef476349",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76eb5f85e29fefcd1b1b71ce67ef42e21c9b3b25ffb0f10282e7148e2079f180",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d13a78f6da1a924beb5178da7e509335a38a918474f1b6f791dcdfd6d93239a4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5f868e7542c8811bce53bb1bd928693e16e41d91f3495d233908f96f8e2a77b",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a9bbf7ebe518c485be75d5bcc4c4c5d5cb4744914e6a89c11a0bcc281fb5da8",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2cc8dd2e109439d49ff1555b33f980fd0f1a36fd1f19ad449510852511d7c89",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6068d844068ad78d7dc11129962fbd562eff5a2b2df82f1342dae2dae1817542",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:891954fe689c0cb146da3f16858ce36d1a9b49a87fe8531cf6cefaf492245371",
"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:ad3d786111a50f6ebda384c4f9e293d9f79fc73904ace8b7e023e674dddc1c62",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd63fe9b9b31b5c54d94c0ca808390e690b69fb734e06861958e35a0c410eb0d",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8bf0cfdd1eae2c17b52b98298609c7588f49f78f3b6433f5ab80b60dbde79fc"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:778e5a5d482ce97cf8dd3992d66f069822b47aa9e98ddd277cbad6bd3ccbf35b",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb66b0a8cb2727f7f6ba75e1fa65c3ed4446ead93ee0dc25b5e83b708e1df68c",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c5b849b21ece6ba56253de2ac412394a022c5c8389eb4db4e660b17c2273820"
}
}

0 comments on commit cb76914

Please sign in to comment.