Skip to content

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-03-13-061822_amd64-2024-03-13_arm64-2024-03-13 #3160

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

Closed
microshift-rebase-script wants to merge 4 commits into from
Closed

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-03-13-061822_amd64-2024-03-13_arm64-2024-03-13 #3160

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
da747be
update changelog
Mar 15, 2024
930cfe4
update microshift/go.mod
Mar 15, 2024
9f4ae0b
update etcd/go.mod
Mar 15, 2024
4492abd
update etcd/vendor
Mar 15, 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
6 changes: 0 additions & 6 deletions etcd/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
Expand All @@ -118,7 +115,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
Expand Down Expand Up @@ -424,8 +420,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
10 changes: 10 additions & 0 deletions etcd/vendor/github.com/openshift/microshift/pkg/config/ingress.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: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
Expand Down
26 changes: 0 additions & 26 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +0,0 @@
- cluster-kube-controller-manager-operator embedded-component 5a8a98f06fe9d3ff9f26e2657db5bf5a68112147 to 8dc397b7116673916fa5ba35f63fbeed4154aaad
- 2b2d74c 2024-03-08T13:26:56+01:00 bump(google.golang.org/protobuf)=v1.33.0

- cluster-kube-scheduler-operator embedded-component 81808652c748a608f54435f186833e74e6b9cf30 to 4be4e433eec566df60d6d89f09a13b706e93f2a3
- 89204f6 2024-03-08T13:21:22+01:00 bump(google.golang.org/protobuf)=v1.33.0

- cluster-openshift-controller-manager-operator embedded-component d97bdefe3d5c1cb83d63f732fd35732a83ba7708 to 3b30d5f79b4de6d1603dc01373a85309f1e96b76
- 385fe61 2024-03-11T14:55:20-04:00 BUILD-854: Add adambkaplan as approver

- cluster-policy-controller embedded-component 7ed07d5ee710a3c450f2134f41030f59c48c5176 to eaea543f4c845a7b65705f12e162cc121bb12f88
- 5dfdaa3 2024-03-08T13:29:54+01:00 bump(google.golang.org/protobuf)=v1.33.0

- machine-config-operator embedded-component a07395300232d2dd00fd86dca0a14068f0d8cdc2 to 562ef07a9e102dcfaaba8114ca41f1ae02eea9df
- c1553d76 2024-03-12T10:38:17+00:00 Add temporary nolint for unused FG params
- 4680a9c5 2024-03-11T16:59:12+00:00 Unwind feature gates from template controller
- 249d1ab8 2024-03-04T10:50:11+01:00 Sync CRI-O owners
- b4d57760 2024-02-29T11:19:48+00:00 Remove cloudConfigFlag from Kubelet Definitions
- 1c389d37 2024-02-29T11:16:45+00:00 Remove reliance on feature gate from cloud provider flags
- 1ff7e3b3 2024-02-29T11:03:57+00:00 Update library-go

- openshift-controller-manager embedded-component 3369227f301f7bc98e3f364c9bfb6fff788302d6 to 9b5d8e82451da3a0128be1c8fad2742a9764868a
- 94ee6d9 2024-03-11T14:51:23-04:00 BUILD-854: Add adambkaplan as approver

- oc image-amd64 45fe5d4c22dc44b82f7d8bc556759e9769fe61c6 to c92b50721e5b12fc1edb6cd4cb2390d8622d1f1e
- b0226705 2024-03-11T16:16:30+01:00 tools: extend the image with sosreport