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

Bug 2069310: UPSTREAM: <carry>: use hardcoded rest mapper from library-go #1233

Merged
merged 1 commit into from Apr 18, 2022

Conversation

tkashem
Copy link

@tkashem tkashem commented Apr 5, 2022

No description provided.

@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Apr 5, 2022
@openshift-ci-robot
Copy link

@tkashem: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 5, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 5, 2022

@tkashem: This pull request references Bugzilla bug 2069310, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is MODIFIED 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.

In response to this:

Bug 2069310: UPSTREAM: : use hardcoded rest mapper from library-go

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.

@tkashem
Copy link
Author

tkashem commented Apr 5, 2022

  1. If the Bugzilla associated with the PR has the "FastFix" keyword, the subjective assessment on the issue has already been done and a customer is impacted. These PRs should be prioritized for merge.
    • verified
    • does not apply
  2. The bug has significant impact either through severity, reduction in supportability, or number of users affected.
    • verified
    • does not apply
  3. For branches that are in the Maintenance lifecycle phase:
    • The bug is a critical fix, no reasonable workaround exists, and a recommendation for upgrade has been ruled out, or
    • The bug is a security related bug
    • Branch not in maintenance mode yet (current release + previous release for 90 days after current GA; everything older is in maintenance)
  4. The severity field of the bug must be set to accurately reflect criticality.
    • verified
  5. The PR was created with the cherry-pick bot OR the PR’s description is well formed with user-focused release notes that state the bug number, impact, cause, and resolution. Where appropriate, it should also contain information about how a user can identify whether a particular cluster is affected.
    • verified

@openshift-ci openshift-ci bot requested review from mfojtik and soltysh April 5, 2022 12:50
@openshift-ci openshift-ci bot added the vendor-update Touching vendor dir or related files label Apr 5, 2022
@tkashem
Copy link
Author

tkashem commented Apr 5, 2022

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 5, 2022
@tkashem
Copy link
Author

tkashem commented Apr 5, 2022

/bugzilla refresh

@openshift-ci openshift-ci bot 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 Apr 5, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 5, 2022

@tkashem: This pull request references Bugzilla bug 2069310, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.z) matches configured target release for branch (4.9.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 2069311 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 2069311 targets the "4.10.z" release, which is one of the valid target releases: 4.10.0, 4.10.z
  • bug has dependents

Requesting review from QA contact:
/cc @wangke19

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.

@openshift-ci openshift-ci bot requested a review from wangke19 April 5, 2022 12:57
@tkashem
Copy link
Author

tkashem commented Apr 5, 2022

/retest

3 similar comments
@tkashem
Copy link
Author

tkashem commented Apr 5, 2022

/retest

@tkashem
Copy link
Author

tkashem commented Apr 5, 2022

/retest

@tkashem
Copy link
Author

tkashem commented Apr 7, 2022

/retest

@aojea
Copy link

aojea commented Apr 7, 2022

@sosiouxme is 4.9 using golang 1.17 or 1.18 without the ENV variable hack ?

@aojea
Copy link

aojea commented Apr 7, 2022

is it possible that the builder image doesn't have the correct go version? the patch seems to be there

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder
WORKDIR /go/src/k8s.io/kubernetes
COPY . .
RUN make GOFLAGS='-mod=vendor -p=4 -tags=unsupportedGolang116OnlyUseDeprecatedParseIPv4' \
WHAT='cmd/kube-apiserver cmd/kube-controller-manager cmd/kube-scheduler cmd/kubelet cmd/watch-termination' && \
mkdir -p /tmp/build && \
cp openshift-hack/images/hyperkube/hyperkube /tmp/build && \
cp /go/src/k8s.io/kubernetes/_output/local/bin/linux/$(go env GOARCH)/{kube-apiserver,kube-controller-manager,kube-scheduler,kubelet,watch-termination} \
/tmp/build

@sosiouxme
Copy link
Member

is it possible that the builder image doesn't have the correct go version? the patch seems to be there

🐚 podman run -it registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 go version
go version go1.16.12 linux/amd64

that's the updated version which I built that should have the patch using the build flag. I didn't know a good way to test that it was correctly allowing the deprecated format, so I was relying on the unit tests to tell us...

@tkashem
Copy link
Author

tkashem commented Apr 13, 2022

/retest

@tkashem
Copy link
Author

tkashem commented Apr 14, 2022

/assign @deads2k

@deads2k
Copy link

deads2k commented Apr 14, 2022

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 14, 2022
}

return []*meta.RESTMapping{&single}, nil
return openshiftrestmapper.NewOpenShiftHardcodedRESTMapper(delegate)

Choose a reason for hiding this comment

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

since this is a backport I trust that we already checked and tested the new mapper.

@@ -70,7 +70,7 @@ require (
github.com/openshift/api v0.0.0-20211028023115-7224b732cc14
github.com/openshift/apiserver-library-go v0.0.0-20211105091019-06e87e7030eb
github.com/openshift/client-go v0.0.0-20210831095141-e19a065e79f7
github.com/openshift/library-go v0.0.0-20211207082558-36821c7a1fa2
github.com/openshift/library-go v0.0.0-20220405121559-e304504b7d6f

Choose a reason for hiding this comment

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

@p0lyn0mial
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 14, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, p0lyn0mial, tkashem

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

The pull request process is described here

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

@wangke19
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 15, 2022
@tkashem
Copy link
Author

tkashem commented Apr 18, 2022

/remove-label backports/unvalidated-commits
/label backports/validated-commits

@openshift-ci openshift-ci bot added backports/validated-commits Indicates that all commits come to merged upstream PRs. and removed backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. labels Apr 18, 2022
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@tkashem
Copy link
Author

tkashem commented Apr 18, 2022

/retest

@openshift-ci
Copy link

openshift-ci bot commented Apr 18, 2022

@tkashem: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit c02bd9d into openshift:release-4.9 Apr 18, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 18, 2022

@tkashem: All pull requests linked via external trackers have merged:

Bugzilla bug 2069310 has been moved to the MODIFIED state.

In response to this:

Bug 2069310: UPSTREAM: : use hardcoded rest mapper from library-go

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. backports/validated-commits Indicates that all commits come to merged upstream PRs. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. 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. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants