From ff7d72191e315932f079fde81673fdf983242bcc Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Sun, 6 Aug 2017 19:22:22 -0400 Subject: [PATCH] Update echoheaders images --- .../health_checks/health_check_app.yaml | 34 +++++++++--------- controllers/gce/ingress-app.yaml | 34 +++++++++--------- controllers/nginx/README.md | 2 +- .../health-checks/gce/health_check_app.yaml | 34 +++++++++--------- examples/http-svc.yaml | 36 +++++++++---------- examples/multi-tls/nginx/multi-tls.yaml | 34 +++++++++--------- 6 files changed, 87 insertions(+), 87 deletions(-) diff --git a/controllers/gce/examples/health_checks/health_check_app.yaml b/controllers/gce/examples/health_checks/health_check_app.yaml index 8b3e4e146..9b26cfed7 100644 --- a/controllers/gce/examples/health_checks/health_check_app.yaml +++ b/controllers/gce/examples/health_checks/health_check_app.yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/google_containers/echoserver:1.5 + image: gcr.io/google_containers/echoserver:1.8 ports: - containerPort: 8080 readinessProbe: @@ -23,22 +23,22 @@ spec: successThreshold: 1 failureThreshold: 10 env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP --- apiVersion: v1 diff --git a/controllers/gce/ingress-app.yaml b/controllers/gce/ingress-app.yaml index 379405214..b9b3ade51 100644 --- a/controllers/gce/ingress-app.yaml +++ b/controllers/gce/ingress-app.yaml @@ -49,26 +49,26 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/google_containers/echoserver:1.5 + image: gcr.io/google_containers/echoserver:1.8 ports: - containerPort: 8080 env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP --- # This is the Ingress resource that creates a HTTP Loadbalancer configured diff --git a/controllers/nginx/README.md b/controllers/nginx/README.md index e0402d2c0..4219988df 100644 --- a/controllers/nginx/README.md +++ b/controllers/nginx/README.md @@ -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 ``` -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) diff --git a/examples/health-checks/gce/health_check_app.yaml b/examples/health-checks/gce/health_check_app.yaml index ee8ade185..b8d36bf38 100644 --- a/examples/health-checks/gce/health_check_app.yaml +++ b/examples/health-checks/gce/health_check_app.yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/google_containers/echoserver:1.5 + image: gcr.io/google_containers/echoserver:1.8 ports: - containerPort: 8080 readinessProbe: @@ -23,22 +23,22 @@ spec: successThreshold: 1 failureThreshold: 10 env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP --- apiVersion: v1 diff --git a/examples/http-svc.yaml b/examples/http-svc.yaml index 372445064..ff25ab004 100644 --- a/examples/http-svc.yaml +++ b/examples/http-svc.yaml @@ -21,7 +21,7 @@ kind: ReplicationController metadata: name: http-svc spec: - replicas: 2 + replicas: 1 template: metadata: labels: @@ -29,23 +29,23 @@ spec: spec: containers: - name: http-svc - image: gcr.io/google_containers/echoserver:1.5 + image: gcr.io/google_containers/echoserver:1.8 ports: - containerPort: 8080 env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP diff --git a/examples/multi-tls/nginx/multi-tls.yaml b/examples/multi-tls/nginx/multi-tls.yaml index a2f2048b4..de27a8f6b 100644 --- a/examples/multi-tls/nginx/multi-tls.yaml +++ b/examples/multi-tls/nginx/multi-tls.yaml @@ -58,26 +58,26 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/google_containers/echoserver:1.5 + image: gcr.io/google_containers/echoserver:1.8 ports: - containerPort: 8080 env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP --- apiVersion: extensions/v1beta1