mirror of https://github.com/kubernetes/kops.git
updated image versions and deployment instructions
This commit is contained in:
parent
f0d28f43f3
commit
079e23f406
|
@ -1,4 +1,14 @@
|
||||||
|
|
||||||
|
## Deployment
|
||||||
|
### AWS
|
||||||
|
```
|
||||||
|
kubectl apply -f https://raw.githubusercontent.com/kubernetes/kops/master/addons/ingress-nginx/v1.6.0.yaml
|
||||||
|
```
|
||||||
|
|
||||||
|
### GCE
|
||||||
|
```
|
||||||
|
kubectl apply -f https://raw.githubusercontent.com/kubernetes/kops/master/addons/ingress-nginx/v1.6.0-gce.yaml
|
||||||
|
```
|
||||||
|
|
||||||
## Creating a simple ingress
|
## Creating a simple ingress
|
||||||
|
|
||||||
|
|
|
@ -194,7 +194,7 @@ spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
containers:
|
||||||
- name: default-http-backend
|
- name: default-http-backend
|
||||||
image: k8s.gcr.io/defaultbackend:1.3
|
image: k8s.gcr.io/defaultbackend:1.4
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
|
@ -236,6 +236,8 @@ metadata:
|
||||||
labels:
|
labels:
|
||||||
k8s-addon: ingress-nginx.addons.k8s.io
|
k8s-addon: ingress-nginx.addons.k8s.io
|
||||||
spec:
|
spec:
|
||||||
|
# Forces nodes without Service endpoints to remove themselves from the list of nodes eligible. See https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-type-loadbalancer
|
||||||
|
externalTrafficPolicy: Local
|
||||||
type: LoadBalancer
|
type: LoadBalancer
|
||||||
selector:
|
selector:
|
||||||
app: ingress-nginx
|
app: ingress-nginx
|
||||||
|
@ -272,7 +274,7 @@ spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
serviceAccountName: nginx-ingress-controller
|
serviceAccountName: nginx-ingress-controller
|
||||||
containers:
|
containers:
|
||||||
- image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.12.0
|
- image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.18.0
|
||||||
name: nginx-ingress-controller
|
name: nginx-ingress-controller
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -194,7 +194,7 @@ spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
containers:
|
||||||
- name: default-http-backend
|
- name: default-http-backend
|
||||||
image: k8s.gcr.io/defaultbackend:1.3
|
image: k8s.gcr.io/defaultbackend:1.4
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
|
@ -236,7 +236,10 @@ metadata:
|
||||||
labels:
|
labels:
|
||||||
k8s-addon: ingress-nginx.addons.k8s.io
|
k8s-addon: ingress-nginx.addons.k8s.io
|
||||||
annotations:
|
annotations:
|
||||||
|
# Enable PROXY protocol
|
||||||
service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'
|
service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'
|
||||||
|
# Increase the ELB idle timeout to avoid issues with WebSockets or Server-Sent Events.
|
||||||
|
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '3600'
|
||||||
spec:
|
spec:
|
||||||
type: LoadBalancer
|
type: LoadBalancer
|
||||||
selector:
|
selector:
|
||||||
|
@ -274,7 +277,7 @@ spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
serviceAccountName: nginx-ingress-controller
|
serviceAccountName: nginx-ingress-controller
|
||||||
containers:
|
containers:
|
||||||
- image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.12.0
|
- image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.18.0
|
||||||
name: nginx-ingress-controller
|
name: nginx-ingress-controller
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
ports:
|
ports:
|
||||||
|
|
Loading…
Reference in New Issue