DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update examples

Browse source
This commit is contained in:
Manuel de Brito Fontes 2016-05-31 16:32:50 -04:00
parent a4a1491789
commit 0b031b9894
13 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controllers/nginx/Makefile
View file

@ -1,7 +1,7 @@
all: push
# 0.0 shouldn't clobber any release builds
TAG = 0.62
TAG = 0.7
PREFIX = gcr.io/google_containers/nginx-ingress-controller
REPO_INFO=$(shell git config --get remote.origin.url)
@ -11,8 +11,8 @@ ifndef VERSION
endif
controller: controller.go clean
CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags \
"-w -X main.version=${VERSION} -X main.gitRepo=${REPO_INFO}" \
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags \
"-s -w -X main.version=${VERSION} -X main.gitRepo=${REPO_INFO}" \
-o nginx-ingress-controller
container: controller

6
controllers/nginx/README.md
View file

@ -268,10 +268,14 @@ Using this two headers is possible to use a custom backend service like [this on
|ingress.kubernetes.io/add-base-url|true\|false| |
|ingress.kubernetes.io/limit-connections| ||
|ingress.kubernetes.io/limit-rps|||
|ingress.kubernetes.io/auth-type|basic\|digest|Indicates the [HTTP Authentication Type: Basic or Digest Access Authentication](https://tools.ietf.org/html/rfc2617)||
|ingress.kubernetes.io/auth-type|basic or digest|Indicates the [HTTP Authentication Type: Basic or Digest Access Authentication](https://tools.ietf.org/html/rfc2617)||
|ingress.kubernetes.io/auth-secret|string|Name of the secret that contains the usernames and passwords.
| | |The secret must be created in the same namespace than the Ingress rule||
|ingress.kubernetes.io/auth-realm|string| |
|ingress.kubernetes.io/upstream-max-fails| |
|ingress.kubernetes.io/upstream-max-fails| |
|ingress.kubernetes.io/upstream-fail-timeout| |
### Custom configuration options

2
controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml
View file

@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/custom-errors/rc-custom-errors.yaml
View file

@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.6
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/custom-template/custom-template.yaml
View file

@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/daemonset/as-daemonset.yaml
View file

@ -10,7 +10,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/default/rc-default.yaml
View file

@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/full/rc-full.yaml
View file

@ -21,7 +21,7 @@ spec:
secret:
secretName: dhparam-example
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/proxy-protocol/nginx-rc.yaml
View file

@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/tcp/rc-tcp.yaml
View file

@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/tls/rc-ssl.yaml
View file

@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/examples/udp/rc-udp.yaml
View file

@ -16,7 +16,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe:

2
controllers/nginx/rc.yaml
View file

@ -68,7 +68,7 @@ spec:
spec:
terminationGracePeriodSeconds: 60
containers:
- image: gcr.io/google_containers/nginx-ingress-controller:0.62
- image: gcr.io/google_containers/nginx-ingress-controller:0.7
name: nginx-ingress-lb
imagePullPolicy: Always
livenessProbe: