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.3
Browse files Browse the repository at this point in the history
Change-Id: I1bcaf1b597144a80060b3cb08cb2893a8ecd8efe
  • Loading branch information
theganyo committed Oct 30, 2018
1 parent 9aefbb1 commit 65497f1
Show file tree
Hide file tree
Showing 10 changed files with 20,540 additions and 757 deletions.
203 changes: 23 additions & 180 deletions Gopkg.lock

Large diffs are not rendered by default.

13 changes: 6 additions & 7 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.2. The included sample files and instructions below will
The current release is based on Istio 1.0.3. 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.2
kubectl -n istio-system set image deployment/istio-telemetry mixer=gcr.io/apigee-api-management-istio/istio-mixer:1.0.3
kubectl -n istio-system set image deployment/istio-policy 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.3
```

NOTE 1: change the tag from `1.0.2` to `latest` if you want the latest release.
NOTE 1: change the tag from `1.0.3` 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 Expand Up @@ -159,9 +159,8 @@ The service is now protected by Apigee. Great! But now you've locked yourself ou
If only you had credentials. Let's fix that.

Debugging tip: If you're certain you've applied everything correctly up to this point but
are still unable to see the `missing authentication` message in Istio 1.0.2, please check
[the Github wiki](https://github.com/apigee/istio-mixer-adapter/wiki/Debug-Authorization-check-ignored-in-Istio-1.0.2)
for troubleshooting tips.
are still unable to see the `missing authentication` message, please check
[the Github wiki](https://github.com/apigee/istio-mixer-adapter/wiki) for troubleshooting tips.

```
ki delete po $(ki get po -l istio-mixer-type=policy -o 'jsonpath={.items[0].metadata.name}')
Expand Down
2 changes: 1 addition & 1 deletion adapter/config/apigee.yaml

Large diffs are not rendered by default.

Binary file modified adapter/config/config.proto_descriptor
Binary file not shown.
16 changes: 8 additions & 8 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.2"}
{"version":"1.0.3"}
</Payload>
</Set>
<IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>
Expand Down
2 changes: 1 addition & 1 deletion 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.2
DEFAULT_ISTIO_VERSION=1.0.3

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

Expand Down
38 changes: 26 additions & 12 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":"666176cf119f5520023f04b79663e0d1ebeaf2aece1864b5abf1547879b22129","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
Expand Down Expand Up @@ -58,8 +58,6 @@ spec:
- zipkin.istio-system:9411
- --connectTimeout
- 10s
- --statsdUdpAddress
- istio-statsd-prom-bridge.istio-system:9125
- --proxyAdminPort
- "15000"
- --controlPlaneAuthPolicy
Expand All @@ -83,9 +81,17 @@ spec:
fieldPath: metadata.name
- name: ISTIO_META_INTERCEPTION_MODE
value: REDIRECT
image: gcr.io/istio-release/proxyv2:1.0.2
- 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:
- containerPort: 15090
name: http-envoy-prom
protocol: TCP
resources:
requests:
cpu: 10m
Expand All @@ -111,17 +117,18 @@ spec:
- -x
- ""
- -b
- 5000,
- "5000"
- -d
- ""
image: gcr.io/istio-release/proxy_init:1.0.2
image: docker.io/istio/proxy_init:1.0.3
imagePullPolicy: IfNotPresent
name: istio-init
resources: {}
securityContext:
capabilities:
add:
- NET_ADMIN
privileged: true
volumes:
- emptyDir:
medium: Memory
Expand All @@ -143,7 +150,7 @@ spec:
template:
metadata:
annotations:
sidecar.istio.io/status: '{"version":"666176cf119f5520023f04b79663e0d1ebeaf2aece1864b5abf1547879b22129","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
Expand Down Expand Up @@ -179,8 +186,6 @@ spec:
- zipkin.istio-system:9411
- --connectTimeout
- 10s
- --statsdUdpAddress
- istio-statsd-prom-bridge.istio-system:9125
- --proxyAdminPort
- "15000"
- --controlPlaneAuthPolicy
Expand All @@ -204,9 +209,17 @@ spec:
fieldPath: metadata.name
- name: ISTIO_META_INTERCEPTION_MODE
value: REDIRECT
image: gcr.io/istio-release/proxyv2:1.0.2
- 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:
- containerPort: 15090
name: http-envoy-prom
protocol: TCP
resources:
requests:
cpu: 10m
Expand All @@ -232,17 +245,18 @@ spec:
- -x
- ""
- -b
- 5000,
- "5000"
- -d
- ""
image: gcr.io/istio-release/proxy_init:1.0.2
image: docker.io/istio/proxy_init:1.0.3
imagePullPolicy: IfNotPresent
name: istio-init
resources: {}
securityContext:
capabilities:
add:
- NET_ADMIN
privileged: true
volumes:
- emptyDir:
medium: Memory
Expand Down
Loading

0 comments on commit 65497f1

Please sign in to comment.