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

Update HAProxy ingress line #10794

Merged
merged 3 commits into from
Nov 6, 2018
Merged

Update HAProxy ingress line #10794

merged 3 commits into from
Nov 6, 2018

Conversation

git001
Copy link
Contributor

@git001 git001 commented Oct 31, 2018

HAProxy Technologies offers support for the free available haproxy ingress controller

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Please delete this note before submitting the pull request.

For 1.13 Features: set Milestone to 1.13 and Base Branch to dev-1.13

Help editing and submitting pull requests:
https://kubernetes.io/docs/contribute/start/#improve-existing-content.

Help choosing which branch to use:
https://kubernetes.io/docs/contribute/start#choose-which-git-branch-to-use.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@git001
Update HAProxy ingress line
7737794 
HAProxy Technologies offers support for the free available haproxy ingress controller
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 31, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-master-staging failed.

Built with commit 7737794

https://app.netlify.com/sites/kubernetes-io-master-staging/deploys/5bd9e425dd28ef359b3cb9cb

@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Oct 31, 2018 •
edited
Loading

Deploy preview for kubernetes-io-master-staging failed.

Built with commit c7d75a6

https://app.netlify.com/sites/kubernetes-io-master-staging/deploys/5bdd549767610c5124ab5db3

tengqm
tengqm reviewed Nov 1, 2018
View reviewed changes
content/en/docs/concepts/services-networking/ingress.md Outdated
@@ -95,7 +95,7 @@ In order for the Ingress resource to work, the cluster must have an Ingress cont
* [Traefik](https://github.com/containous/traefik) is a fully featured ingress controller
([Let's Encrypt](https://letsencrypt.org), secrets, http2, websocket...), and it also comes with commercial support by [Containous](https://containo.us/services)
* [NGINX, Inc.](https://www.nginx.com/) offers support and maintenance for the [NGINX Ingress Controller for Kubernetes](https://www.nginx.com/products/nginx/kubernetes-ingress-controller)
* [HAProxy](http://www.haproxy.org/) based ingress controller [jcmoraisjr/haproxy-ingress](https://github.com/jcmoraisjr/haproxy-ingress) which is mentioned on this blog post [HAProxy Ingress Controller for Kubernetes](https://www.haproxy.com/blog/haproxy_ingress_controller_for_kubernetes/)
* [HAProxy Technologies](https://www.haproxy.com/) offers support and maintenance for HAProxy Enterprise used together with [jcmoraisjr/haproxy-ingress](https://github.com/jcmoraisjr/haproxy-ingress) controller, which is mentioned in this blog post [HAProxy Ingress Controller for Kubernetes](https://www.haproxy.com/blog/haproxy_ingress_controller_for_kubernetes/).
Copy link
Contributor

@tengqm tengqm Nov 1, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

How about restructure this as something like:

[HAProxy](http://www.haproxy.org/) based ingress controller ... (the existing text).
[HAProxy Technologies](link) offers support and maintenance for HAProxy Enterprise
which also works with this Ingress controller.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea sounds good. I have updated the patch/pr

@tengqm
Copy link
Contributor

tengqm commented Nov 3, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 3, 2018
@cody-clark
Copy link
Contributor

/approve

jimangel
jimangel approved these changes Nov 5, 2018
View reviewed changes
Copy link
Member

@jimangel jimangel left a comment

Choose a reason for hiding this comment

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

/lgtm

@tengqm
Copy link
Contributor

tengqm commented Nov 6, 2018

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cody-clark, tengqm

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 6, 2018
@k8s-ci-robot k8s-ci-robot merged commit fd7a788 into kubernetes:master Nov 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tengqm tengqm tengqm left review comments

@jimangel jimangel jimangel approved these changes

@bprashanth bprashanth Awaiting requested review from bprashanth

Assignees

@jimangel jimangel

@tengqm tengqm

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@git001 @k8sio-netlify-preview-bot @tengqm @cody-clark @k8s-ci-robot @jimangel