prep 1.0.5

Change-Id: I713f884ed7316d3a2fb726ea0e8ec48a87c120ef

README.md

@@ -16,7 +16,7 @@ A Quick Start Tutorial continues below, but complete Apigee documentation on the
 
 ## Version note
 
-The current release is based on Istio 1.0.4. The included sample files and instructions below will 
+The current release is based on Istio 1.0.5. The included sample files and instructions below will 
 automatically install the correct Istio version for you onto Kubernetes. It is recommended that
 you install onto Kubernetes 1.9 or newer. See the [Istio](https://istio.io) web page for more information.  
 
@@ -74,6 +74,7 @@ Once it completes, check your `samples/apigee/handler.yaml` file. It should look
 
 Notes:
 
+* If you upgrading from a prior release, run the `apigee-istio provision` command with the `--forceProxyInstall` option to ensure that the latest Apigee proxy is installed for your organization.
 * `apigee-istio` will automatically pick up the username and password from a 
 [.netrc](https://ec.haxx.se/usingcurl-netrc.html) file in your home directory if you have an entry for 
 `machine api.enterprise.apigee.com`.
@@ -110,12 +111,12 @@ before continuing. More information on verifying the Istio installation is
 If you have already installed Istio, you can install the Mixer adapter by running the following commands:
 
 ```
-kubectl -n istio-system set image deployment/istio-telemetry mixer=gcr.io/apigee-api-management-istio/istio-mixer:1.0.4
+kubectl -n istio-system set image deployment/istio-telemetry mixer=gcr.io/apigee-api-management-istio/istio-mixer:1.0.5
 
-kubectl -n istio-system set image deployment/istio-policy mixer=gcr.io/apigee-api-management-istio/istio-mixer:1.0.4
+kubectl -n istio-system set image deployment/istio-policy mixer=gcr.io/apigee-api-management-istio/istio-mixer:1.0.5
 ```
 
-NOTE 1: change the tag from `1.0.4` to `latest` if you want the latest development build
+NOTE 1: change the tag from `1.0.5` to `latest` if you want the latest development build
 NOTE 2: change the container to `istio-mixer-debug` if you want the container with debug tools 
 
 ## Install a target service

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.5"}
     </Payload>
     </Set>
     <IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>

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.5
 
 ISTIO_VERSION=${ISTIO_VERSION:-${DEFAULT_ISTIO_VERSION}}
 

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":"50128f63e7b050c58e1cdce95b577358054109ad2aff4bc4995158c06924a43b","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
       creationTimestamp: null
       labels:
         app: helloworld
@@ -84,7 +84,7 @@ spec:
         - name: ISTIO_METAJSON_LABELS
           value: |
             {"app":"helloworld","version":"v1"}
-        image: docker.io/istio/proxyv2:1.0.4
+        image: docker.io/istio/proxyv2:1.0.5
         imagePullPolicy: IfNotPresent
         name: istio-proxy
         ports:
@@ -119,7 +119,7 @@ spec:
         - "5000"
         - -d
         - ""
-        image: docker.io/istio/proxy_init:1.0.4
+        image: docker.io/istio/proxy_init:1.0.5
         imagePullPolicy: IfNotPresent
         name: istio-init
         resources: {}
@@ -149,7 +149,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":"50128f63e7b050c58e1cdce95b577358054109ad2aff4bc4995158c06924a43b","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
       creationTimestamp: null
       labels:
         app: helloworld
@@ -211,7 +211,7 @@ spec:
         - name: ISTIO_METAJSON_LABELS
           value: |
             {"app":"helloworld","version":"v2"}
-        image: docker.io/istio/proxyv2:1.0.4
+        image: docker.io/istio/proxyv2:1.0.5
         imagePullPolicy: IfNotPresent
         name: istio-proxy
         ports:
@@ -246,7 +246,7 @@ spec:
         - "5000"
         - -d
         - ""
-        image: docker.io/istio/proxy_init:1.0.4
+        image: docker.io/istio/proxy_init:1.0.5
         imagePullPolicy: IfNotPresent
         name: istio-init
         resources: {}