Update echoheaders images

2017-08-06 19:22:22 -04:00 · 2017-08-06 19:22:22 -04:00 · ff7d72191e
commit ff7d72191e
parent d251a50b52
6 changed files with 87 additions and 87 deletions
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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