Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ kubectl create clusterrolebinding cluster-admin-binding \
### Deploy Istio

```shell
kubectl apply -f ./third_party/istio-1.0-prerelease/istio.yaml
kubectl apply -f ./third_party/istio-1.0.0/istio.yaml
```

Follow the [instructions](./docs/setting-up-ingress-static-ip.md) if you need
Expand Down Expand Up @@ -215,7 +215,7 @@ ko delete --ignore-not-found=true \
-f config/monitoring/100-common \
-f config/ \
-f ./third_party/config/build/release.yaml \
-f ./third_party/istio-1.0-prerelease/istio.yaml
-f ./third_party/istio-1.0.0/istio.yaml
```

## Telemetry
Expand Down
2 changes: 1 addition & 1 deletion docs/creating-a-kubernetes-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ To use a k8s cluster running in GKE:
so deploy istio with `LoadBalancer` replaced by `NodePort`:

```bash
sed 's/LoadBalancer/NodePort/' third_party/istio-1.0-prerelease/istio.yaml | kubectl apply -f -
sed 's/LoadBalancer/NodePort/' third_party/istio-1.0.0/istio.yaml | kubectl apply -f -
```

(Then optionally [enable istio injection](../DEVELOPMENT.md#deploy-istio).)
Expand Down
2 changes: 1 addition & 1 deletion hack/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ readonly SERVING_RELEASE_GCR

# istio.yaml file to upload
# We publish our own istio.yaml, so users don't need to use helm"
readonly ISTIO_YAML=./third_party/istio-1.0-prerelease/istio.yaml
readonly ISTIO_YAML=./third_party/istio-1.0.0/istio.yaml
# Local generated yaml file.
readonly OUTPUT_YAML=release.yaml
# Local generated lite yaml file.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
[ -v KNATIVE_TEST_INFRA ] || exit 1

# Location of istio for the test cluster
readonly ISTIO_YAML=./third_party/istio-1.0-prerelease/istio.yaml
readonly ISTIO_YAML=./third_party/istio-1.0.0/istio.yaml

# Helper functions.

Expand Down
7 changes: 0 additions & 7 deletions third_party/istio-1.0-prerelease/README.md

This file was deleted.

15 changes: 15 additions & 0 deletions third_party/istio-1.0.0/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
This istio.yaml file is is generated by running
```
./download-istio.sh
```

The Helm options we used are:

1. `sidecarInjectorWebhook.enabled=true` & `sidecarInjectorWebhook.enableNamespacesByDefault=true`: We allow sidecar injection on all namespaces.
2. `global.proxy.autoInject=disabled`: However, only apply sidecar injection for Pods annotated with `istio.sidecar.inject=true`, and not as a default.
3. `prometheus.enabled=false`: Disable Prometheus by default.

Our goal here is to allow sidecar injection for Pods created by Knative, and
nothing else. This template is used in integration tests and also released as
an Istio-one-line-installation so that our users don't have to go through a lot
of steps to install Istio.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to make note of whether Istio installed as configured here is a production-ready configuration or more of a "kick-the-tires" configuration. I honestly do not know, but it would be good to call it out.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is non-blocking, btw.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Download and unpack Istio
ISTIO_VERSION=release-1.0-20180723-09-15
DOWNLOAD_URL=https://storage.googleapis.com/istio-prerelease/daily-build/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux.tar.gz
ISTIO_VERSION=1.0.0
DOWNLOAD_URL=https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux.tar.gz

wget $DOWNLOAD_URL
tar xzf istio-${ISTIO_VERSION}-linux.tar.gz
cd istio-${ISTIO_VERSION}
Expand All @@ -9,7 +10,6 @@ cd istio-${ISTIO_VERSION}
helm template --namespace=istio-system \
--set sidecarInjectorWebhook.enabled=true \
--set sidecarInjectorWebhook.enableNamespacesByDefault=true \
--set global.proxy.image=proxyv2 \
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just curious, why do we not need to set "global.proxy.image=proxyv2" ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR is updated with the explanation #1771 (comment)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to know. Thanks!

--set global.proxy.autoInject=disabled \
--set prometheus.enabled=false \
install/kubernetes/helm/istio > ../istio.yaml
Expand Down
Loading