Skip to content
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

NO-ISSUE: rebase-4.14.0-0.nightly-2023-11-02-185339_amd64-2023-11-02_arm64-2023-11-02 #2550

Merged
merged 8 commits into from
Nov 3, 2023
Merged

NO-ISSUE: rebase-4.14.0-0.nightly-2023-11-02-185339_amd64-2023-11-02_arm64-2023-11-02 #2550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
643d97e
update last_rebase.sh
Nov 3, 2023
8f3c144
update changelog
Nov 3, 2023
00d33ed
update microshift/go.mod
Nov 3, 2023
8a51460
update microshift/vendor
Nov 3, 2023
c004795
update etcd/go.mod
Nov 3, 2023
74af907
update etcd/vendor
Nov 3, 2023
489ef5a
update manifests
Nov 3, 2023
dfa543f
update buildfiles
Nov 3, 2023
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-2023-10-29-160035
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-11-02-180931
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-2023-10-29-174642
OCP_VERSION := 4.14.0-0.nightly-2023-11-02-185339
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,9 +1,9 @@
{
"release": {
"base": "4.14.0-0.nightly-arm64-2023-10-29-160035"
"base": "4.14.0-0.nightly-arm64-2023-11-02-180931"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddce50ef6d387fe90092e56e5b008fdc85f1f9ca7d2aa664e3676c1371957e72",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8698ef6583dda65da4dd919c0bdf81bbfe7e91bc8f9c4f2ca870913fa5df3813",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01963c157c10dfa0b8bbff063746efb3d2bcf89d16f199b400ef7447044b2f8c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39789d066eb7691177e2c8c1dacfa29154fea1c2d17b0ab92254b8b5f46a55b3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01d9cf515d8d9473bc102906ae1795895e0112ad63e59fc3cb7e53f7043849d3",
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,9 +1,9 @@
{
"release": {
"base": "4.14.0-0.nightly-2023-10-29-174642"
"base": "4.14.0-0.nightly-2023-11-02-185339"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:392a225cf7a152e99cb478708a39de580779597f2b5c528bc85b15fbacf89b0f",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c539fdc9ca9d1d2505ef4072c9135ff3073bd1fb11e3da2f7c751089b37e42ff",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e1a3097bd2bca4382b4ea745b26a53aeb9456ca8b57394cb85769636b25740b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d3205064cc53bdf8229e094a7af58e09004d36c47afbc6ca65d398d23bc6cfb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9f3fd40fcd5f41b7d76f9ed0726e72e7e99ec5fcd1b6eda5d0bcc03100c4f7d",
Expand Down
26 changes: 13 additions & 13 deletions etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ require (
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v2 v2.305.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/raft/v3 v3.5.9 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
Expand Down Expand Up @@ -139,12 +139,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.20231027165955-497a17f227c4 // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20231027165955-497a17f227c4 // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20231027165955-497a17f227c4 // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20231027165955-497a17f227c4 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20231027165955-497a17f227c4 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20231027165955-497a17f227c4 // from etcd
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20231101164224-ba21c5bca59a // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20231101164224-ba21c5bca59a // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20231101164224-ba21c5bca59a // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20231101164224-ba21c5bca59a // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20231101164224-ba21c5bca59a // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20231101164224-ba21c5bca59a // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20231020222044-f67aeb31c9b9 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20231020222044-f67aeb31c9b9 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20231020222044-f67aeb31c9b9 // staging kubernetes
Expand Down
32 changes: 16 additions & 16 deletions etcd/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,18 +291,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.20231027165955-497a17f227c4 h1:BXPOHkd6M2719p/fcHl7wG25krskVhBEmy0uM/wTD7c=
github.com/openshift/etcd/api/v3 v3.5.1-0.20231027165955-497a17f227c4/go.mod h1:4Xpx6qrsxGflSFqPC3UEVFx1UkE0VYutQje1U90wNmw=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20231027165955-497a17f227c4 h1:jjEiYpS5qkbiupG71WHGW7E7OWCK45wsGa6+Q8W1gnA=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20231027165955-497a17f227c4/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4=
github.com/openshift/etcd/client/v3 v3.5.1-0.20231027165955-497a17f227c4 h1:/lYB7dStd6CfgwyHW7Mys4KSJGx8vGdKqUyFUd6xiwQ=
github.com/openshift/etcd/client/v3 v3.5.1-0.20231027165955-497a17f227c4/go.mod h1:g0MKQ7nZi6YYqh2MVqhAtRqxmyt/yqTKvK5s4ZovEVc=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20231027165955-497a17f227c4 h1:YwAWUbzZ6wqfQGyVarlHhPKtFAI63NNT+yv1YQjpvKk=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20231027165955-497a17f227c4/go.mod h1:b9CGLynz7tPu6K1vfRjCymX4j/7F7dlFyFHnPhcqWzk=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20231027165955-497a17f227c4 h1:8LBvfhJ4T0/s2O1tCDuxwR8X07mHSCs26lxu91QsvxU=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20231027165955-497a17f227c4/go.mod h1:B0zZ1FJhWDc5xVVDjDHHaHgG5yeJO24lU0wkKbHNcdc=
github.com/openshift/etcd/server/v3 v3.5.1-0.20231027165955-497a17f227c4 h1:db2SXpH4kIMwYbUHEWUVkDUhXo05xQIgTTP7hu6/Uqw=
github.com/openshift/etcd/server/v3 v3.5.1-0.20231027165955-497a17f227c4/go.mod h1:jeWK7hbHaq19oxEAlXfuXBF2zRSsnqVSsdxVinSRtp4=
github.com/openshift/etcd/api/v3 v3.5.1-0.20231101164224-ba21c5bca59a h1:0YSGyirZ++K4dqEGCRVkN+AANUjHY9WJENjLyOl7JeY=
github.com/openshift/etcd/api/v3 v3.5.1-0.20231101164224-ba21c5bca59a/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20231101164224-ba21c5bca59a h1:raitiCSM8K8Eg6lhMfAlLXEdZAQ33t0XLPnLAh6u+Ak=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20231101164224-ba21c5bca59a/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U=
github.com/openshift/etcd/client/v3 v3.5.1-0.20231101164224-ba21c5bca59a h1:KCG6Iz0YLSzi3ZeiWmsqukPm6AqasWDeBNUpqz2vgnk=
github.com/openshift/etcd/client/v3 v3.5.1-0.20231101164224-ba21c5bca59a/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20231101164224-ba21c5bca59a h1:VwTou5aj3UsHs0vNIPMUyDCHa4v3EEl1QzDu0STowfY=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20231101164224-ba21c5bca59a/go.mod h1:TKTuCKKcF1zxmfKWDkfz5qqYaE3JncKKZPFf8c1nFUs=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20231101164224-ba21c5bca59a h1:OTMaUSur6P7YYBoUrQ0p3D+xRxQK+e3odlFnjVz7ev4=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20231101164224-ba21c5bca59a/go.mod h1:odD6kr8XQXTy9oQnyMPBOr0TVe+gT0neQhElQ6jbGRc=
github.com/openshift/etcd/server/v3 v3.5.1-0.20231101164224-ba21c5bca59a h1:DP3jdG8PDyr4uh7D3qOMiuiMuHzfBP0HXsztPv+/pZo=
github.com/openshift/etcd/server/v3 v3.5.1-0.20231101164224-ba21c5bca59a/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20231020222044-f67aeb31c9b9 h1:QiRVgZhncXihcuHAdKxXqW+Z6Hfn7pONFCs6C+TC8NM=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20231020222044-f67aeb31c9b9/go.mod h1:6SSmfVImyyvdlwPXOemfo7J1NRg6ODpN5PPmWTlXPF8=
github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20231020222044-f67aeb31c9b9 h1:/qVok7rFr012rlUwgwI2mJ2r9sGJTjF7aBrlleU7GVM=
Expand Down Expand Up @@ -398,10 +398,10 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
go.etcd.io/etcd/client/v2 v2.305.9 h1:YZ2OLi0OvR0H75AcgSUajjd5uqKDKocQUqROTG11jIo=
go.etcd.io/etcd/client/v2 v2.305.9/go.mod h1:0NBdNx9wbxtEQLwAQtrDHwx58m02vXpDcgSYI2seohQ=
go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
go.etcd.io/etcd/client/v2 v2.305.10 h1:MrmRktzv/XF8CvtQt+P6wLUlURaNpSDJHFZhe//2QE4=
go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
Expand Down
15 changes: 2 additions & 13 deletions etcd/vendor/go.etcd.io/bbolt/bolt_openbsd.go
View file
Open in desktop

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

46 changes: 37 additions & 9 deletions etcd/vendor/go.etcd.io/bbolt/db.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/api/v3/etcdserverpb/gw/rpc.pb.gw.go
View file
Open in desktop

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

Loading