Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-05-15-032103_amd64-2024-05-15_arm64-2024-05-15 #3361

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 16, 2024
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-05-15-032103_amd64-2024-05-15_arm64-2024-05-15 #3361

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
478dc32
update last_rebase.sh
May 16, 2024
380463e
update changelog
May 16, 2024
5d2125c
update manifests
May 16, 2024
c9e72e8
update buildfiles
May 16, 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-14-190638
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-05-15-065717
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-14-175553
OCP_VERSION := 4.15.0-0.nightly-2024-05-15-032103
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:ccc2830a5fd8d9bf61fd626a4ad797a2f06a9b7d1fce10564ef43453ca3921bc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2f11f12c0888347210066c57cf954d593edd46fb4c020a2e96f3593dd4149190
digest: sha256:9ebf7aa4c230825e0b2d3b0ea7211854d600a5a9a371c8f8c75cfa0a79bc1e0b

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:957e818a3f6d603dc285175359ebf308d0345584130fbd47d181755d05818e63
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7e370d7b0b7cec17cc5438791c79a8d746e0124327f9e4734b9706bab2bbb0f0
digest: sha256:78e1a145b9cfb4081e1e5a6abd77b868a45d762cd2ef0fc3e855f71334d931cc

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-05-14-190638"
"base": "4.15.0-0.nightly-arm64-2024-05-15-065717"
},
"images": {
"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:2f11f12c0888347210066c57cf954d593edd46fb4c020a2e96f3593dd4149190"
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ebf7aa4c230825e0b2d3b0ea7211854d600a5a9a371c8f8c75cfa0a79bc1e0b"
}
}
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-05-14-175553"
"base": "4.15.0-0.nightly-2024-05-15-032103"
},
"images": {
"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:7e370d7b0b7cec17cc5438791c79a8d746e0124327f9e4734b9706bab2bbb0f0"
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78e1a145b9cfb4081e1e5a6abd77b868a45d762cd2ef0fc3e855f71334d931cc"
}
}
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-05-14-190638"
"base": "4.15.0-0.nightly-arm64-2024-05-15-065717"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4952c164a4d1d4a3221d31cc76f7af0288928f65d8b700e5be8ec8ff42001991",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e710cae73206bb782cd74d629c2ceb2a3d43b91cde6a3e28a40196eb9ee77830",
"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:9096cb35d3911047cca32c8b5ed5725a1adcf2b22f375d2a5e9ab493d439712c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f11f12c0888347210066c57cf954d593edd46fb4c020a2e96f3593dd4149190",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a06a5a34d68b2b32088e42bef775fd2226a6217193df547bbd84968c26ea3ac7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ebf7aa4c230825e0b2d3b0ea7211854d600a5a9a371c8f8c75cfa0a79bc1e0b",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20b24eb488abef123c18325642e6fd22bbced5ae08810b679867cec4d8ae60b4",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc48a796df79c5e1632e28b5306daf5c66321940b80482c95e66ed3c67c38dcf",
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-05-14-175553"
"base": "4.15.0-0.nightly-2024-05-15-032103"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:336b76cc69858575dfab926fac3d8963b353c745e3e7fc3f7c4a610b81bbdc10",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e8100a7391a1e49017ce499f5e77be49fac0578e786f5865afa6d13f09c00ec",
"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:7f22b9c2b68743c61eebb643980ba46b98d469512a29de76021793ebeb3e82c7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e370d7b0b7cec17cc5438791c79a8d746e0124327f9e4734b9706bab2bbb0f0",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85c2b2cf21a38ae693a3b99b3f3d5c699802395a3378e0336554a716602f308d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78e1a145b9cfb4081e1e5a6abd77b868a45d762cd2ef0fc3e855f71334d931cc",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09fd56c82f34179ed7bd802485fd32d56b682115bfc19019ba6a4f7ecb489f79",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91007cd2d585f070bd46eea76e09034149fa1796a4c204abc6c320df60d790ba",
Expand Down
22 changes: 0 additions & 22 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +0,0 @@
- kubernetes embedded-component 8ca71f701a70cb3eed8603478e5f6c1676319fc4 to 416ecaf479d8fa342937068dede6481f5c7a1441
- da3c5db4b 2024-05-07T10:43:04+00:00 UPSTREAM: <carry>: Provide SCC access via RBAC

- machine-config-operator embedded-component 1b35c4e05377a34e8403108837bb6773e2c3566d to 10694c7cc870f32bc7bf1888d1b8199f13119ff4
- 0b190004 2024-05-07T15:54:22-04:00 Don't error if the certs.d dir doesn't exist yet

- ovn-kubernetes image-amd64 c108b9f7bb51ad5462f410e54eb2177103c86ee5 to 7fab1ff7a30e89dc2c65ecb86784a84ef4026dbb
- 51441bb 2024-05-07T16:19:20+02:00 Fix endpoint selection for externalTrafficPolicy=local
- 77f6635 2024-05-06T22:32:48-04:00 CARRY: fix ordering of MCS blocking iptables rules
- fd072ed 2024-05-06T21:57:20-04:00 Fixes regression to service openflow rules
- b20d82c 2024-05-06T21:56:54-04:00 Various fixes and improvements to iptables stuff
- 8e4fcf9 2024-05-06T21:56:45-04:00 Fixes iptables issue where SNAT rules were being added multiple times
- fd5762c 2024-05-06T21:56:32-04:00 Adds iptables-restore capability for service sync
- 45c2ee4 2024-05-06T21:56:19-04:00 Vendor trozet/go-iptables
- 37d4a80 2024-05-06T21:54:05-04:00 Fixes inefficient service parsing
- 0343a8e 2024-05-06T11:50:38-04:00 Improves service iptables efficiency on start up
- 133eedb 2024-05-01T01:54:52-04:00 bump OVS version
- 32d2ce1 2024-04-10T15:30:47+02:00 Full implementation of KEP-1669 ProxyTerminatingEndpoints

- kubernetes image-amd64 8ca71f701a70cb3eed8603478e5f6c1676319fc4 to 416ecaf479d8fa342937068dede6481f5c7a1441
- da3c5db4b 2024-05-07T10:43:04+00:00 UPSTREAM: <carry>: Provide SCC access via RBAC

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-14-175553" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-05-14-190638"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-05-15-032103" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-05-15-065717"