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

UPSTREAM: 41939: Add an AEAD encrypting transformer for storing secrets encrypted at rest #14243

Merged

Conversation

php-coder
Copy link
Contributor

@php-coder php-coder commented May 18, 2017

Backport of kubernetes/kubernetes#41939

I've excluded staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go, staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go because we don't have them. Also hack/.linted_packages and BUILD files were excluded too, AFIU we don't need them.

PTAL @smarterclayton @mfojtik

@ncdc ncdc changed the title UPSTREAM: Add an AEAD encrypting transformer for storing secrets encrypted at rest UPSTREAM: 41939: Add an AEAD encrypting transformer for storing secrets encrypted at rest May 18, 2017
@ncdc
Copy link
Contributor

ncdc commented May 18, 2017

Why is this a <drop> commit?

@ncdc
Copy link
Contributor

ncdc commented May 18, 2017

Also, can this wait until the next rebase?

@mfojtik
Copy link
Contributor

mfojtik commented May 18, 2017

@ncdc it was merged

@php-coder
Copy link
Contributor Author

@ncdc Because it's already merged in the k8s and will be here after next rebase.

@mfojtik
Copy link
Contributor

mfojtik commented May 18, 2017

@ncdc can't wait unfortunately...

@ncdc
Copy link
Contributor

ncdc commented May 18, 2017

Please don't mark it as a <drop> unless I'm misunderstanding how we're using the terminology /cc @deads2k

@php-coder
Copy link
Contributor Author

@ncdc It's my first backport so I can do something wrong just because don't know how to do it properly. I'd be grateful if you point me to the documentation that describe the process.

Please don't mark it as a

How it should be marked then?

@ncdc
Copy link
Contributor

ncdc commented May 18, 2017

@php-coder UPSTREAM: 41939: Add an AEAD encrypting ...

@php-coder php-coder force-pushed the backport_encrypting_transformers branch from 7a3a55d to c5f077f Compare May 18, 2017 13:51
@mfojtik
Copy link
Contributor

mfojtik commented May 18, 2017

@smarterclayton lets sync about this early next week and figure out what is missing and how to wire this into our config.

@smarterclayton
Copy link
Contributor

We actually want the _test.go files in this case.

@php-coder php-coder force-pushed the backport_encrypting_transformers branch from c5f077f to 248eb53 Compare May 18, 2017 16:44
@php-coder
Copy link
Contributor Author

We actually want the _test.go files in this case.

Added.

@smarterclayton
Copy link
Contributor

LGTM [merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 248eb53

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 248eb53

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1564/) (Base Commit: 74e1a68)

@openshift-bot
Copy link
Contributor

openshift-bot commented May 20, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/722/) (Base Commit: 932e9dd) (Image: devenv-rhel7_6247)

@openshift-bot openshift-bot merged commit 37d5498 into openshift:master May 20, 2017
@php-coder php-coder deleted the backport_encrypting_transformers branch May 20, 2017 19:46
@php-coder
Copy link
Contributor Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants