From 3e84be5fa669ab1e46a74b4479bed4037c5f4025 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Mon, 23 Oct 2017 10:54:30 -0300 Subject: [PATCH] Do not use relative urls --- deploy/README.md | 18 ++++++------ docs/examples/README.md | 65 +---------------------------------------- 2 files changed, 10 insertions(+), 73 deletions(-) diff --git a/deploy/README.md b/deploy/README.md index 7b2bb9f30..a5bda3d67 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -74,8 +74,8 @@ This setup requires to choose in which layer (L4 or L7) we want to configure the For L4: ```console -kubectl apply -f provider/aws/service-l4.yaml -kubectl apply -f provider/aws/patch-configmap-l4.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/aws/service-l4.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/aws/patch-configmap-l4.yaml ``` For L7: @@ -85,7 +85,7 @@ Then execute: ```console kubectl apply -f provider/aws/service-l7.yaml -kubectl apply -f provider/aws/patch-configmap-l7.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/aws/patch-configmap-l7.yaml ``` This example creates an ELB with just two listeners, one in port 80 and another in port 443 @@ -95,13 +95,13 @@ This example creates an ELB with just two listeners, one in port 80 and another If the ingress controller uses RBAC run: ```console -kubectl apply -f provider/patch-service-with-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/patch-service-with-rbac.yaml ``` If not run: ```console -kubectl apply -f provider/patch-service-without-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/patch-service-without-rbac.yaml ``` ### GCE - GKE @@ -114,13 +114,13 @@ curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/pr If the ingress controller uses RBAC run: ```console -kubectl apply -f provider/patch-service-with-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/patch-service-with-rbac.yaml ``` If not run: ```console -kubectl apply -f provider/patch-service-without-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/patch-service-without-rbac.yaml ``` **Important Note:** proxy protocol is not supported in GCE/GKE @@ -135,13 +135,13 @@ curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/pr If the ingress controller uses RBAC run: ```console -kubectl apply -f provider/patch-service-with-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/patch-service-with-rbac.yaml ``` If not run: ```console -kubectl apply -f provider/patch-service-without-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/patch-service-without-rbac.yaml ``` **Important Note:** proxy protocol is not supported in GCE/GKE diff --git a/docs/examples/README.md b/docs/examples/README.md index 267656285..d582d1102 100644 --- a/docs/examples/README.md +++ b/docs/examples/README.md @@ -4,58 +4,17 @@ This directory contains a catalog of examples on how to run, configure and scale Ingress. Please review the [prerequisites](PREREQUISITES.md) before trying them. -## Basic cross platform - -Name | Description | Complexity Level ------| ----------- | ---------------- -Deployment | basic deployment of controllers | Beginner -TLS termination | terminate TLS at the ingress controller | Beginner -Name based virtual hosting | `Host` header routing | Beginner -Path routing | URL regex routing | Beginner -Health checking | configure/optimize health checks | Intermediate -Pipeline | pipeline cloud and nginx | Advanced - -## AWS - -Name | Description | Complexity Level ------| ----------- | ---------------- -AWS | basic deployment | Intermediate - - -## TLS - -Name | Description | Complexity Level ------| ----------- | ---------------- -LetsEncrypt | acquire certs via ACME protocol | Intermediate -Intermediate certs | terminate TLS with intermediate certs | Advanced -Client certs | client cert authentication | Advanced -Re-encrypty | terminate, apply routing rules, re-encrypt | Advanced - ## Scaling Name | Description | Complexity Level -----| ----------- | ---------------- -Daemonset | run multiple controllers in a daemonset | Intermediate -Deployment | run multiple controllers as a deployment | Intermediate Static-ip | a single ingress gets a single static ip | Intermediate -Geo-routing | route to geographically closest endpoint | Advanced ## Algorithms Name | Description | Complexity Level -----| ----------- | ---------------- Session stickyness | route requests consistently to the same endpoint | Advanced -Least connections | route requests based on least connections | Advanced -Weights | route requests to backends based on weights | Advanced - -## Routing - -Name | Description | Complexity Level ------| ----------- | ---------------- -Redirects | send a 301 re-direct | Intermediate -URL-rewriting | re-write path | Intermediate -SNI + HTTP | HTTP routing based on SNI hostname | Advanced -SNI + TCP | TLS routing based on SNI hostname | Advanced ## Auth @@ -64,31 +23,9 @@ Name | Description | Complexity Level Basic auth | password protect your website | nginx | Intermediate [External auth plugin](external-auth/README.md) | defer to an external auth service | Intermediate -## Protocols - -Name | Description | Complexity Level ------| ----------- | ---------------- -TCP | TCP loadbalancing | Intermediate -UDP | UDP loadbalancing | Intermediate -Websockets | websockets loadbalancing | Intermediate -HTTP/2 | HTTP/2 loadbalancing | Intermediate -Proxy protocol | leverage the proxy protocol for source IP | Advanced - -## Custom controllers - -Name | Description | Complexity Level ------| ----------- | ---------------- -Dummy | A simple dummy controller that logs updates | Advanced - ## Customization Name | Description | Complexity Level -----| ----------- | ---------------- -custom-headers | set custom headers before send traffic to backends | Advanced configuration-snippets | customize nginx location configuration using annotations | Advanced - -## RBAC - -Name | Description | Complexity Level ------| ----------- | ---------------- -rbac | Configuring Role Base Access Control | intermediate +custom-headers | set custom headers before send traffic to backends | Advanced