Skip to content

NO-ISSUE: rebase-4.14.0-0.nightly-2024-05-27-130305_amd64-2024-05-27_arm64-2024-05-27 #3397

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 9 commits into from
May 28, 2024
Merged

NO-ISSUE: rebase-4.14.0-0.nightly-2024-05-27-130305_amd64-2024-05-27_arm64-2024-05-27 #3397

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
9e1543c
update last_rebase.sh
May 28, 2024
d52fc60
update changelog
May 28, 2024
6ed7837
update microshift/go.mod
May 28, 2024
a0cc6f3
update microshift/vendor
May 28, 2024
7be5277
update etcd/go.mod
May 28, 2024
9c343fa
update etcd/vendor
May 28, 2024
05595e7
update component images
May 28, 2024
b1174cf
update manifests
May 28, 2024
a606a01
update buildfiles
May 28, 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.14.0-0.nightly-arm64-2024-05-23-123237
OCP_VERSION := 4.14.0-0.nightly-arm64-2024-05-27-120012
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.14.0-0.nightly-2024-05-20-155905
OCP_VERSION := 4.14.0-0.nightly-2024-05-27-130305
1 change: 0 additions & 1 deletion assets/controllers/kube-apiserver/config-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ serviceAccountPublicKeyFiles:
# The following path contains the public keys needed to verify bound sa
# tokens. This is only supported post-bootstrap.
- /etc/kubernetes/static-pod-resources/configmaps/bound-sa-token-signing-certs

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.14.0-0.nightly-arm64-2024-05-23-123237"
"base": "4.14.0-0.nightly-arm64-2024-05-27-120012"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d15ba16c99c08fe49b742c96ded19f3934294bca592418b835bff30bfcebf77",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6624ec8007ffa9f465e197d9de555a5d9f1acf1b05ba2d0bab013088217aabed",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:218ae78b9685532708bc26c0cf58455b8ab8d1f1238ba9965e763a76c59b511e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54af87eb207b7f05def68326cdb7f4e03ba766312b60e6e41a433beb5c84de37",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd31fee892859c2f92004de16416718714bdf677fdd5d52cda32d42e5a6388e6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5facccdc49ae11c0af28284f45c9651b46a00324526d827f8ea413dd2abd4ada",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:388de64014904e813d96448466356224e448d3278786dbee971545dbda9d9842",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b4477fce03efd3ab3220f53e5668a115e72aca29757c2f87a56965994b5c697",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
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.14.0-0.nightly-2024-05-20-155905"
"base": "4.14.0-0.nightly-2024-05-27-130305"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00e364011c67e7498c7ba0ee769c97b24e43b0b3863ec39860ea05fb7c15c279",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0c6e2b7672e5d959a506baa803e18e6c0d73fdfe7534ae28c61f69583e5e5ec",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f699172cd627b0babbc67878fd78883648a1f8bd9c82441e875b67a9c8f5b71a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41cf2f6ddbe07a2356bada1196f1f09804bc2ff8b5b588117190ef4e8028f8b2",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3dd75913ad28f9fbe073aa6b4a4395d983576cb6baa3b951c45a80b721bbc0b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60eaf6b3d575c07ae9cd6326a7effc11bfd56eeec96b6b8cd1323a87fda6f046",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa37b136a21c7da46402000688540a2c70edc89d386b11e5268f84b0f4cbff1c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:600c03493940c25ae3381c9a6ffb7f18f67e1601ba20302e460cc4a1ef132216",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33745f0814b401a1dfd89ba9bdf374e52521f175d0578cab4900afbd70eff3cb",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f6ec1e4ec9138491cd9c6b49038c49eabc1e9116a25e5be6ddc709a36339383",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01c9e7fffa1e6c0cc6b1ded0f8c381ac00a6f34699f1281ac477657717806fe6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9483c0424146fbdf92a73c2ce7ad1163410b570e3e7f76550b6d7cc18d5ab57e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88a7db8489abe78636d4452283c35b2e62fc38f2d6e09c8eba96687c2856db61",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53cdb9dbbc53a93861f725ea08a2c8574cdd8e9ff3e7dfd843877758dc571263",
"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:1ac24a4cc03b5c7fa8c6be5f4de9c9fdc946ddb302f0c028264bcfeea097fbf9",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b20f6fdc6a4c62300eabbf967ed798ca6a3f5d43a067df4774ec76c5b038656",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43b98f22d7383fbd10fcbf271c1a55f5ce90a7e89b5ffe390458cc772ce5a4a9"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3510003c5ebcb28be2825641599617e04170998090878fa62ed07661ba3dc63",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:409f60bdf11430c0b34def19129fe6cc0f1402fbd25a800ad0c9276abfd82871",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc9de32fa8db9a7025f651fc607427f226b78526beda1c385e60270a8b941a3d"
}
}
12 changes: 6 additions & 6 deletions etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ require (

replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 // from kubernetes
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240516144826-048520e2550f // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240516144826-048520e2550f // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240516144826-048520e2550f // staging kubernetes
Expand Down
24 changes: 12 additions & 12 deletions etcd/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,18 +284,18 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880 h1:FFRA5mTN0CwySUwJnerfX9oCpT3H2ply4sLhXwMubPY=
github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:U849p7TYPDOn10NOFUq2N4sQ/wmoFATuO+0I+QdYeoQ=
github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:QwsgXhxP1oarPmZ2PN/q64kJOGkH6ivRldlxiy5hmO8=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8=
github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:l0SY5owduZwbAofIjNPmyJtbQ2dgFFmJ9ytvzeELRDI=
github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:Y9teTmp3d4+JP0N2kx+tlg+Rjucn+nMPcTTsm6dPEtc=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:VJKb6GzR49RrpWlIK5KikFJblsOF9Y8HEQCMGvD3uIU=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw=
github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:r/WEOTzMIh8iJqAbRL6MNOPTSHXf2+s0ArJM27OGiRI=
github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ=
github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:PhLpkbh8u9A13wRtRRY8Wdi/hSyJl1kPUhefR/HXV5k=
github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:jek+dBXmSH2TRnkidLBMjpa8vWoIwGYZrxDxnX9ey+c=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4=
github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:CSoRU2XPMMRziq/pDD3H9pJA5ZJS+KkpaoRLzAxmvak=
github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:F+CwzRywZ3GIekxW+9trXQtB09uhJECHZagblb5YWyk=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:UVwg/QIMoJncyeb/YxvJBJCE/NEwtHWashqc8A1nj/M=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:6aC0BK4f4KqjicxhH+THYj/i8kKWwce1Uq6CWbCSO1I=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U=
github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:wIeFyS+hpjk/YD2TxKVeW5XqfoGix50aeNM+RnV6PoQ=
github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240516144826-048520e2550f h1:hyjaS011I9fFO9R4bvGb0VRXxtSAW0L7RDa9/GQtnco=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240516144826-048520e2550f/go.mod h1:oz3j0Ipoe5ZwwvfBCgxvcQTJKar/xDL5zSMKGSK6R9E=
github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240516144826-048520e2550f h1:a85PH19P2jv1OpGb006SOWHlHCZ6BV75stZFrBh/uHc=
Expand Down
2 changes: 1 addition & 1 deletion etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 0 additions & 26 deletions etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go
View file
Open in desktop

This file was deleted.

21 changes: 8 additions & 13 deletions etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 2 additions & 17 deletions etcd/vendor/go.etcd.io/etcd/client/v3/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions etcd/vendor/go.etcd.io/etcd/client/v3/config.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading