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

Fix(#1096) ingress annotation can not set ip in whitelist #1095

Merged
merged 1 commit into from
Aug 21, 2017

Conversation

zjj2wry
Copy link

@zjj2wry zjj2wry commented Aug 9, 2017

closes #1096

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 9, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@zjj2wry zjj2wry changed the title Fix ingress annotation can not set ip in whilelist Fix(#1096) ingress annotation can not set ip in whilelist Aug 9, 2017
@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 44.869% when pulling 01e8815 on zjj2wry:whilelist into 198c926 on kubernetes:master.

@zjj2wry zjj2wry changed the title Fix(#1096) ingress annotation can not set ip in whilelist Fix(#1096) ingress annotation can not set ip in whitelist Aug 9, 2017
@zjj2wry
Copy link
Author

zjj2wry commented Aug 13, 2017

@aledbf can you help me review this. now configmap can set ip or cidr. but ingress annotation just can set cidr. maybe cause confuse sometimes.

@aledbf
Copy link
Member

aledbf commented Aug 21, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 21, 2017
@aledbf
Copy link
Member

aledbf commented Aug 21, 2017

@zjj2wry thanks and apologies for the delay

@aledbf aledbf merged commit 1da974f into kubernetes:master Aug 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

can not set ip type whilelist in ingress annotation
5 participants