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: Add AES-CBC and Secretbox encryption #14517

Merged
merged 2 commits into from
Jun 11, 2017

Conversation

smarterclayton
Copy link
Contributor

Completes the pick of the upstream changes for Kube 1.7 for encryption at rest of secrets. Includes the new config loading.

@smarterclayton
Copy link
Contributor Author

[test]

@smarterclayton smarterclayton added this to the 3.6.0 milestone Jun 8, 2017
@mfojtik
Copy link
Contributor

mfojtik commented Jun 8, 2017

@php-coder FYI

@mfojtik
Copy link
Contributor

mfojtik commented Jun 8, 2017

flake: #14496

[test]

@mfojtik
Copy link
Contributor

mfojtik commented Jun 8, 2017

@smarterclayton you need to tweak the pick for vendor/golang.org/x/crypto to pass the commit checker.

@mfojtik
Copy link
Contributor

mfojtik commented Jun 8, 2017

LGTM after fixing commits //cc @php-coder for the config changes

@smarterclayton
Copy link
Contributor Author

smarterclayton commented Jun 9, 2017 via email

@smarterclayton
Copy link
Contributor Author

Router flake, no route to host from integration TestRouter [test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to a8fec68

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2045/) (Base Commit: 2458531)

@smarterclayton
Copy link
Contributor Author

[merge] (since this is pure upstream code)

I think we want to use the upstream config.

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to a8fec68

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/959/) (Base Commit: 7f9567a)

@smarterclayton
Copy link
Contributor Author

Dind flake fedora:25 not found? Merging

@smarterclayton smarterclayton merged commit 60ae3eb into openshift:master Jun 11, 2017
@0xmichalis
Copy link
Contributor

Dind flake fedora:25 not found? Merging

Yeah, seen that elsewhere and it seems to block the queue now

@0xmichalis
Copy link
Contributor

Opened #14573

const (
aesCBCTransformerPrefixV1 = "k8s:enc:aescbc:v1:"
aesGCMTransformerPrefixV1 = "k8s:enc:aesgcm:v1:"
secretboxTransformerPrefixV1 = "k8s:enc:secretbox:v1"
Copy link
Contributor

@php-coder php-coder Jun 19, 2017

Choose a reason for hiding this comment

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

@smarterclayton I see that we haven't backported fix for this: kubernetes/kubernetes#47537 Do we need it to be backported?

@smarterclayton
Copy link
Contributor Author

smarterclayton commented Jun 19, 2017 via email

@php-coder
Copy link
Contributor

@smarterclayton Ok, I'll create a PR for that.

@php-coder
Copy link
Contributor

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