Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-01-30-205726_amd64-2024-01-30_arm64-2024-01-30 #2954

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

Merged
openshift-merge-bot merged 5 commits into from
Jan 31, 2024
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-01-30-205726_amd64-2024-01-30_arm64-2024-01-30 #2954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a860f1
update last_rebase.sh
Jan 31, 2024
2381a3b
update changelog
Jan 31, 2024
fae2143
update component images
Jan 31, 2024
1760f5b
update manifests
Jan 31, 2024
65ea14d
update buildfiles
Jan 31, 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-01-29-223155
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-01-30-193622
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-01-25-051548
OCP_VERSION := 4.15.0-0.nightly-2024-01-30-205726
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:ed1ce9ba0e463d3a180befd9997ebe0af0689c66c77a6571514726b4bab4efab
digest: sha256:b258cf549b8c1ea7584603ed5aaa3c042cbc674258e394de6f72acc56246ae50
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f7794a83d5f124168ae507812dffd5097a91e098e2dada2f537b899d9e2f7051
digest: sha256:28cd3179852be860b115642bd59029b2421e5d841f6322f14ab97a4603c0b61e
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:180327a7b202f0a4d2a612ad924c5dcef4116eaaedec55fde13e1dd6987fd7e7
digest: sha256:76eb5f85e29fefcd1b1b71ce67ef42e21c9b3b25ffb0f10282e7148e2079f180

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:f7794a83d5f124168ae507812dffd5097a91e098e2dada2f537b899d9e2f7051
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28cd3179852be860b115642bd59029b2421e5d841f6322f14ab97a4603c0b61e
- 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:ed1ce9ba0e463d3a180befd9997ebe0af0689c66c77a6571514726b4bab4efab
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b258cf549b8c1ea7584603ed5aaa3c042cbc674258e394de6f72acc56246ae50
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-01-29-223155"
"base": "4.15.0-0.nightly-arm64-2024-01-30-193622"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ff5e2c1b48be07d24b5fa60bcd334ffd5f883907e52558dcbc0aab157029b49",
Expand Down
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-01-25-051548"
"base": "4.15.0-0.nightly-2024-01-30-205726"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed1ce9ba0e463d3a180befd9997ebe0af0689c66c77a6571514726b4bab4efab",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7794a83d5f124168ae507812dffd5097a91e098e2dada2f537b899d9e2f7051",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:180327a7b202f0a4d2a612ad924c5dcef4116eaaedec55fde13e1dd6987fd7e7"
"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"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.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-arm64-2024-01-29-223155"
"base": "4.15.0-0.nightly-arm64-2024-01-30-193622"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ec26589cc5095599474e1e2e107dc8ac91e4a615913fdb619769f1ccd34f704",
Expand Down
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-01-25-051548"
"base": "4.15.0-0.nightly-2024-01-30-205726"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a7ad02cc1adb2cc182cb02ecac72ada44153e3420442e86c26008c366b352ec",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d31d4d23d580186072c459e4605d096d10f493ffc4cf5764497ef10844bdfb5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04d976dfe9b949838af9bb7db684f89c7faf30473c6b96306572bcb4317e883e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:180327a7b202f0a4d2a612ad924c5dcef4116eaaedec55fde13e1dd6987fd7e7",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c72ef70d0732e4d00a6725e9038a4e1975651de7e08880b7d2f26c4870907a95",
"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",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c1030eba86aae4916b6d65126aac8071154ef63906395b0e8cfc401fc4edbcf",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40fd00f8b0d20685910bd2bcbbd69421dcd6ce5c6162057ef6616737c1900a49",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:377f7f2b44a158e02b78fbbc96e92500c6aeda03489fde64f57801785423c4d9",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca8fb04a41a33bc079f2052294f454649812ce7aeda1fc6c20b0e8e441510aab",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c941db294d2a8abc3739531c7699318539780e5c429c53ee7f0a0aa0c1c02",
"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:04e023de1a4f07d74b37173c129932367a99f4317793b03fe5614a79f9090b2c",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d4de21c9c9909e40d8b6d4b9ad919ca58c9156b1455c51e500cf786d8dc0b5a",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b70da673de087b86ff770275aecb5ba12b3b250a13609fad381f1ebcb516b463"
"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"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_amd64.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:40fd00f8b0d20685910bd2bcbbd69421dcd6ce5c6162057ef6616737c1900a49"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c941db294d2a8abc3739531c7699318539780e5c429c53ee7f0a0aa0c1c02"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
31 changes: 31 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
- cluster-kube-apiserver-operator embedded-component 9f6208d68b7207e819767ffbad8bb95e6b8b7bb2 to 90d35d617b6b87004530fb974cbc6eb39bc3fe3b
- eecfa10 2024-01-22T14:36:59+00:00 webhookcontroller: report when a webhook resource is missing a caBundle provided by the service-ca-operator
- 5c22848 2024-01-22T14:36:59+00:00 webhookcontroller: update degraded webhook condition types to errors

- cluster-kube-controller-manager-operator embedded-component 8a3e677c03f7e821f5b9e2639eb6621b15f96edb to 642fb08461913d9352b781693311727da42ffc0a
- e97a1fa 2024-01-16T15:57:30+00:00 fix: remove deprecated exclude annotation
- a5d8f36 2024-01-16T15:57:30+00:00 fix: add internal-openshift-hosted

- cluster-network-operator embedded-component f092c967f8c6a32acd1f40cb92ff8c1e6244a486 to d4ebd6af6ca400f22acd071532be50da7eae0f4b
- ef4d793 2024-01-23T15:14:18+00:00 Deploy CNO IPsec MC even if user already have one
- b8f203d 2023-12-19T01:19:05+00:00 OCPBUGS-19830: fix whereabouts conformance test failures

- machine-config-operator embedded-component fd594960f56ce9ad4c5f61abc61b4094457d86b9 to 90cab989d0062333daea41c24596e35385ef1ea0
- 9f33506c 2024-01-26T00:14:50+00:00 daemon: allow the user to override drains on IR changes
- fc7b1795 2024-01-22T17:22:32+00:00 Add Image Credential Provider flags for Kubelet on AWS

- operator-framework-olm embedded-component b66c6693482904e415a3effcbcc2eec250f8a1d0 to 8b7ee21aa330b9bd60505c0b51caf2ce7c9e7de1
- 57473dbd 2024-01-24T23:25:25+05:30 Bump go-git/v5 version to 5.11.0
- 2b9b74f1 2024-01-24T10:50:44-05:00 Fix Condition check for Reconcile InstallPlan status (#3153)
- dadbd656 2024-01-24T10:49:16-05:00 Fix snapshot failure when catalogSourceNamespace does not contain OperatorGroup. (#3149)
- 8e8426b0 2024-01-24T10:48:30-05:00 Fix Create InstallPlan with Permissions test (#3129)
- 79f565eb 2024-01-24T10:48:14-05:00 Improve condition check for installplan (#3145)
- 04a2206f 2024-01-23T17:24:02-05:00 bump go-git/v5 to 5.11.0 (#1175)

- coredns image-amd64 44797b00e47789c9a15960773806dccc1612fff7 to 22f950eae53fcba187c2303ac4f1a8305b6c1c8a
- 969220a 2024-01-24T14:57:26+00:00 UPSTREAM: 6277: openshift: Fix OCPBUGS-27397

- ovn-kubernetes image-amd64 00d9aeb42013387a87ba289953bb81966bad14bc to 2476c75ade680f6324391be71a6edfe15fb60d98
- 8185be7 2024-01-17T11:38:05+01:00 Dockerfile: Bump OVN to ovn-23.09.0-100.el9fdp
- 5c4c45c 2024-01-17T11:38:05+01:00 Add e2e test for session affinity after the chosen backend pod is deleted.

14 changes: 7 additions & 7 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 1afe553a46159bd5b65061c98e15138bf48327cc
https://github.com/openshift/cluster-dns-operator embedded-component 9eb983497cd90c4115d7dc476e4bcf0dfb5ee002
https://github.com/openshift/cluster-ingress-operator embedded-component 611011bdc0586878923efe69a3c2f6caa885dbc4
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 9f6208d68b7207e819767ffbad8bb95e6b8b7bb2
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 8a3e677c03f7e821f5b9e2639eb6621b15f96edb
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 90d35d617b6b87004530fb974cbc6eb39bc3fe3b
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 642fb08461913d9352b781693311727da42ffc0a
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e1a1e3a845fd27d2dc8cbd7eb40975505ff294ab
https://github.com/openshift/cluster-network-operator embedded-component f092c967f8c6a32acd1f40cb92ff8c1e6244a486
https://github.com/openshift/cluster-network-operator embedded-component d4ebd6af6ca400f22acd071532be50da7eae0f4b
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component e87e15acee1bbdbc1663aec1bda9517a876023f2
https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f
https://github.com/openshift/csi-external-snapshotter embedded-component 090cd57847b98aebe42ecd5091c3a626eb870022
https://github.com/openshift/etcd embedded-component 5acb4f3078adbea40d050365ac5294229e574c67
https://github.com/openshift/kubernetes embedded-component 0fb47263bee9d427fb36e6581023d40bce8933d1
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb
https://github.com/openshift/machine-config-operator embedded-component fd594960f56ce9ad4c5f61abc61b4094457d86b9
https://github.com/openshift/machine-config-operator embedded-component 90cab989d0062333daea41c24596e35385ef1ea0
https://github.com/openshift/openshift-controller-manager embedded-component 2a28a78279b127075b399a3442a2042f4a7d190d
https://github.com/openshift/operator-framework-olm embedded-component b66c6693482904e415a3effcbcc2eec250f8a1d0
https://github.com/openshift/operator-framework-olm embedded-component 8b7ee21aa330b9bd60505c0b51caf2ce7c9e7de1
https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4
https://github.com/openshift/service-ca-operator embedded-component f5972cc74670c274bdc2b29d0903c4ed0432b9ca
https://github.com/openshift/oc image-amd64 9ff9bd754ea6e530ffc31865fce334f3c58cadc0
https://github.com/openshift/coredns image-amd64 44797b00e47789c9a15960773806dccc1612fff7
https://github.com/openshift/coredns image-amd64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a
https://github.com/openshift/csi-external-snapshotter image-amd64 090cd57847b98aebe42ecd5091c3a626eb870022
https://github.com/openshift/csi-external-snapshotter image-amd64 090cd57847b98aebe42ecd5091c3a626eb870022
https://github.com/openshift/csi-external-snapshotter image-amd64 090cd57847b98aebe42ecd5091c3a626eb870022
https://github.com/openshift/router image-amd64 b7001137f832d02d4ed68cba27fe3001ff523fa6
https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9
https://github.com/openshift/ovn-kubernetes image-amd64 00d9aeb42013387a87ba289953bb81966bad14bc
https://github.com/openshift/ovn-kubernetes image-amd64 2476c75ade680f6324391be71a6edfe15fb60d98
https://github.com/openshift/kubernetes image-amd64 0fb47263bee9d427fb36e6581023d40bce8933d1
https://github.com/openshift/service-ca-operator image-amd64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca
https://github.com/openshift/oc image-arm64 9ff9bd754ea6e530ffc31865fce334f3c58cadc0
Expand Down
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-01-25-051548" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-01-29-223155"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-01-30-205726" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-01-30-193622"