Skip to content

Commit

Permalink
Add ingress.class support to HAProxy Ingress
Browse files Browse the repository at this point in the history
  • Loading branch information
jcmoraisjr committed Aug 28, 2017
1 parent 9e7c542 commit 4b73cc6
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 30 deletions.
3 changes: 0 additions & 3 deletions examples/auth/basic/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ This document has the following prerequisites:
end up with controller, a sample web app and an ingress resource to the `foo.bar`
domain

As mentioned in the deployment instructions, you MUST turn down any existing
ingress controllers before running HAProxy Ingress.

## Using Basic Authentication

HAProxy Ingress read user and password from `auth` file stored on secrets, one user
Expand Down
3 changes: 0 additions & 3 deletions examples/auth/client-certs/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ following these steps you should have a secret named `caingress`, a certificate
* Use these same steps and create another CA and generate another certificate and private
key `fake.crt` and `fake.key` just for testing

As mentioned in the deployment instructions, you MUST turn down any existing
ingress controllers before running HAProxy Ingress.

Secret, certificates and keys can be created using these shortcuts:

CA and it's secret:
Expand Down
3 changes: 0 additions & 3 deletions examples/customization/custom-configuration/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ This document has the following prerequisites:

Deploy only the tls-secret and the default backend from the [deployment instructions](../../../deployment/haproxy/)

As mentioned in the deployment instructions, you MUST turn down any existing
ingress controllers before running HAProxy Ingress.

## Customize the HAProxy configuration

Using a [ConfigMap](https://kubernetes.io/docs/user-guide/configmap/) is possible to customize the HAProxy configuration.
Expand Down
8 changes: 4 additions & 4 deletions examples/daemonset/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ In some cases, the Ingress controller will be required to be run at all the node

## Prerequisites

This ingress controller doesn't yet have support for
[ingress classes](/examples/PREREQUISITES.md#ingress-class). You MUST turn
down any existing ingress controllers before running HAProxy Ingress controller or
they will fight for Ingresses. This includes any cloudprovider controller.
If you have another Ingress controller deployed, you will need to make sure your
Ingress resources target exactly one Ingress controller by specifying the
[ingress.class](/examples/PREREQUISITES.md#ingress-class) annotation as
`haproxy`.

This document has also the following prerequisites:

Expand Down
8 changes: 4 additions & 4 deletions examples/deployment/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ for instructions on how to create a new one.

## Prerequisites

This ingress controller doesn't yet have support for
[ingress classes](/examples/PREREQUISITES.md#ingress-class). You MUST turn
down any existing ingress controllers before running HAProxy Ingress controller or
they will fight for Ingresses. This includes any cloudprovider controller.
If you have another Ingress controller deployed, you will need to make sure your
Ingress resources target exactly one Ingress controller by specifying the
[ingress.class](/examples/PREREQUISITES.md#ingress-class) annotation as
`haproxy`.

This document has also the following prerequisites:

Expand Down
3 changes: 0 additions & 3 deletions examples/multi-tls/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ This document has the following prerequisites:
* Deploy [HAProxy Ingress controller](/examples/deployment/haproxy), you should end up with controller, a sample web app and default TLS secret
* Create [*two* secrets](/examples/PREREQUISITES.md#tls-certificates) named `foobar-ssl` with subject `'/CN=foo.bar'` and `barfoo-ssl` with subject `'/CN=bar.foo'`

As mentioned in the deployment instructions, you MUST turn down any existing
ingress controllers before running HAProxy Ingress.

## Using a new TLS certificate

Update ingress resource in order to add TLS termination to two hosts:
Expand Down
3 changes: 0 additions & 3 deletions examples/rewrite/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ the `foo.bar` domain
* Configure only the default [TLS termination](/examples/tls-termination/haproxy) -
there is no need to create another secret

As mentioned in the deployment instructions, you MUST turn down any existing
ingress controllers before running HAProxy Ingress.

## Annotations

The following annotations are implemented:
Expand Down
8 changes: 4 additions & 4 deletions examples/scaling-deployment/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ This example aims to demonstrate the Deployment of multi haproxy ingress control

## Prerequisites

This ingress controller doesn't yet have support for
[ingress classes](/examples/PREREQUISITES.md#ingress-class). You MUST turn
down any existing ingress controllers before running HAProxy Ingress controller or
they will fight for Ingresses. This includes any cloudprovider controller.
If you have another Ingress controller deployed, you will need to make sure your
Ingress resources target exactly one Ingress controller by specifying the
[ingress.class](/examples/PREREQUISITES.md#ingress-class) annotation as
`haproxy`.

This document has also the following prerequisites:

Expand Down
3 changes: 0 additions & 3 deletions examples/tls-termination/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ This document has the following prerequisites:
* Deploy [HAProxy Ingress controller](/examples/deployment/haproxy), you should end up with controller, a sample web app and default TLS secret
* Create [*another* secret](/examples/PREREQUISITES.md#tls-certificates) named `foobar-ssl` and subject `'/CN=foo.bar'`

As mentioned in the deployment instructions, you MUST turn down any existing
ingress controllers before running HAProxy Ingress.

## Using default TLS certificate

Update ingress resource in order to add TLS termination to host `foo.bar`:
Expand Down

0 comments on commit 4b73cc6

Please sign in to comment.