prep 1.0.0

Change-Id: I9af4d67dbb2cc6d8c1992febff0f42a9ccfb9b4c

Gopkg.toml

@@ -11,7 +11,7 @@
 
 [[constraint]]
   name = "istio.io/istio"
-  branch = "release-1.0"
+  version = "1.0.0"
 
 [[constraint]]
   name = "github.com/hashicorp/go-multierror"

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.0-rc1"}
+        {"version":"1.0.0"}
     </Payload>
     </Set>
     <IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>

bin/build_release.sh

@@ -5,26 +5,32 @@
 #
 #  1. set RELEASE env var
 #     (eg. `RELEASE=1.0.0-alpha-2`)
-#  2. create a release branch: `git checkout -b $RELEASE`
+#  2. create a release branch: `git checkout -b $RELEASE-prep`
 #  3. make release updates
-#     a. update README.md to appropriate versions and instructions as necessary
-#     b. update DEFAULT_ISTIO_VERSION in `bin/local_install.sh` as necessary
+#     a. update README.md to appropriate versions and instructions
+#     b. update DEFAULT_ISTIO_VERSION in `bin/local_install.sh` to match Istio release
 #     c. replace `samples/istio/istio-demo.yaml`, `istio-demo-auth.yaml`, `helloworld.yaml` from base Istio
 #     d. update helloworld.yaml to include Istio sidecar: `istioctl kube-inject -f helloworld.yaml`
-#     e. update `samples/istio/istio-demo.yaml`, `samples/istio/istio-demo-auth.yaml` mixer images
-#     f. update version in `auth-proxy/apiproxy/policies/Send-Version.xml`
+#     e. update `samples/istio/istio-demo.yaml`, `samples/istio/istio-demo-auth.yaml` mixer images to match $RELEASE
+#     f. update version in `auth-proxy/apiproxy/policies/Send-Version.xml` to match $RELEASE
 #     g. run `bin/build_proxy_resources.sh`
-#     h. commit `git commit -am ${RELEASE}`
-#  4. create tag and push: `git tag ${RELEASE};git push origin --tags`
-#     (CircleCI will automatically build and tag docker image)
+#  4. Validate build
+#     a. update `Gopkg.toml`, ensure appropriate version for `istio.io/istio`
+#     b. update deps: `dep ensure --update`
+#     c. build: `bin/local_update.sh` (remove istio from GOPATH first)
+#  5. Commit and push
+#     a. verify your changes for git: `git status`
+#     b. add and commit: `git commit -am "prep ${RELEASE}"`
+#     c. create tag and push: `git tag ${RELEASE};git push origin --tags`
+#  (CircleCI will automatically build and tag docker image)
 #  5. verify the image
 #     (gcr.io/apigee-api-management-istio/istio-mixer:$RELEASE)
 #  6. `bin/build_release.sh`
 #     (creates a draft release on Github)
 #  7. edit Github release:
 #     a. add mixer version and docker image URL to release notes
 #     b. if this is not a pre-release, uncheck `This is a pre-release` checkbox
-#  8. submit PR for $RELEASE branch
+#  8. submit PR for $RELEASE-prep branch
 #  9. merge and final verifications
 # 10. publish release on Github
 

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=release-1.0
+DEFAULT_ISTIO_VERSION=1.0.0
 
 ISTIO_VERSION=${ISTIO_VERSION:-${DEFAULT_ISTIO_VERSION}}
 

samples/istio/helloworld.yaml

@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/status: '{"version":"ac2343276d2f72ba625874ed65325c25fbb83e48b39479cee950402f6da469aa","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
+        sidecar.istio.io/status: '{"version":"b9c35d3225e1f83ccf948de18fd0301452a4fdcad1f6bbe45673e58077b567e7","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
       creationTimestamp: null
       labels:
         app: helloworld
@@ -51,7 +51,7 @@ spec:
         - --parentShutdownDuration
         - 1m0s
         - --discoveryAddress
-        - istio-pilot.istio-system:15007
+        - istio-pilot.istio-system:15005
         - --discoveryRefreshDelay
         - 1s
         - --zipkinAddress
@@ -63,7 +63,7 @@ spec:
         - --proxyAdminPort
         - "15000"
         - --controlPlaneAuthPolicy
-        - NONE
+        - MUTUAL_TLS
         env:
         - name: POD_NAME
           valueFrom:
@@ -83,7 +83,7 @@ spec:
               fieldPath: metadata.name
         - name: ISTIO_META_INTERCEPTION_MODE
           value: REDIRECT
-        image: gcr.io/istio-release/proxyv2:1.0.0-snapshot.2
+        image: gcr.io/istio-prod/proxyv2:release-1.0-20180719-09-15
         imagePullPolicy: IfNotPresent
         name: istio-proxy
         resources:
@@ -115,7 +115,7 @@ spec:
         - 5000,
         - -d
         - ""
-        image: gcr.io/istio-release/proxy_init:1.0.0-snapshot.2
+        image: gcr.io/istio-prod/proxy_init:release-1.0-20180719-09-15
         imagePullPolicy: IfNotPresent
         name: istio-init
         resources: {}
@@ -145,7 +145,7 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/status: '{"version":"ac2343276d2f72ba625874ed65325c25fbb83e48b39479cee950402f6da469aa","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
+        sidecar.istio.io/status: '{"version":"b9c35d3225e1f83ccf948de18fd0301452a4fdcad1f6bbe45673e58077b567e7","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
       creationTimestamp: null
       labels:
         app: helloworld
@@ -174,7 +174,7 @@ spec:
         - --parentShutdownDuration
         - 1m0s
         - --discoveryAddress
-        - istio-pilot.istio-system:15007
+        - istio-pilot.istio-system:15005
         - --discoveryRefreshDelay
         - 1s
         - --zipkinAddress
@@ -186,7 +186,7 @@ spec:
         - --proxyAdminPort
         - "15000"
         - --controlPlaneAuthPolicy
-        - NONE
+        - MUTUAL_TLS
         env:
         - name: POD_NAME
           valueFrom:
@@ -206,7 +206,7 @@ spec:
               fieldPath: metadata.name
         - name: ISTIO_META_INTERCEPTION_MODE
           value: REDIRECT
-        image: gcr.io/istio-release/proxyv2:1.0.0-snapshot.2
+        image: gcr.io/istio-prod/proxyv2:release-1.0-20180719-09-15
         imagePullPolicy: IfNotPresent
         name: istio-proxy
         resources:
@@ -238,7 +238,7 @@ spec:
         - 5000,
         - -d
         - ""
-        image: gcr.io/istio-release/proxy_init:1.0.0-snapshot.2
+        image: gcr.io/istio-prod/proxy_init:release-1.0-20180719-09-15
         imagePullPolicy: IfNotPresent
         name: istio-init
         resources: {}