Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-06-18-165358_amd64-2024-06-18_arm64-2024-06-18 #3508

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
Jun 19, 2024
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-06-18-165358_amd64-2024-06-18_arm64-2024-06-18 #3508

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
ce91a36
update last_rebase.sh
Jun 19, 2024
61610a4
update changelog
Jun 19, 2024
6b10082
update manifests
Jun 19, 2024
d79babf
update buildfiles
Jun 19, 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-06-17-222650
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-18-165356
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-06-17-153747
OCP_VERSION := 4.15.0-0.nightly-2024-06-18-165358
2 changes: 1 addition & 1 deletion 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 @@ -8,7 +8,7 @@ images:
digest: sha256:cc7d8fb30c42337bd8f9e3a2ea1260e09cb8864926f51cc5f85942cece0aa76b
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3e537e2bc43473025cca81650212a03fde7662a25dcd938614df0ac277936fe4
digest: sha256:c9b16283ccdf90487faacb267138083ac1192a76eeb949a02e6957f3fdf120be

patches:
- patch: |-
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -8,7 +8,7 @@ images:
digest: sha256:6fff90fda0fc51fdb426c353bcc241043cd57db9610e6123bbbf25c5623512f5
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:824678e67933576425598c760040f103341699de6a171f6f6d1048b8d6602087
digest: sha256:f15be2dc3d6d2c1848f997b7921d11bf4c0873c129cdf182155ac133880b0a89

patches:
- patch: |-
Expand Down
4 changes: 2 additions & 2 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-06-17-222650"
"base": "4.15.0-0.nightly-arm64-2024-06-18-165356"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc1f3093085d401045129adeddec9a0dc14554d1e48d997c4381ced9c1c8257f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc7d8fb30c42337bd8f9e3a2ea1260e09cb8864926f51cc5f85942cece0aa76b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e537e2bc43473025cca81650212a03fde7662a25dcd938614df0ac277936fe4"
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9b16283ccdf90487faacb267138083ac1192a76eeb949a02e6957f3fdf120be"
}
}
4 changes: 2 additions & 2 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-06-17-153747"
"base": "4.15.0-0.nightly-2024-06-18-165358"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:841952ccd7ac46798c1ee8e9bb95a3e0d2930c2a17f92790929796c84a9c1f57",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fff90fda0fc51fdb426c353bcc241043cd57db9610e6123bbbf25c5623512f5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:824678e67933576425598c760040f103341699de6a171f6f6d1048b8d6602087"
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f15be2dc3d6d2c1848f997b7921d11bf4c0873c129cdf182155ac133880b0a89"
}
}
8 changes: 4 additions & 4 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-06-17-222650"
"base": "4.15.0-0.nightly-arm64-2024-06-18-165356"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4a6cfbf67a0a5b81c6a4d5eb9eec5cd7671faf813df9e04fb3c5b80e5c1ee8b",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd0cb2f9595802d7a38bcf0e0b903dcd80dd1ca14e0ff08fe756dca5809ab10",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b33fdf4da8d2baee9489272ad400c24907a5c2474e81ee1d964f5bdf28f82139",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0b70de6ef3fa69196f8339df6ab139ca67deae411d7b9edf2860a6a7a250e25",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e537e2bc43473025cca81650212a03fde7662a25dcd938614df0ac277936fe4",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95164b107b607c25e1f97cf6177582640a57e5f8834574a3b29ea154d282a306",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9b16283ccdf90487faacb267138083ac1192a76eeb949a02e6957f3fdf120be",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9be5b5e005c7d87528ba2ebce2c6bda00e02d202c3205db6ca2bcb98b3a64d39",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b0f8ac32926a8011d17526c8bf838f65e86a80216c7f064fc83980e517556c6",
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-06-17-153747"
"base": "4.15.0-0.nightly-2024-06-18-165358"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4fd230c39c0836b2748516532577192ecdaa55e93943caf72bfa62fc26aaaa6",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21e005c8b82d855bfe77f51256b74afa84b01a22392c561d1bab2f7a6a016e77",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9508a871e104890826a0c7f08890b57f5dd9d1549e0caee610112aa3a5c90f4e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57eafed7555133b6e7af1e681d0c9b0968e22ba08cf9628a1ba75f7ac5bcc7ce",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:824678e67933576425598c760040f103341699de6a171f6f6d1048b8d6602087",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13259bb83ebde2a1a3965e1bd9428b0b736be956a5bac6188aa3af14859f3c08",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f15be2dc3d6d2c1848f997b7921d11bf4c0873c129cdf182155ac133880b0a89",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1a8162bd5f2135be8c8b39db4b9a05167643a628e3d91494e30687ad0699059",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2bb5a73a7b6628c79dbbe66a25294d454e55b371b271ded630bb9fc25dbaf38",
Expand Down
8 changes: 2 additions & 6 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
- cluster-network-operator embedded-component 071f46acbf9043f9ae9106c56639888e078977a9 to 706b73a7db55d35818a9a0928c2858dfb1180810
- d6ca0c2 2024-05-29T16:30:16+03:00 Improved prometheus rule for ipsec metric
- 19b529e 2024-05-29T16:25:35+03:00 Add ipsec state metric

- operator-framework-olm embedded-component d863e7cd095d747c6e9e43c6371470f78a064c65 to c760189484d42a31b5dcb349d7d950821d844826
- 51c4b56d 2024-06-05T15:33:06-04:00 UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288
- cluster-network-operator embedded-component 706b73a7db55d35818a9a0928c2858dfb1180810 to 2d6a049ae8dae379e7a1583695f165f3bafac810
- e9af57e 2024-02-21T03:14:57+00:00 Run dhcp-daemon pods as system-node-critical priority

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component a0ac804
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component eae692607f7ef1cfc6ef95bcd57c67f04d2c165c
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796
https://github.com/openshift/cluster-network-operator embedded-component 706b73a7db55d35818a9a0928c2858dfb1180810
https://github.com/openshift/cluster-network-operator embedded-component 2d6a049ae8dae379e7a1583695f165f3bafac810
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9c4fb818258a579901343fec3c2c47ec20ad2555
https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f
https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342
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-06-17-153747" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-17-222650"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-06-18-165358" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-18-165356"