From dd7d1c438b0794056971ca269dec7c75d5a483ad Mon Sep 17 00:00:00 2001
From: Megan O'Keefe <megan037@gmail.com>
Date: Sun, 15 Dec 2019 16:27:08 -0500
Subject: [PATCH] updated wrong manifests

---
 kubernetes-manifests/frontend.yaml      |  2 ++
 kubernetes-manifests/loadgenerator.yaml | 10 ++--------
 release/kubernetes-manifests.yaml       | 17 ++++++++++++-----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml
index 5c5cd32..e6a0607 100644
--- a/kubernetes-manifests/frontend.yaml
+++ b/kubernetes-manifests/frontend.yaml
@@ -24,6 +24,8 @@ spec:
     metadata:
       labels:
         app: frontend
+      annotations:
+        sidecar.istio.io/rewriteAppHTTPProbers: "true"
     spec:
       containers:
         - name: server
diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml
index c2aeb98..55d3a3d 100644
--- a/kubernetes-manifests/loadgenerator.yaml
+++ b/kubernetes-manifests/loadgenerator.yaml
@@ -25,17 +25,11 @@ spec:
     metadata:
       labels:
         app: loadgenerator
+      annotations:
+        sidecar.istio.io/rewriteAppHTTPProbers: "true"
     spec:
       terminationGracePeriodSeconds: 5
       restartPolicy: Always
-      initContainers:
-      - name: wait-frontend
-        image: alpine:3.6
-        command: ['sh', '-c', 'set -x;  apk add --no-cache curl && 
-          until timeout -t 2 curl -f "http://${FRONTEND_ADDR}"; do 
-            echo "waiting for http://${FRONTEND_ADDR}"; 
-            sleep 2;
-          done;']
         env:
         - name: FRONTEND_ADDR
           value: "frontend:80"
diff --git a/release/kubernetes-manifests.yaml b/release/kubernetes-manifests.yaml
index ec2d978..6a04843 100644
--- a/release/kubernetes-manifests.yaml
+++ b/release/kubernetes-manifests.yaml
@@ -199,8 +199,6 @@ spec:
     metadata:
       labels:
         app: frontend
-      annotations:
-        sidecar.istio.io/rewriteAppHTTPProbers: "true"
     spec:
       containers:
         - name: server
@@ -446,11 +444,20 @@ spec:
     metadata:
       labels:
         app: loadgenerator
-      annotations:
-        sidecar.istio.io/rewriteAppHTTPProbers: "true"
     spec:
       terminationGracePeriodSeconds: 5
       restartPolicy: Always
+      initContainers:
+      - name: wait-frontend
+        image: alpine:3.6
+        command: ['sh', '-c', 'set -x;  apk add --no-cache curl &&
+          until timeout -t 2 curl -f "http://${FRONTEND_ADDR}"; do
+            echo "waiting for http://${FRONTEND_ADDR}";
+            sleep 2;
+          done;']
+        env:
+        - name: FRONTEND_ADDR
+          value: "frontend:80"
       containers:
       - name: main
         image: gcr.io/google-samples/microservices-demo/loadgenerator:v0.1.2
@@ -676,4 +683,4 @@ spec:
   - name: grpc
     port: 9555
     targetPort: 9555
----
+---
\ No newline at end of file