Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-04-28-161516_amd64-2024-04-28_arm64-2024-04-28 #3295

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 9 commits into from
Closed

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-04-28-161516_amd64-2024-04-28_arm64-2024-04-28 #3295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
60ce3d0
update last_rebase.sh
Apr 29, 2024
c10b827
update changelog
Apr 29, 2024
c94ac01
update microshift/go.mod
Apr 29, 2024
61441fd
update microshift/vendor
Apr 29, 2024
b62ea47
update etcd/go.mod
Apr 29, 2024
ee9df77
update etcd/vendor
Apr 29, 2024
c906141
update component images
Apr 29, 2024
0c4f0ce
update manifests
Apr 29, 2024
2f4f0fc
update buildfiles
Apr 29, 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
4 changes: 2 additions & 2 deletions Makefile.kube_git.var
View file
Open in desktop
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.8
KUBE_GIT_COMMIT=6b4a380c8104d3b8f48443544548193cccb32b72
KUBE_GIT_VERSION=v1.28.9
KUBE_GIT_COMMIT=2f7b99248d49c18da5c29f11da989ce3f1d9edfc
KUBE_GIT_TREE_STATE=clean
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-04-03-202447
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-04-28-161514
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-04-07-120427
OCP_VERSION := 4.15.0-0.nightly-2024-04-28-161516
1 change: 1 addition & 0 deletions assets/components/csi-snapshot-controller/webhook_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
labels:
app: csi-snapshot-webhook
spec:
serviceAccount: csi-snapshot-webhook
containers:
- name: webhook
image: '{{ .ReleaseImage.csi_snapshot_validation_webhook }}'
Expand Down
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:083039977da3efc48be5b03ca2306451ef9e4cfda0591cd0c4650e14fa333660
digest: sha256:e69e82136c4a24f229cbd7974a7ea14b35ed9b841e7f32a1816bfefa1b35ceea
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b0c0be56a1ae82b781327e913439e5ad118135e6f49e46faed5a03e2a108b0b1
digest: sha256:6e1b19806ecb915d3e1f92f2f08cb39c147e6e4193db4c70acaa7ed43828259d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:100764db1d188defcff3e1d7db3b3d1eae36a62597ac1be6517fd69271da9dc9
digest: sha256:3050d1ccf26c1186a5581a73c4d0c32590eb2d8dbfce8c97293b08c6267a3137

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:b0c0be56a1ae82b781327e913439e5ad118135e6f49e46faed5a03e2a108b0b1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e1b19806ecb915d3e1f92f2f08cb39c147e6e4193db4c70acaa7ed43828259d
- 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:083039977da3efc48be5b03ca2306451ef9e4cfda0591cd0c4650e14fa333660
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e69e82136c4a24f229cbd7974a7ea14b35ed9b841e7f32a1816bfefa1b35ceea
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:73cba92016578b833c1946275b3051d1aa24e1bfb786edac72c5cb267a6f2a2d
digest: sha256:fdac21f6fe1c9e627a5025d9a92be272c60e8c7f3ca05638fa5bcffac669f7dd
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8404c953b9b94f8403ae77f208f885a5a2734ee34a3e37362e3c13f5b6494af0
digest: sha256:c285e4ceb7e1d57897cf5e46fe14aadd2dc5fb7368562e875520d3b3c45b1395
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5dab8d817f2e8e453e019ac89edaae24f948e9d4181df3de31f7d7c89b614de3
digest: sha256:c86556f7f05aaea53ef6c50ded6917f6949f7f46b8bd92783df86a5a935a0191

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:8404c953b9b94f8403ae77f208f885a5a2734ee34a3e37362e3c13f5b6494af0
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c285e4ceb7e1d57897cf5e46fe14aadd2dc5fb7368562e875520d3b3c45b1395
- 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:73cba92016578b833c1946275b3051d1aa24e1bfb786edac72c5cb267a6f2a2d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdac21f6fe1c9e627a5025d9a92be272c60e8c7f3ca05638fa5bcffac669f7dd
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-04-03-202447"
"base": "4.15.0-0.nightly-arm64-2024-04-28-161514"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:083039977da3efc48be5b03ca2306451ef9e4cfda0591cd0c4650e14fa333660",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0c0be56a1ae82b781327e913439e5ad118135e6f49e46faed5a03e2a108b0b1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:100764db1d188defcff3e1d7db3b3d1eae36a62597ac1be6517fd69271da9dc9"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e69e82136c4a24f229cbd7974a7ea14b35ed9b841e7f32a1816bfefa1b35ceea",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e1b19806ecb915d3e1f92f2f08cb39c147e6e4193db4c70acaa7ed43828259d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3050d1ccf26c1186a5581a73c4d0c32590eb2d8dbfce8c97293b08c6267a3137"
}
}
8 changes: 4 additions & 4 deletions 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,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-04-07-120427"
"base": "4.15.0-0.nightly-2024-04-28-161516"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73cba92016578b833c1946275b3051d1aa24e1bfb786edac72c5cb267a6f2a2d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8404c953b9b94f8403ae77f208f885a5a2734ee34a3e37362e3c13f5b6494af0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5dab8d817f2e8e453e019ac89edaae24f948e9d4181df3de31f7d7c89b614de3"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdac21f6fe1c9e627a5025d9a92be272c60e8c7f3ca05638fa5bcffac669f7dd",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c285e4ceb7e1d57897cf5e46fe14aadd2dc5fb7368562e875520d3b3c45b1395",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c86556f7f05aaea53ef6c50ded6917f6949f7f46b8bd92783df86a5a935a0191"
}
}
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-04-03-202447"
"base": "4.15.0-0.nightly-arm64-2024-04-28-161514"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2634c1bd3acf94b2c302f755caf072f5b8e70118d568874e310f64a07f597312",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:234389b28148f56ce0b72c4367b64215305b5d605f6c8e8e358a61ddb8282c6b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f4ee9c656addaac64ec19807ed034b5cc47f80e9dc4b5008cc2bc1eb4a1a30d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:100764db1d188defcff3e1d7db3b3d1eae36a62597ac1be6517fd69271da9dc9",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4cb9c063621c4afd12ee242d96be68e8061aa3984fd0a7ea70d166752434a34",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d2bc1dd2ca8bb3574c70389f2851c9b7c24c1cf856069aea222058f16143f73",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ea25dd05b1168b1d84cd093db9486e0299fb819124be0a7fdbd11472b54e563",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3050d1ccf26c1186a5581a73c4d0c32590eb2d8dbfce8c97293b08c6267a3137",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f1be67df1c4410a1dbd128fbbab560a727d117d50aeffe7c5169260065635fa",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5679ac5318e5113f8e4c386ed5ec75489a984c2e787b6b04ab4257fc4ebc416",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f999654f738804af6a5550d4e2bad8289ece21c32d5566bc12ade1eb16946f8c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b070d695fc50842a85b3f562b2892e5e9fac08d3a5a0c3a7587ef9c873114d79",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec27f605448cc603ee6bde62d5d375d82cdd6a2673b56d10cb62d13b67c8885c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da28916b9c856c533f4971fc499f5452ffa72ad61c657b01963595cac6c08f12",
"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:a9057edec58c191071f756f3d4b4780f8f405e5dece7ff0becdb7815b04b15a3",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac476716df620079cde67c3fc33ca85de438e445272fe146de932b6dc0c65570",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2078380cc10b7a74e45471fad6ce5bd95471e0f7be94c31db9fb36cc1864d28e"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5dc4ad77ae48c8c634039552379db4d20a94cb0875ebcb46ae944a1dd88198d",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45ecf23055327ac7f6534a3b067b4901b7d6c387359fe05844b3cf8f28d1cc4e",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90614d40b31129f0066dc412d4400ef4bfa13d0d6165dc61205c7e3d4ee4d46f"
}
}
22 changes: 11 additions & 11 deletions assets/release/release-x86_64.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-2024-04-07-120427"
"base": "4.15.0-0.nightly-2024-04-28-161516"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65d1b975add325cdaf1dc47b14b4c667b7dc04ef641759796463ebf94beef895",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a427a976e0ffe1631a6076da2478ddf65be14e58ef4057b972f7dd404ced5a5a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b4017777fd97bb4f66a1c939014b95a440bb7b37e543aba2add65a548c68c6c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5dab8d817f2e8e453e019ac89edaae24f948e9d4181df3de31f7d7c89b614de3",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cccf0abdd9836fa9ba937afafefa39206e204aaa5f61b58752959f06994086f2",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:562863c4d651431a2069e8faf29e588b7f69b173f8be83f428f15ff0c6797e1c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12624f3a0ea9e183f1100aeaa5681d85026ab4b708c1fccc032d633f50aa1b0a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c86556f7f05aaea53ef6c50ded6917f6949f7f46b8bd92783df86a5a935a0191",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c450c6d7d3868e77964b58eb7c290a5e19115366a5444b7800bf91071e9a42d9",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:047621fba675c59f3a7f3e2b778a8dbb9adbe71d066b3016b83655421c04ad1a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3d7a5c1c9e71fa441d1ec3ad6acdae0813d61d694e75d2790e56528a27c8e21",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:644dd256640fd34b5d08b7544a1a06ef37b6db72c55649f276da26682c8b4ddd",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:882de158fbea366429b4d3abab016de5cf60b1e7efad7d04f6882ec61b404b3a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fe1384fa3def7c6a58105b0aac6303b85d6cb57e1e9df1af7f9f6716a3a7faa",
"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:228348c4d533b90939b4e3a11ecfc25dedea02a95189fc3adb09f4f608dc155a",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20b03cd3e461e72c6783720f56a4e8ee097a439b9954936ecdd2425196561598",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7475c46a6ca77f85be66597b147dd505177df43c09fc6ab70e1107f6b609ac64"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:384b27421547d2ff785f7f49217f300642acd39242cb654321227a3eafa05a8e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b06aa850f174a3d421ccb0293eb905655b5c88df05687824f3b48b361056e9ea",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ce4385190b45d743ed63379da1990ef2ab454296e5d3b64a9d2c36dbfdae619"
}
}
Loading