From b84fc350ee9e331451fe39c0cc468ac3be153095 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Sun, 28 May 2017 17:16:13 -0400 Subject: [PATCH] Update echoserver image version in examples --- .../health_checks/health_check_app.yaml | 20 ++++++++++++++++++- controllers/gce/ingress-app.yaml | 20 ++++++++++++++++++- controllers/nginx/README.md | 2 +- .../health-checks/gce/health_check_app.yaml | 20 ++++++++++++++++++- examples/http-svc.yaml | 20 +++++++++++++++++-- examples/multi-tls/nginx/multi-tls.yaml | 20 ++++++++++++++++++- 6 files changed, 95 insertions(+), 7 deletions(-) diff --git a/controllers/gce/examples/health_checks/health_check_app.yaml b/controllers/gce/examples/health_checks/health_check_app.yaml index b6f79c641..8b3e4e146 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.4 + image: gcr.io/google_containers/echoserver:1.5 ports: - containerPort: 8080 readinessProbe: @@ -22,6 +22,24 @@ spec: timeoutSeconds: 1 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 + --- apiVersion: v1 kind: Service diff --git a/controllers/gce/ingress-app.yaml b/controllers/gce/ingress-app.yaml index 1f3870a08..379405214 100644 --- a/controllers/gce/ingress-app.yaml +++ b/controllers/gce/ingress-app.yaml @@ -49,9 +49,27 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/google_containers/echoserver:1.4 + image: gcr.io/google_containers/echoserver:1.5 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 + --- # This is the Ingress resource that creates a HTTP Loadbalancer configured # according to the Ingress rules. diff --git a/controllers/nginx/README.md b/controllers/nginx/README.md index b764d30b0..1ecbe5556 100644 --- a/controllers/nginx/README.md +++ b/controllers/nginx/README.md @@ -69,7 +69,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.4 --replicas=1 --port=8080 +kubectl run echoheaders --image=gcr.io/google_containers/echoserver:1.5 --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 b6f79c641..ee8ade185 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.4 + image: gcr.io/google_containers/echoserver:1.5 ports: - containerPort: 8080 readinessProbe: @@ -22,6 +22,24 @@ spec: timeoutSeconds: 1 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 + --- apiVersion: v1 kind: Service diff --git a/examples/http-svc.yaml b/examples/http-svc.yaml index c76d21d01..372445064 100644 --- a/examples/http-svc.yaml +++ b/examples/http-svc.yaml @@ -29,7 +29,23 @@ spec: spec: containers: - name: http-svc - image: gcr.io/google_containers/echoserver:1.3 + image: gcr.io/google_containers/echoserver:1.5 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 diff --git a/examples/multi-tls/nginx/multi-tls.yaml b/examples/multi-tls/nginx/multi-tls.yaml index f65feffaf..a2f2048b4 100644 --- a/examples/multi-tls/nginx/multi-tls.yaml +++ b/examples/multi-tls/nginx/multi-tls.yaml @@ -58,9 +58,27 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/google_containers/echoserver:1.4 + image: gcr.io/google_containers/echoserver:1.5 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 + --- apiVersion: extensions/v1beta1 kind: Ingress