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.

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

update etcd, grpc, protobuf dependencies #100488

Merged
merged 11 commits into from
Jun 15, 2021
Merged

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Mar 23, 2021

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Fixes #93320

Updates to a version of github.com/golang/protobuf that resolves immediate gogo protobuf incompatibilities as a short-term fix (https://go-review.googlesource.com/c/protobuf/+/300869/).

Update protobuf,grpc,etcd dependencies

  1. Updated etcd/protobuf/grpc dependencies:

    echo "
    hack/pin-dependency.sh github.com/golang/protobuf latest
    hack/pin-dependency.sh google.golang.org/protobuf latest
    hack/pin-dependency.sh go.etcd.io/etcd/api/v3 v3.5.0-rc.0
    hack/pin-dependency.sh go.etcd.io/etcd/client/v3 v3.5.0-rc.0
    hack/pin-dependency.sh go.etcd.io/etcd/client/pkg/v3 v3.5.0-rc.0
    hack/pin-dependency.sh go.etcd.io/etcd/pkg/v3 v3.5.0-rc.0
    hack/pin-dependency.sh go.etcd.io/etcd/server/v3 v3.5.0-rc.0
    hack/pin-dependency.sh go.etcd.io/etcd/tests/v3 v3.5.0-rc.0
    hack/pin-dependency.sh google.golang.org/grpc latest
    " | bash
    
  2. Linted transitive dependencies until versions are clean:

    hack/lint-dependencies.sh  | grep "  hack/pin-dependency.sh" | bash
    
  3. Linted dependencies until dropped versions are clean:

    hack/lint-dependencies.sh  | grep "dropreplace" | bash
    
  4. Updated vendor and internal modules:

    hack/update-vendor.sh
    hack/update-internal-modules.sh
    

Repeated steps 2-4 until clean

Commit reviews by area:

before merge:

post-merge:

/milestone v1.22
/cc @dims

The etcd client has been updated to 3.5.0; github.com/golang/protobuf, google.golang.org/protobuf, and google.golang.org/grpc have been updated to current versions.

@k8s-ci-robot k8s-ci-robot requested a review from dims March 23, 2021 14:35
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Mar 23, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Mar 23, 2021
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. area/kubeadm area/release-eng Issues or PRs related to the Release Engineering subproject area/test and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 23, 2021
@k8s-ci-robot k8s-ci-robot merged commit 3a47ddc into kubernetes:master Jun 15, 2021
@liggitt liggitt deleted the protobuf branch June 15, 2021 22:21
@dashpole dashpole mentioned this pull request Jun 16, 2021
kzys added a commit to kzys/containerd that referenced this pull request Jun 16, 2021
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
dims pushed a commit to containerd/containerd that referenced this pull request Jun 17, 2021
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
brandond pushed a commit to brandond/containerd that referenced this pull request Aug 20, 2021
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
(cherry picked from commit b7e79dc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond pushed a commit to k3s-io/containerd that referenced this pull request Oct 4, 2021
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
(cherry picked from commit b7e79dc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
fahedouch pushed a commit to fahedouch/containerd that referenced this pull request Oct 15, 2021
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
brandond pushed a commit to brandond/containerd that referenced this pull request Nov 18, 2021
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
(cherry picked from commit b7e79dc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond pushed a commit to brandond/containerd that referenced this pull request Jan 6, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
(cherry picked from commit b7e79dc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond pushed a commit to brandond/containerd that referenced this pull request Mar 2, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
(cherry picked from commit b7e79dc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
dims pushed a commit to dims/containerd-api-only that referenced this pull request Mar 10, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
dims pushed a commit to dims/containerd-api-only that referenced this pull request Mar 26, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
dims pushed a commit to dims/containerd-api-only that referenced this pull request Mar 26, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
brandond pushed a commit to brandond/containerd that referenced this pull request Apr 25, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
(cherry picked from commit b7e79dc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
akhilerm pushed a commit to akhilerm/containerd-api that referenced this pull request May 23, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
yylt pushed a commit to yylt/containerd that referenced this pull request Jun 14, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
akhilerm pushed a commit to akhilerm/containerd-api that referenced this pull request Jun 22, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
akhilerm pushed a commit to akhilerm/containerd-api that referenced this pull request Oct 4, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
akhilerm pushed a commit to akhilerm/containerd-api that referenced this pull request Oct 4, 2022
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
akhilerm pushed a commit to akhilerm/containerd-test that referenced this pull request Feb 22, 2023
v1.38.0 is used by Kubernetes since
kubernetes/kubernetes#100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>

Containerd-test-commit: afc17e9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubeadm area/kubectl area/kubelet area/release-eng Issues or PRs related to the Release Engineering subproject area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
Archived in project
Archived in project
SIG Node PR Triage
Waiting on Author
Development

Successfully merging this pull request may close these issues.

google.golang.org/grpc cannot be upgraded >= v1.30.0