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

etcd3 backend: support TLS #30843

Merged
merged 4 commits into from
Aug 22, 2016
Merged

etcd3 backend: support TLS #30843

merged 4 commits into from
Aug 22, 2016

Conversation

hongchaodeng
Copy link
Contributor

@hongchaodeng hongchaodeng commented Aug 18, 2016 •
edited
Loading

What?
Support TLS in etcd3 storage backend.
It works the same as previous etcd2 config.

This change is Reviewable

@hongchaodeng
Copy link
Contributor Author

cc @xiang90 @timothysc

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Aug 18, 2016
@xiang90
Copy link
Contributor

xiang90 commented Aug 18, 2016

do we have a test for this? (do we have a test for the etcd2 TLS thing?)

lgtm other than that.

@timothysc
Copy link
Member

do we have a test for this? (do we have a test for the etcd2 TLS thing?)

We do, it's built into the test server in utils, but we should have a separate UT.

@timothysc timothysc added this to the v1.4 milestone Aug 18, 2016
@hongchaodeng
Copy link
Contributor Author

Depends on etcd-io/etcd#6222

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 18, 2016
@xiang90
Copy link
Contributor

xiang90 commented Aug 18, 2016

lgtm once test passes

@hongchaodeng hongchaodeng mentioned this pull request Aug 19, 2016
Closed
30 tasks
@timothysc timothysc added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Aug 19, 2016
@timothysc
Copy link
Member

@k8s-bot test this please, issue #IGNORE

@hongchaodeng
Copy link
Contributor Author

@timothysc
I'm working updating etcd dep again to resolve this. "godep" is so fun to work with...

@hongchaodeng hongchaodeng mentioned this pull request Aug 20, 2016
Merged
k8s-github-robot pushed a commit that referenced this pull request Aug 21, 2016
Merge pull request #31050 from hongchaodeng/bump
1dcf84e 
Automatic merge from submit-queue

godep: bump etcd to 3.0.6

What?
Bump etcd godep dependency to v3.0.6

Why?
ref: #30843, etcd-io/etcd#6222 
We have some fix to do secure client connection in unit tests.
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 22, 2016
timothysc
timothysc reviewed Aug 22, 2016
View reviewed changes
pkg/storage/etcd/testing/testingcert/certificates.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package testing
package testingcert
Copy link
Member

Choose a reason for hiding this comment

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

At some point in 1.5 we should rationalize the location of some of these testing bits that are shared across implementations.

@timothysc
Copy link
Member

timothysc commented Aug 22, 2016 •
edited
Loading

"godep" is so fun to work with...

tell me about it...

lgtm.

@timothysc timothysc added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 22, 2016
@timothysc
Copy link
Member

@k8s-bot test this please, issue #IGNORE

@k8s-bot
Copy link

k8s-bot commented Aug 22, 2016

GCE e2e build/test passed for commit 77ffae1.

@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 Aug 22, 2016

GCE e2e build/test passed for commit 77ffae1.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 7bd8d7d into kubernetes:master Aug 22, 2016
@yujuhong
Copy link
Contributor

Just a late reminder, but the commits should've been squashed before merging.

@timothysc
Copy link
Member

@yujuhong Hmm perhaps we can add that as a bot-check w/flag'd override.

@hongchaodeng hongchaodeng deleted the tls branch August 24, 2016 03:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@timothysc timothysc

@lavalamp lavalamp

@xiang90 xiang90

Labels
area/etcd lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
8 participants
@hongchaodeng @xiang90 @timothysc @k8s-bot @k8s-github-robot @yujuhong @lavalamp @googlebot