Skip to content

Commit

Permalink
NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-01-22-160236_amd6…
Browse files Browse the repository at this point in the history
…4-2024-01-22_arm64-2024-01-24 (#2930)

* update last_rebase.sh

* update changelog

* update microshift/go.mod

* update microshift/vendor

* update etcd/go.mod

* update etcd/vendor

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <ci-robot@openshift.io>
  • Loading branch information
microshift-rebase-script[bot] and ci-robot committed Jan 25, 2024
1 parent 7c7044b commit d05be5f
Show file tree
Hide file tree
Showing 676 changed files with 3,555 additions and 5,469 deletions.
4 changes: 2 additions & 2 deletions Makefile.kube_git.var
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=28
KUBE_GIT_VERSION=v1.28.5
KUBE_GIT_COMMIT=c84a6b8ba1ed969f496f70d630aaa525c5ecd41a
KUBE_GIT_VERSION=v1.28.6
KUBE_GIT_COMMIT=0fb47263bee9d427fb36e6581023d40bce8933d1
KUBE_GIT_TREE_STATE=clean
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-01-21-010454
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-01-24-182044
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-01-18-050837
OCP_VERSION := 4.15.0-0.nightly-2024-01-22-160236
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:14c2fb663aac5e0a19ba549e1d522f099b44866b30d8bf7662c93b159e469812
digest: sha256:7148874d7209670e0f958f2779338441130ecb807cfd6f5802cd298f3a6c64e8
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:287e1b5b5a59125f4f3dd22941995b0a420ce6e75a40716f34368ce15ceb0ffa
digest: sha256:59e72a5247b8f184bef364a85c4901bc595534d34fe0db47066cefe49df251f0
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c3070474d33108d6c256d5426372d92289e555a72a194bff0fd6eed9efb736a6
digest: sha256:6ddbf183ca7997c1f48fa40c537cae273e073482b3f7032faa029fb9ac26bf35

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:287e1b5b5a59125f4f3dd22941995b0a420ce6e75a40716f34368ce15ceb0ffa
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59e72a5247b8f184bef364a85c4901bc595534d34fe0db47066cefe49df251f0
- 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:14c2fb663aac5e0a19ba549e1d522f099b44866b30d8bf7662c93b159e469812
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7148874d7209670e0f958f2779338441130ecb807cfd6f5802cd298f3a6c64e8
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ images:
digest: sha256:586211185cec4667b4984f70135f69c5a3bcccae64998b5a9bfe662a26c69490
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:703698e79dc3a2554b653a5669a6f1ccdc60caef34682d346d022a2da616a8e5
digest: sha256:38c177f55306a76a74fd2746202ea322a463e4cd197e297b03188c7096f10e23

patches:
- patch: |-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-01-21-010454"
"base": "4.15.0-0.nightly-arm64-2024-01-24-182044"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14c2fb663aac5e0a19ba549e1d522f099b44866b30d8bf7662c93b159e469812",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:287e1b5b5a59125f4f3dd22941995b0a420ce6e75a40716f34368ce15ceb0ffa",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3070474d33108d6c256d5426372d92289e555a72a194bff0fd6eed9efb736a6"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7148874d7209670e0f958f2779338441130ecb807cfd6f5802cd298f3a6c64e8",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59e72a5247b8f184bef364a85c4901bc595534d34fe0db47066cefe49df251f0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ddbf183ca7997c1f48fa40c537cae273e073482b3f7032faa029fb9ac26bf35"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-01-18-050837"
"base": "4.15.0-0.nightly-2024-01-22-160236"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:101d0ba97a4c62de30f39cdaf3686ca6de4cf75b6db2b56ca7065b7194435a11",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:586211185cec4667b4984f70135f69c5a3bcccae64998b5a9bfe662a26c69490",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:703698e79dc3a2554b653a5669a6f1ccdc60caef34682d346d022a2da616a8e5"
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38c177f55306a76a74fd2746202ea322a463e4cd197e297b03188c7096f10e23"
}
}
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-01-21-010454"
"base": "4.15.0-0.nightly-arm64-2024-01-24-182044"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:560d16891167d9f6b05e2125686884476f2d1b51751c4dec1d4a9c3dbd65c7a9",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d56e207431bd6672944bbf5022ddcbaaca9cc674382c6e119062ec146a073127",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d583993a177f98a25abf369e858f3856c1ad8a9f40a00359f33c652f9e709d40",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3070474d33108d6c256d5426372d92289e555a72a194bff0fd6eed9efb736a6",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:959149001c306f2ef0b994168ebcfb3537c34eeec1b55ddd4c51d3ea28f66fae",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a066cdf6d44a8d05dd8507c2fbb713348d30f37e9a641ebef98187c5180c525",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47bb9826c64b0edadf5fdd5ff07768ecc7d568261f9607b6178e37e49f3c53a5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ddbf183ca7997c1f48fa40c537cae273e073482b3f7032faa029fb9ac26bf35",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a5a35b31eb3d75b58fcb25b7dbe47861aeeda6febaebc3cfa46a136acab4482",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b9227733bbf85f4682aa21e3116a906c48cd0de2b781a2e8d1351712f4fc74c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a953d9186b29f335fce035e37b6381b6698b2224beaf9f47f44c076d32859016",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f99140b3c93c033ae9dbb31c2718da19ac9e920cfab19bec678f95a405bbb413",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ab4dc57349c778310d9275781b9b2b2176ff3cfccb1dafedbae8c0f3fbefae6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:885db929246bad1ed0fe1a731f3b8ef629bb87b0fa242fe57c55e341a374b47e",
"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:db5c95ea374cb80e4a81ac23d728d340e8eec52c0fb7d6a69755c18506e847f1",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96979216d2ac9235907ab3f7fa948f254b136b14ee2f0e29881ace50f95f0f83",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba55fc257eaedc68b398a530cd6f16421df8e9cfcf912c443ee361b66fd062aa"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b26888d1f1c2eb9e983b27ea7bfe4a877efac7f55167a029fbf1d67799ba8af",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6773c595e749ee8964eb6bd588da2c01f46ae16be571b736affb8407ff385b1a",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5ff2ca8958b7aa3d055ead98528a633acbb045d5a9f812c33d407444d71e488"
}
}
10 changes: 5 additions & 5 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-01-18-050837"
"base": "4.15.0-0.nightly-2024-01-22-160236"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8eed025f5444f054e44eb253c828e70422523c984cc42f62accf9422643bb503",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0eeefb003197b317dc228c12c71996abc0a82821c67e165b3ac8ea79834d330",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60840932da541f87698f61476ef497922ca56cad00d2461338cd93ddd804d37f",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a535f7ea2d9801cbe54c41ce02a2e9791389ac7c8fa522494363dd7c9be22789",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:703698e79dc3a2554b653a5669a6f1ccdc60caef34682d346d022a2da616a8e5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99c02d8a0d9da08ad0aa9662947803e3bb8b8b81d782152abde8decde8323218",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38c177f55306a76a74fd2746202ea322a463e4cd197e297b03188c7096f10e23",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f302cd6c073ffe569553eb0002b1368e20a6d66f3dcee808f933a56520bf6f40",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52ce6796b262ea794004442b879cef747f94ac8d5c680f8667d31a618cbdcc04",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b7d3c1c29382dbdac402bd1d57d360194451568f13984dfab4bd79120843cef",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c2a69db5af34ac5c37b9931a38b91ab5a968eca9ee060ef6338c7e3c61a7ee0",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55",
Expand Down

0 comments on commit d05be5f

Please sign in to comment.