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

be tolerant on deployment decode and strict on encode #20185

Merged
merged 2 commits into from
Jul 4, 2018

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jul 3, 2018

Allows us to consume legacy v1 serialized deploymentconfigs from annotations, but we only serialize into groupified.

@liggitt resolves rebase problem

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 3, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Jul 3, 2018

@smarterclayton this is the one you need before you upgrade.

@deads2k deads2k mentioned this pull request Jul 3, 2018
17 tasks
@deads2k
Copy link
Contributor Author

deads2k commented Jul 3, 2018

/retest

@deads2k
Copy link
Contributor Author

deads2k commented Jul 3, 2018

/retest

Copy link
Contributor

@liggitt liggitt left a comment

Choose a reason for hiding this comment

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

nits, lgtm otherwise

func init() {
utilruntime.Must(corev1.AddToScheme(annotationDecodingScheme))
utilruntime.Must(appsv1.AddToScheme(annotationDecodingScheme))
utilruntime.Must(appsv1helpers.AddToScheme(annotationDecodingScheme))
Copy link
Contributor

Choose a reason for hiding this comment

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

move internal stuff into the TODO block to remove when internal versions go away

)

func init() {
utilruntime.Must(corev1.AddToScheme(annotationDecodingScheme))
Copy link
Contributor

Choose a reason for hiding this comment

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

TODO to move explicit corev1 additions into appsv1.AddToScheme, etc

@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Jul 3, 2018

/lgtm

@openshift-ci-robot
Copy link

@deads2k: you cannot LGTM your own PR.

In response to this:

/lgtm

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.

@deads2k
Copy link
Contributor Author

deads2k commented Jul 3, 2018

/retest

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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 openshift deleted a comment from openshift-ci-robot Jul 3, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Jul 3, 2018

/retest

@openshift-merge-robot openshift-merge-robot merged commit fe8c609 into openshift:master Jul 4, 2018
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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants