prep 1.0.3-2

Change-Id: I998ce3f73d408833696b324166874c9f1ade9d19
apigee · Dec 12, 2018 · 51c6072 · 51c6072
1 parent 636e487
commit 51c6072
Show file tree

Hide file tree

Showing 6 changed files with 292 additions and 198 deletions.
diff --git a/apigee-istio/proxies/proxies.go b/apigee-istio/proxies/proxies.go
diff --git a/auth-proxy/apiproxy/policies/Send-Version.xml b/auth-proxy/apiproxy/policies/Send-Version.xml
@@ -8,7 +8,7 @@
             <Header name="Content-Type">application/json</Header>
         </Headers>
         <Payload contentType="application/json">
-        {"version":"1.0.4"}
+        {"version":"1.0.3-2"}
     </Payload>
     </Set>
     <IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>

diff --git a/bin/local_install.sh b/bin/local_install.sh
@@ -13,7 +13,7 @@
 # - INSTALL_PROTOC - installs protoc if set to 1. Used for CI.
 # - ISTIO_VERSION - set to appropriate Istio tag or branch to build Mixer from.
 
-DEFAULT_ISTIO_VERSION=1.0.4
+DEFAULT_ISTIO_VERSION=1.0.3
 
 ISTIO_VERSION=${ISTIO_VERSION:-${DEFAULT_ISTIO_VERSION}}
 

diff --git a/samples/istio/helloworld.yaml b/samples/istio/helloworld.yaml
@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/status: '{"version":"ebf16d3ea0236e4b5cb4d3fc0f01da62e2e6265d005e58f8f6bd43a4fb672fdd","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
+        sidecar.istio.io/status: '{"version":"48f39c4792663fa70ea9c6eb9c29612031cbe36a3850b41faa407da434ec11d3","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
       creationTimestamp: null
       labels:
         app: helloworld
@@ -81,10 +81,11 @@ spec:
               fieldPath: metadata.name
         - name: ISTIO_META_INTERCEPTION_MODE
           value: REDIRECT
-        - name: ISTIO_METAJSON_LABELS
-          value: |
-            {"app":"helloworld","version":"v1"}
-        image: docker.io/istio/proxyv2:1.0.4
+        - name: ISTIO_META_app
+          value: helloworld
+        - name: ISTIO_META_version
+          value: v1
+        image: docker.io/istio/proxyv2:1.0.3
         imagePullPolicy: IfNotPresent
         name: istio-proxy
         ports:
@@ -119,7 +120,7 @@ spec:
         - "5000"
         - -d
         - ""
-        image: docker.io/istio/proxy_init:1.0.4
+        image: docker.io/istio/proxy_init:1.0.3
         imagePullPolicy: IfNotPresent
         name: istio-init
         resources: {}
@@ -149,7 +150,7 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/status: '{"version":"ebf16d3ea0236e4b5cb4d3fc0f01da62e2e6265d005e58f8f6bd43a4fb672fdd","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
+        sidecar.istio.io/status: '{"version":"48f39c4792663fa70ea9c6eb9c29612031cbe36a3850b41faa407da434ec11d3","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
       creationTimestamp: null
       labels:
         app: helloworld
@@ -208,10 +209,11 @@ spec:
               fieldPath: metadata.name
         - name: ISTIO_META_INTERCEPTION_MODE
           value: REDIRECT
-        - name: ISTIO_METAJSON_LABELS
-          value: |
-            {"app":"helloworld","version":"v2"}
-        image: docker.io/istio/proxyv2:1.0.4
+        - name: ISTIO_META_app
+          value: helloworld
+        - name: ISTIO_META_version
+          value: v2
+        image: docker.io/istio/proxyv2:1.0.3
         imagePullPolicy: IfNotPresent
         name: istio-proxy
         ports:
@@ -246,7 +248,7 @@ spec:
         - "5000"
         - -d
         - ""
-        image: docker.io/istio/proxy_init:1.0.4
+        image: docker.io/istio/proxy_init:1.0.3
         imagePullPolicy: IfNotPresent
         name: istio-init
         resources: {}