Skip to content

Conversation

@gnufied
Copy link
Member

@gnufied gnufied commented Mar 21, 2019

Update openshift/api dependencies to enable local storage etc.

cc @deads2k

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 21, 2019
@gnufied gnufied changed the title Bump (*) Bump (*) deps Mar 21, 2019
@gnufied
Copy link
Member Author

gnufied commented Mar 21, 2019

/retest

@gnufied
Copy link
Member Author

gnufied commented Mar 21, 2019

Hmm, looks like this breaks stuff.

pkg/admission/customresourcevalidation/features/validate_features.go:34:46: undefined: "github.com/openshift/origin/vendor/github.com/openshift/api/config/v1".Features
pkg/admission/customresourcevalidation/features/validate_features.go:41:25: undefined: "github.com/openshift/origin/vendor/github.com/openshift/api/config/v1".Features
pkg/admission/customresourcevalidation/features/validate_features.go:56:37: undefined: "github.com/openshift/origin/vendor/github.com/openshift/api/config/v1".FeaturesSpec
pkg/admission/customresourcevalidation/features/validate_features.go:67:46: undefined: "github.com/openshift/origin/vendor/github.com/openshift/api/config/v1".FeaturesSpec
[ERROR] hack/lib/build/binaries.sh:236: `GOOS=${platform%/*} GOARCH=${platform##*/} go install -pkgdir "${pkgdir}/${platform}" -tags "${OS_GOFLAGS_TAGS-} ${!platform_gotags_envvar:-}" -ldflags="${local_ldflags}" "${goflags[@]:+${goflags[@]}}" -gcflags "${gogcflags}" "${nonstatics[@]}"` exited with status 2.
[ERROR] hack/lib/build/binaries.sh:150: `local -a binaries=("$@")` exited with status 2.
[ERROR] hack/build-go.sh exited with code 2 after 00h 03m 15s
make: *** [build] Error 2

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 21, 2019
@adambkaplan
Copy link
Contributor

@gnufied we have an existing bump #22389 that is in the merge queue. Unless something is missed there I would close this PR.

@gnufied
Copy link
Member Author

gnufied commented Mar 21, 2019

@adambkaplan it misses openshift/api#259 and I need this for 4.1. @sjenning do you want to update your PR to include local-storage chage?

@sjenning
Copy link
Contributor

I'm not sure why that PR was not included in my bump 😕 It merged 23 hours ago and I did my bump about 3 hours ago. Seems like it should have been brought in.

@gnufied
Copy link
Member Author

gnufied commented Mar 21, 2019

Yeah, I dunno either but see - https://github.com/openshift/origin/blob/f304aa413e97b4794c9f4d7d38084defb81e180e/vendor/github.com/openshift/api/config/v1/types_feature.go , it is missing my change.

@sjenning how do we resolve this? May be rerun update-dep.sh ?

@gnufied
Copy link
Member Author

gnufied commented Mar 22, 2019

Discussed offline with @sjenning , the plan is to let his PR merge and then update this PR. That should also fix the failures I am seeing on this branch.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 24, 2019
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 24, 2019

@gnufied: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/artifacts 17e0b3a link /test artifacts
ci/prow/e2e-aws-builds 17e0b3a link /test e2e-aws-builds
ci/prow/e2e-aws-image-ecosystem 17e0b3a link /test e2e-aws-image-ecosystem

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 25, 2019
Enable local storage
@sjenning
Copy link
Contributor

#22389 is merged. you should be able to rebase this without the errors your were seeing before.

@gnufied
Copy link
Member Author

gnufied commented Mar 26, 2019

@sjenning yeah. Already did that. ptal.

@gnufied
Copy link
Member Author

gnufied commented Mar 26, 2019

@adambkaplan since we still need this PR for enabling local storage, I am going to cancel the hold.

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2019
Disabled: []string{
"LocalStorageCapacityIsolation", // sig-pod, sjenning
"PersistentLocalVolumes", // sig-storage, hekumar@redhat.com
},
Copy link
Member Author

Choose a reason for hiding this comment

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

@deads2k enables local-storage.

@sjenning
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gnufied, 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 26, 2019
@openshift-merge-robot openshift-merge-robot merged commit 76ffac1 into openshift:master Mar 26, 2019
@deads2k
Copy link
Contributor

deads2k commented Mar 27, 2019

@deads2k enables local-storage.

It does not do this. As I explained on slack, you need to wire this through an operator. Bumping here didn't enable it and as I noted on slack results in a fair amount of work to rejigger the rebase branches to rematch what's been done.

We're trying to keep origin open for upstream changes and bumps, but please, please, use them only for changes that are actually needed. We don't want to keep rebasing the rebase unnecessarily. If it becomes too big a problem, we will have to shut down origin for all but explicitly approved bumps and picks.

@gnufied
Copy link
Member Author

gnufied commented Mar 27, 2019

@deads2k I can revert this. I should have put this on hold.

@gnufied
Copy link
Member Author

gnufied commented Mar 27, 2019

Discussed this offline in Slack. @deads2k has already started rebumping things, so we don't need to revert for now. But I will keep this mind for future bump PRs.

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. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants