Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-05-07-065351_amd64-2024-05-07_arm64-2024-05-07 #3333

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 4 commits into from
May 8, 2024
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-05-07-065351_amd64-2024-05-07_arm64-2024-05-07 #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e6e763
update last_rebase.sh
May 8, 2024
d30f98c
update changelog
May 8, 2024
6f4d3cc
update manifests
May 8, 2024
77cb58e
update buildfiles
May 8, 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-05-06-225851
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-05-07-025319
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-05-06-131215
OCP_VERSION := 4.15.0-0.nightly-2024-05-07-065351
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8585f5ff6a7e4bcb5612e1ecd6b84d74e6b67f3e500cf3e4d9faec61f1e9c2de
digest: sha256:3128b3e2be65ff533865c00f1c44c2c4f6d31cf7d714cf94591d5d659b2552d3
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:09b75b18213f3a73b8045e06c9a13de6e4be6b4ea4243ba2f9e7f3153e4bc1a6
digest: sha256:ccc2830a5fd8d9bf61fd626a4ad797a2f06a9b7d1fce10564ef43453ca3921bc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2c1ea3f82b753673cb398813c65520e604337e348fc71b305f8300ce4e3c0a63
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09b75b18213f3a73b8045e06c9a13de6e4be6b4ea4243ba2f9e7f3153e4bc1a6
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccc2830a5fd8d9bf61fd626a4ad797a2f06a9b7d1fce10564ef43453ca3921bc
- 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:8585f5ff6a7e4bcb5612e1ecd6b84d74e6b67f3e500cf3e4d9faec61f1e9c2de
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3128b3e2be65ff533865c00f1c44c2c4f6d31cf7d714cf94591d5d659b2552d3
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:17f459f5f6bfc7282e8b7000deeaa8a549e3e905b4a22132e9fb7b59c5154dbc
digest: sha256:d4b49b6a46a19d811eb6c8546110dc574bb302238aa9ad6082041e3195858ef3
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a546c289ff86cf91ecd1b9312df8b0bfd207d6bb2a83111f455b5d8525771f32
digest: sha256:957e818a3f6d603dc285175359ebf308d0345584130fbd47d181755d05818e63
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3cdde20bbec18867eadeb32f514528be748650e14975a7a419ad7dbebc9838b6
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a546c289ff86cf91ecd1b9312df8b0bfd207d6bb2a83111f455b5d8525771f32
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:957e818a3f6d603dc285175359ebf308d0345584130fbd47d181755d05818e63
- 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:17f459f5f6bfc7282e8b7000deeaa8a549e3e905b4a22132e9fb7b59c5154dbc
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4b49b6a46a19d811eb6c8546110dc574bb302238aa9ad6082041e3195858ef3
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 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-05-06-225851"
"base": "4.15.0-0.nightly-arm64-2024-05-07-025319"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8585f5ff6a7e4bcb5612e1ecd6b84d74e6b67f3e500cf3e4d9faec61f1e9c2de",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09b75b18213f3a73b8045e06c9a13de6e4be6b4ea4243ba2f9e7f3153e4bc1a6",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3128b3e2be65ff533865c00f1c44c2c4f6d31cf7d714cf94591d5d659b2552d3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccc2830a5fd8d9bf61fd626a4ad797a2f06a9b7d1fce10564ef43453ca3921bc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c1ea3f82b753673cb398813c65520e604337e348fc71b305f8300ce4e3c0a63"
}
}
6 changes: 3 additions & 3 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-05-06-131215"
"base": "4.15.0-0.nightly-2024-05-07-065351"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17f459f5f6bfc7282e8b7000deeaa8a549e3e905b4a22132e9fb7b59c5154dbc",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a546c289ff86cf91ecd1b9312df8b0bfd207d6bb2a83111f455b5d8525771f32",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4b49b6a46a19d811eb6c8546110dc574bb302238aa9ad6082041e3195858ef3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:957e818a3f6d603dc285175359ebf308d0345584130fbd47d181755d05818e63",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3cdde20bbec18867eadeb32f514528be748650e14975a7a419ad7dbebc9838b6"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-05-06-225851"
"base": "4.15.0-0.nightly-arm64-2024-05-07-025319"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6a89c9fc67a1f64e1fc452c1cec45488ba68850ef174f17c8b22f36932ab0f9",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:391235ea50d31064e78b601778618c449ef8fd4aa05cc0750fe0be3ccf675400",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d14efa4a695195753e60540c6696534a4315988618a983e28f8869bdb8253af",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c1ea3f82b753673cb398813c65520e604337e348fc71b305f8300ce4e3c0a63",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:682b1e23eef73825c001a578214cf601c2cd422676f07b055b9309f941b24766",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdc5a38a2422c591d93a4011624163a1ae951cf46c7cb814b0d6aac66736c6be",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:479c998bef536ec97e3a3be5b424e3c53568df7337d49151fbc5ae2b98f90081",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9476cb12c805fe08d3df3f567853168611a6d53dc48123b66ccc51f3fbb77ef3",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-05-06-131215"
"base": "4.15.0-0.nightly-2024-05-07-065351"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c6c59d50819ee2d282d106fd75ee927e625d3e3c3927b49523a4f457e883dd8",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f983145416621deeb8713ffd6559621b074a7153b6158a23b1b316fa3cfb5717",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a19a320bae57dd073ba6ba7a9ca1953dec636ce074f618a57795761a4d0f0c74",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3cdde20bbec18867eadeb32f514528be748650e14975a7a419ad7dbebc9838b6",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84e7b562d605bfa69d94d66ba97e0c9139e24e0885fc5f25b8bbf89be6eb6d5f",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0a5583c18bf17534f8232c84e36851d1b18c3707a6fede75877a29ceaac24a2",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9280df3d25f773251f1179fe9defd8bba30413b86e978920ec3231f65843b0d8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:902e1022029ccb59689e66510cb0d926947ae4ce1a33c68b8dee4270e59789d6",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
11 changes: 7 additions & 4 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
- router image-amd64 397ff2fdb0a65bca3c960c364239bd1c0697ce21 to 1cac6b72281a3e69141f3a14206d420ab23471d6
- 9fdfb8b 2024-04-23T01:24:31+00:00 OCPBUGS-26539: Reject routes with MD5 certs
- operator-framework-olm embedded-component f6374fbc52a33f72763e7dda2b0bf04773a359dd to 50f148e2b1ed9eed9625d03f0d754bca53da1414
- a6cd494d 2024-04-25T08:43:51-04:00 UPSTREAM: <carry>: bump go-jose

- router image-arm64 397ff2fdb0a65bca3c960c364239bd1c0697ce21 to 1cac6b72281a3e69141f3a14206d420ab23471d6
- 9fdfb8b 2024-04-23T01:24:31+00:00 OCPBUGS-26539: Reject routes with MD5 certs
- ovn-kubernetes image-amd64 a2cac64f0ce21e324c0d243cb3d12dd3ef3cf3b4 to c108b9f7bb51ad5462f410e54eb2177103c86ee5
- 1e2f5d2 2024-02-09T16:53:30+00:00 Ignore missing live migratable pod annotation on AddNode

- ovn-kubernetes image-arm64 a2cac64f0ce21e324c0d243cb3d12dd3ef3cf3b4 to c108b9f7bb51ad5462f410e54eb2177103c86ee5
- 1e2f5d2 2024-02-09T16:53:30+00:00 Ignore missing live migratable pod annotation on AddNode

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component 8ca71f701a70cb3eed860
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb
https://github.com/openshift/machine-config-operator embedded-component 1b35c4e05377a34e8403108837bb6773e2c3566d
https://github.com/openshift/openshift-controller-manager embedded-component cdba57f4d73d86ec73394081bbeef487af5ec08c
https://github.com/openshift/operator-framework-olm embedded-component f6374fbc52a33f72763e7dda2b0bf04773a359dd
https://github.com/openshift/operator-framework-olm embedded-component 50f148e2b1ed9eed9625d03f0d754bca53da1414
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 7693229513083646fe3a83a0fec6e651e4866d8d
Expand All @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd1
https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342
https://github.com/openshift/router image-amd64 1cac6b72281a3e69141f3a14206d420ab23471d6
https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9
https://github.com/openshift/ovn-kubernetes image-amd64 a2cac64f0ce21e324c0d243cb3d12dd3ef3cf3b4
https://github.com/openshift/ovn-kubernetes image-amd64 c108b9f7bb51ad5462f410e54eb2177103c86ee5
https://github.com/openshift/kubernetes image-amd64 8ca71f701a70cb3eed8603478e5f6c1676319fc4
https://github.com/openshift/service-ca-operator image-amd64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca
https://github.com/openshift/oc image-arm64 7693229513083646fe3a83a0fec6e651e4866d8d
Expand All @@ -33,6 +33,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd1
https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342
https://github.com/openshift/router image-arm64 1cac6b72281a3e69141f3a14206d420ab23471d6
https://github.com/openshift/kube-rbac-proxy image-arm64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9
https://github.com/openshift/ovn-kubernetes image-arm64 a2cac64f0ce21e324c0d243cb3d12dd3ef3cf3b4
https://github.com/openshift/ovn-kubernetes image-arm64 c108b9f7bb51ad5462f410e54eb2177103c86ee5
https://github.com/openshift/kubernetes image-arm64 8ca71f701a70cb3eed8603478e5f6c1676319fc4
https://github.com/openshift/service-ca-operator image-arm64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca
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-05-06-131215" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-05-06-225851"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-05-07-065351" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-05-07-025319"