Skip to content

Conversation

@sjenning
Copy link
Contributor

master PR #23585

pull in openshift/google-cadvisor#7

The delta is larger because a make update-deps on a clean origin/master makes a lot of changes and the github.com/apcera/gssapi dep needed to be redirected to the openshift fork because that repo doesn't exist anymore. I've split up the bump(*) on the clean master into a separate commit.

Fixes #23492

@derekwaynecarr @deads2k @mfojtik

@openshift-ci-robot
Copy link

@sjenning: This pull request references an invalid Bugzilla bug:

  • expected dependent Bugzilla bug to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1741681: Bump cadvisor [4.1.z]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 16, 2019
@sjenning
Copy link
Contributor Author

@deads2k note the removal of DefaultServingCertificate in the openshift/api bump. Want to make sure that is ok.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 16, 2019
@sjenning
Copy link
Contributor Author

well, I guess it isn't fine

 ++ Building go targets for linux/amd64: cmd/hypershift vendor/k8s.io/kubernetes/cmd/hyperkube
# github.com/openshift/origin/pkg/admission/customresourcevalidation/apiserver
pkg/admission/customresourcevalidation/apiserver/validate_apiserver.go:120:26: spec.ServingCerts.DefaultServingCertificate undefined (type "github.com/openshift/origin/vendor/github.com/openshift/api/config/v1".APIServerServingCerts has no field or method DefaultServingCertificate)
pkg/admission/customresourcevalidation/apiserver/validate_apiserver.go:131:29: newSpec.ServingCerts.DefaultServingCertificate undefined (type "github.com/openshift/origin/vendor/github.com/openshift/api/config/v1".APIServerServingCerts has no field or method DefaultServingCertificate) 

need to adjust the pin for openshift/api for 4.1

@sjenning
Copy link
Contributor Author

openshift/api#375 should not have been picked back to openshift/api release 4.1 branch...

@eparis
Copy link
Member

eparis commented Aug 20, 2019

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 20, 2019
@openshift-ci-robot
Copy link

@eparis: This pull request references Bugzilla bug 1741681, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@eparis
Copy link
Member

eparis commented Aug 24, 2019

This need engineering review/lgtm/approval
/retest

@sjenning
Copy link
Contributor Author

/retest

@sjenning
Copy link
Contributor Author

/retest

@rphillips
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 29, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rphillips, sjenning

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

}

errs = append(errs, validation.ValidateObjectMeta(&obj.ObjectMeta, false, customresourcevalidation.RequireNameCluster, field.NewPath("metadata"))...)
errs = append(errs, validateAPIServerSpecCreate(obj.Spec)...)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sjenning how is this related to the cadvisor bump?

Copy link
Contributor Author

@sjenning sjenning Sep 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mfojtik it isn't, but openshift/api#375 went into openshift/api branch release-4.1 and after the bump, the build failed without this change

- config/v1beta1
- name: k8s.io/kubernetes
version: cc2afe3181bd5593ad5c03e9a768e3ff270ec343
version: fd7008ebbbb179b36367d02fc929ca7eb514d0b0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm why this moved and what is this level?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @deads2k @sttts

Is the bot broken?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$ git log cc2afe3181bd5593ad5c03e9a768e3ff270ec343..fd7008ebbbb179b36367d02fc929ca7eb514d0b0 --oneline
fd7008ebbbb Merge pull request #23517 from sttts/sttts-procmount-4.1
cf981128196 Merge pull request #23524 from rphillips/backport_4.1/80657
dbd6628aba9 UPSTREAM: 80657: add UID to kubelet_container_log_filesystem_used_bytes metric
d78ddd3c037 UPSTREAM: 78882: Fix incorrect procMount defaulting
f27555ff6d6 Merge pull request #23367 from RobertKrawitz/upstream-79391-4.1
4597d2ea87f bump
32ecfe871e5 UPSTREAM: 79391: Don't use strategic merge patch on Node.Status.Addresses

@mfojtik mfojtik added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 6, 2019
@openshift-merge-robot openshift-merge-robot merged commit da040ab into openshift:release-4.1 Sep 6, 2019
@openshift-ci-robot
Copy link

@sjenning: All pull requests linked via external trackers have merged. Bugzilla bug 1741681 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1741681: Bump cadvisor [4.1.z]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants