Update examples
This commit is contained in:
parent
a4a1491789
commit
0b031b9894
13 changed files with 19 additions and 15 deletions
|
@ -1,7 +1,7 @@
|
||||||
all: push
|
all: push
|
||||||
|
|
||||||
# 0.0 shouldn't clobber any release builds
|
# 0.0 shouldn't clobber any release builds
|
||||||
TAG = 0.62
|
TAG = 0.7
|
||||||
PREFIX = gcr.io/google_containers/nginx-ingress-controller
|
PREFIX = gcr.io/google_containers/nginx-ingress-controller
|
||||||
|
|
||||||
REPO_INFO=$(shell git config --get remote.origin.url)
|
REPO_INFO=$(shell git config --get remote.origin.url)
|
||||||
|
@ -11,8 +11,8 @@ ifndef VERSION
|
||||||
endif
|
endif
|
||||||
|
|
||||||
controller: controller.go clean
|
controller: controller.go clean
|
||||||
CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags \
|
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags \
|
||||||
"-w -X main.version=${VERSION} -X main.gitRepo=${REPO_INFO}" \
|
"-s -w -X main.version=${VERSION} -X main.gitRepo=${REPO_INFO}" \
|
||||||
-o nginx-ingress-controller
|
-o nginx-ingress-controller
|
||||||
|
|
||||||
container: controller
|
container: controller
|
||||||
|
|
|
@ -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/add-base-url|true\|false| |
|
||||||
|ingress.kubernetes.io/limit-connections| ||
|
|ingress.kubernetes.io/limit-connections| ||
|
||||||
|ingress.kubernetes.io/limit-rps|||
|
|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.
|
|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||
|
| | |The secret must be created in the same namespace than the Ingress rule||
|
||||||
|ingress.kubernetes.io/auth-realm|string| |
|
|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
|
### Custom configuration options
|
||||||
|
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -10,7 +10,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -21,7 +21,7 @@ spec:
|
||||||
secret:
|
secret:
|
||||||
secretName: dhparam-example
|
secretName: dhparam-example
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
|
@ -68,7 +68,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
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
|
name: nginx-ingress-lb
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
|
Loading…
Reference in a new issue