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.

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

Jump to bottom

correction on rbd volume object and defaults #25490

Merged
merged 1 commit into from
Jun 6, 2016
Merged

correction on rbd volume object and defaults #25490

merged 1 commit into from
Jun 6, 2016

Conversation

rootfs
Copy link
Contributor

@rootfs rootfs commented May 11, 2016

  • add omitempty to RBDPool RadosUser Keyring SecretRef ReadOnly
  • move defaults from pkg/volume/rbd/rbd.go to pkg/api/v1/defaults.go

addressing #18885

@k8s-github-robot k8s-github-robot added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels May 11, 2016
@rootfs
Copy link
Contributor Author

rootfs commented May 12, 2016

will fix CephFS in the same way too.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 13, 2016
@elsonrodriguez elsonrodriguez mentioned this pull request May 17, 2016
Merged
@elsonrodriguez
Copy link
Contributor

I tested this and was able to mount an rbd volume. LGTM

@pmorie pmorie added the sig/storage Categorizes an issue or PR as relevant to SIG Storage. label May 19, 2016
@pmorie
Copy link
Member

pmorie commented May 19, 2016 •
edited
Loading

@rootfs will you rebase this and we'll try to get it in to 1.3?

@pmorie pmorie added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label May 19, 2016
@rootfs
Copy link
Contributor Author

rootfs commented May 19, 2016

@pmorie rebased, thanks

@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 19, 2016
@elsonrodriguez
Copy link
Contributor

@rootfs The k8s bot bumped this again, any chance for a rebase?

@rootfs
Copy link
Contributor Author

rootfs commented Jun 1, 2016

@elsonrodriguez thanks

@pmorie PTAL

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 1, 2016
@pmorie pmorie self-assigned this Jun 3, 2016
@pmorie pmorie added this to the v1.3 milestone Jun 3, 2016
@pmorie
Copy link
Member

pmorie commented Jun 3, 2016

@rootfs verify script failure, run hack/update-all.sh:

/go/src/k8s.io/kubernetes/docs/api-reference is out of date. Please run hack/update-api-reference-docs.sh
FAILED   ./hack/../hack/verify-api-reference-docs.sh    29s

@rootfs
Copy link
Contributor Author

rootfs commented Jun 6, 2016

@pmorie all green.

@pmorie pmorie added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 6, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jun 6, 2016

GCE e2e build/test passed for commit 4b4048a.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 1de4b05 into kubernetes:master Jun 6, 2016
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Sep 27, 2020
@k8s-publishing-bot
Merge pull request kubernetes#25490 from p0lyn0mial/release-4-5-incon…
48767cf 
…sistent-list

Bug 1877346: Fix bug for inconsistent lists served from etcd

Origin-commit: 530288217294faea179bbcba066361b35818ee13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pmorie pmorie

Labels
kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
7 participants
@rootfs @elsonrodriguez @pmorie @k8s-github-robot @k8s-bot @smarterclayton @googlebot