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

Merge pull request #1077 from aledbf/update-echodeader

Browse source 
Update echoheaders images
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-08-06 19:22:49 -04:00 committed by GitHub
commit 9b80d3b6b0
6 changed files with 87 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
controllers/gce/examples/health_checks/health_check_app.yaml
View file

@ -11,7 +11,7 @@ spec:
spec: spec:
containers: containers:
- name: echoheaders - name: echoheaders
image: gcr.io/google_containers/echoserver:1.5 image: gcr.io/google_containers/echoserver:1.8
ports: ports:
- containerPort: 8080 - containerPort: 8080
readinessProbe: readinessProbe:
@ -23,22 +23,22 @@ spec:
successThreshold: 1 successThreshold: 1
failureThreshold: 10 failureThreshold: 10
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: POD_IP - name: POD_IP
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.podIP fieldPath: status.podIP
--- ---
apiVersion: v1 apiVersion: v1

34
controllers/gce/ingress-app.yaml
View file

@ -49,26 +49,26 @@ spec:
spec: spec:
containers: containers:
- name: echoheaders - name: echoheaders
image: gcr.io/google_containers/echoserver:1.5 image: gcr.io/google_containers/echoserver:1.8
ports: ports:
- containerPort: 8080 - containerPort: 8080
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: POD_IP - name: POD_IP
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.podIP fieldPath: status.podIP
--- ---
# This is the Ingress resource that creates a HTTP Loadbalancer configured # This is the Ingress resource that creates a HTTP Loadbalancer configured

2
controllers/nginx/README.md
View file

@ -102,7 +102,7 @@ $ kubectl create -f examples/default/rc-default.yaml
First we need to deploy some application to publish. To keep this simple we will use the [echoheaders app](https://github.com/kubernetes/contrib/blob/master/ingress/echoheaders/echo-app.yaml) that just returns information about the http request as output First we need to deploy some application to publish. To keep this simple we will use the [echoheaders app](https://github.com/kubernetes/contrib/blob/master/ingress/echoheaders/echo-app.yaml) that just returns information about the http request as output
``` ```
kubectl run echoheaders --image=gcr.io/google_containers/echoserver:1.5 --replicas=1 --port=8080 kubectl run echoheaders --image=gcr.io/google_containers/echoserver:1.8 --replicas=1 --port=8080
``` ```
Now we expose the same application in two different services (so we can create different Ingress rules) Now we expose the same application in two different services (so we can create different Ingress rules)

34
examples/health-checks/gce/health_check_app.yaml
View file

@ -11,7 +11,7 @@ spec:
spec: spec:
containers: containers:
- name: echoheaders - name: echoheaders
image: gcr.io/google_containers/echoserver:1.5 image: gcr.io/google_containers/echoserver:1.8
ports: ports:
- containerPort: 8080 - containerPort: 8080
readinessProbe: readinessProbe:
@ -23,22 +23,22 @@ spec:
successThreshold: 1 successThreshold: 1
failureThreshold: 10 failureThreshold: 10
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: POD_IP - name: POD_IP
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.podIP fieldPath: status.podIP
--- ---
apiVersion: v1 apiVersion: v1

36
examples/http-svc.yaml
View file

@ -21,7 +21,7 @@ kind: ReplicationController
metadata: metadata:
name: http-svc name: http-svc
spec: spec:
replicas: 2 replicas: 1
template: template:
metadata: metadata:
labels: labels:
@ -29,23 +29,23 @@ spec:
spec: spec:
containers: containers:
- name: http-svc - name: http-svc
image: gcr.io/google_containers/echoserver:1.5 image: gcr.io/google_containers/echoserver:1.8
ports: ports:
- containerPort: 8080 - containerPort: 8080
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: POD_IP - name: POD_IP
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.podIP fieldPath: status.podIP

34
examples/multi-tls/nginx/multi-tls.yaml
View file

@ -58,26 +58,26 @@ spec:
spec: spec:
containers: containers:
- name: echoheaders - name: echoheaders
image: gcr.io/google_containers/echoserver:1.5 image: gcr.io/google_containers/echoserver:1.8
ports: ports:
- containerPort: 8080 - containerPort: 8080
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.name fieldPath: metadata.name
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: POD_IP - name: POD_IP
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.podIP fieldPath: status.podIP
--- ---
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1