Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Commit

Permalink
prep 1.0.2
Browse files Browse the repository at this point in the history
Change-Id: Iaae53cd8eb9da8343a782fa1ccadb457104b987d
  • Loading branch information
theganyo committed Sep 11, 2018
1 parent 10955c9 commit 99a9319
Show file tree
Hide file tree
Showing 10 changed files with 485 additions and 281 deletions.
203 changes: 180 additions & 23 deletions Gopkg.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. The included sample files and instructions below will
The current release is based on Istio 1.0.2. 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.

Expand Down Expand Up @@ -110,12 +110,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.0
kubectl -n istio-system set image deployment/istio-telemetry mixer=gcr.io/apigee-api-management-istio/istio-mixer:1.0.2
kubectl -n istio-system set image deployment/istio-policy mixer=gcr.io/apigee-api-management-istio/istio-mixer:1.0.0
kubectl -n istio-system set image deployment/istio-policy mixer=gcr.io/apigee-api-management-istio/istio-mixer:1.0.2
```

NOTE 1: change the tag from `1.0.0` to `latest` if you want the latest release.
NOTE 1: change the tag from `1.0.2` to `latest` if you want the latest release.
NOTE 2: change the container to `istio-mixer-debug` if you want the container with debug tools

## Install a target service
Expand Down
2 changes: 1 addition & 1 deletion adapter/config/apigee.yaml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions apigee-istio/proxies/proxies.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion auth-proxy/apiproxy/policies/Send-Version.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Header name="Content-Type">application/json</Header>
</Headers>
<Payload contentType="application/json">
{"version":"1.0.1"}
{"version":"1.0.2"}
</Payload>
</Set>
<IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>
Expand Down
3 changes: 2 additions & 1 deletion bin/build_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
# 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)
# e. remove existing istio from $GOPATH: `rm -rf $GOPATH/src/istio.io/istio`
# f. build mixer: `bin/local_install.sh`
# 5. Commit and push
# a. verify your changes for git: `git status`
# b. add and commit: `git commit -am "prep ${RELEASE}"`
Expand Down
4 changes: 2 additions & 2 deletions bin/local_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
DEFAULT_ISTIO_VERSION=1.0.2

ISTIO_VERSION=${ISTIO_VERSION:-${DEFAULT_ISTIO_VERSION}}

Expand All @@ -36,7 +36,7 @@ if [[ `command -v protoc` == "" ]]; then
if [[ "${INSTALL_PROTOC}" == "1" ]]; then
echo "protoc not installed, installing..."
mkdir /tmp/protoc
wget -O /tmp/protoc/protoc.zip https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip
wget -O /tmp/protoc/protoc.zip https://github.com/google/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip
unzip /tmp/protoc/protoc.zip -d /tmp/protoc
sudo mv -f /tmp/protoc/bin/protoc /usr/bin/
sudo mv -f /tmp/protoc/include/google /usr/local/include/
Expand Down
24 changes: 10 additions & 14 deletions samples/istio/helloworld.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
template:
metadata:
annotations:
sidecar.istio.io/status: '{"version":"b9c35d3225e1f83ccf948de18fd0301452a4fdcad1f6bbe45673e58077b567e7","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
sidecar.istio.io/status: '{"version":"666176cf119f5520023f04b79663e0d1ebeaf2aece1864b5abf1547879b22129","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
creationTimestamp: null
labels:
app: helloworld
Expand Down Expand Up @@ -51,7 +51,7 @@ spec:
- --parentShutdownDuration
- 1m0s
- --discoveryAddress
- istio-pilot.istio-system:15005
- istio-pilot.istio-system:15007
- --discoveryRefreshDelay
- 1s
- --zipkinAddress
Expand All @@ -63,7 +63,7 @@ spec:
- --proxyAdminPort
- "15000"
- --controlPlaneAuthPolicy
- MUTUAL_TLS
- NONE
env:
- name: POD_NAME
valueFrom:
Expand All @@ -83,14 +83,13 @@ spec:
fieldPath: metadata.name
- name: ISTIO_META_INTERCEPTION_MODE
value: REDIRECT
image: gcr.io/istio-prod/proxyv2:release-1.0-20180719-09-15
image: gcr.io/istio-release/proxyv2:1.0.2
imagePullPolicy: IfNotPresent
name: istio-proxy
resources:
requests:
cpu: 10m
securityContext:
privileged: false
readOnlyRootFilesystem: true
runAsUser: 1337
volumeMounts:
Expand All @@ -115,15 +114,14 @@ spec:
- 5000,
- -d
- ""
image: gcr.io/istio-prod/proxy_init:release-1.0-20180719-09-15
image: gcr.io/istio-release/proxy_init:1.0.2
imagePullPolicy: IfNotPresent
name: istio-init
resources: {}
securityContext:
capabilities:
add:
- NET_ADMIN
privileged: true
volumes:
- emptyDir:
medium: Memory
Expand All @@ -145,7 +143,7 @@ spec:
template:
metadata:
annotations:
sidecar.istio.io/status: '{"version":"b9c35d3225e1f83ccf948de18fd0301452a4fdcad1f6bbe45673e58077b567e7","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
sidecar.istio.io/status: '{"version":"666176cf119f5520023f04b79663e0d1ebeaf2aece1864b5abf1547879b22129","initContainers":["istio-init"],"containers":["istio-proxy"],"volumes":["istio-envoy","istio-certs"],"imagePullSecrets":null}'
creationTimestamp: null
labels:
app: helloworld
Expand Down Expand Up @@ -174,7 +172,7 @@ spec:
- --parentShutdownDuration
- 1m0s
- --discoveryAddress
- istio-pilot.istio-system:15005
- istio-pilot.istio-system:15007
- --discoveryRefreshDelay
- 1s
- --zipkinAddress
Expand All @@ -186,7 +184,7 @@ spec:
- --proxyAdminPort
- "15000"
- --controlPlaneAuthPolicy
- MUTUAL_TLS
- NONE
env:
- name: POD_NAME
valueFrom:
Expand All @@ -206,14 +204,13 @@ spec:
fieldPath: metadata.name
- name: ISTIO_META_INTERCEPTION_MODE
value: REDIRECT
image: gcr.io/istio-prod/proxyv2:release-1.0-20180719-09-15
image: gcr.io/istio-release/proxyv2:1.0.2
imagePullPolicy: IfNotPresent
name: istio-proxy
resources:
requests:
cpu: 10m
securityContext:
privileged: false
readOnlyRootFilesystem: true
runAsUser: 1337
volumeMounts:
Expand All @@ -238,15 +235,14 @@ spec:
- 5000,
- -d
- ""
image: gcr.io/istio-prod/proxy_init:release-1.0-20180719-09-15
image: gcr.io/istio-release/proxy_init:1.0.2
imagePullPolicy: IfNotPresent
name: istio-init
resources: {}
securityContext:
capabilities:
add:
- NET_ADMIN
privileged: true
volumes:
- emptyDir:
medium: Memory
Expand Down
Loading

0 comments on commit 99a9319

Please sign in to comment.