Upgrade to Istio 1.0.2 official release (knative#2002)

* Upgrade to Istio 1.0.2 * replace istio-1.0.1 with istio-1.0.2
steuhs · Sep 17, 2018 · 9c492a8 · 9c492a8
1 parent 650555b
commit 9c492a8
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 31 deletions.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -128,7 +128,7 @@ kubectl create clusterrolebinding cluster-admin-binding \
 ### Deploy Istio
 
 ```shell
-kubectl apply -f ./third_party/istio-1.0.1/istio.yaml
+kubectl apply -f ./third_party/istio-1.0.2/istio.yaml
 ```
 
 Follow the [instructions](./docs/setting-up-ingress-static-ip.md) if you need
@@ -219,7 +219,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.1/istio.yaml
+  -f ./third_party/istio-1.0.2/istio.yaml
 ```
 
 ## Telemetry

diff --git a/hack/release.sh b/hack/release.sh
@@ -24,8 +24,8 @@ 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.1/istio.yaml
-readonly ISTIO_LEAN_YAML=./third_party/istio-1.0.1/istio-lean.yaml
+readonly ISTIO_YAML=./third_party/istio-1.0.2/istio.yaml
+readonly ISTIO_LEAN_YAML=./third_party/istio-1.0.2/istio-lean.yaml
 # Local generated yaml file.
 readonly OUTPUT_YAML=release.yaml
 # Local generated lite yaml file.

diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
@@ -28,7 +28,7 @@
 source $(dirname $0)/../vendor/github.com/knative/test-infra/scripts/e2e-tests.sh
 
 # Location of istio for the test cluster
-readonly ISTIO_YAML=./third_party/istio-1.0.1/istio-lean.yaml
+readonly ISTIO_YAML=./third_party/istio-1.0.2/istio-lean.yaml
 
 # Helper functions.
 

diff --git a/third_party/istio-1.0.1/README.md → third_party/istio-1.0.2/README.md b/third_party/istio-1.0.1/README.md → third_party/istio-1.0.2/README.md
diff --git a/third_party/istio-1.0.1/download-istio.sh → third_party/istio-1.0.2/download-istio.sh b/third_party/istio-1.0.1/download-istio.sh → third_party/istio-1.0.2/download-istio.sh
@@ -1,5 +1,5 @@
 # Download and unpack Istio
-ISTIO_VERSION=1.0.1
+ISTIO_VERSION=1.0.2
 DOWNLOAD_URL=https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux.tar.gz
 
 wget $DOWNLOAD_URL

diff --git a/third_party/istio-1.0.1/istio-lean.yaml → third_party/istio-1.0.2/istio-lean.yaml b/third_party/istio-1.0.1/istio-lean.yaml → third_party/istio-1.0.2/istio-lean.yaml
@@ -271,6 +271,10 @@ data:
       # for more details
       proxyAdminPort: 15000
       #
+      # Set concurrency to a specific number to control the number of Proxy worker threads.
+      # If set to 0 (default), then start worker thread for each CPU thread/core.
+      concurrency: 0
+      #
       # Zipkin trace collector
       zipkinAddress: zipkin.istio-system:9411
       #
@@ -2095,7 +2099,7 @@ spec:
       serviceAccountName: istio-galley-service-account
       containers:
         - name: validator
-          image: "docker.io/istio/galley:1.0.1"
+          image: "docker.io/istio/galley:1.0.2"
           imagePullPolicy: IfNotPresent
           ports:
           - containerPort: 443
@@ -2209,7 +2213,7 @@ spec:
       serviceAccountName: istio-egressgateway-service-account
       containers:
         - name: istio-proxy
-          image: "docker.io/istio/proxyv2:1.0.1"
+          image: "docker.io/istio/proxyv2:1.0.2"
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
@@ -2345,7 +2349,7 @@ spec:
       serviceAccountName: istio-ingressgateway-service-account
       containers:
         - name: istio-proxy
-          image: "docker.io/istio/proxyv2:1.0.1"
+          image: "docker.io/istio/proxyv2:1.0.2"
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
@@ -2530,7 +2534,7 @@ spec:
                 - s390x
       containers:
       - name: mixer
-        image: "docker.io/istio/mixer:1.0.1"
+        image: "docker.io/istio/mixer:1.0.2"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9093
@@ -2555,7 +2559,7 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 5
       - name: istio-proxy
-        image: "docker.io/istio/proxyv2:1.0.1"
+        image: "docker.io/istio/proxyv2:1.0.2"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9091
@@ -2627,7 +2631,7 @@ spec:
         emptyDir: {}
       containers:
       - name: mixer
-        image: "docker.io/istio/mixer:1.0.1"
+        image: "docker.io/istio/mixer:1.0.2"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9093
@@ -2652,7 +2656,7 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 5
       - name: istio-proxy
-        image: "docker.io/istio/proxyv2:1.0.1"
+        image: "docker.io/istio/proxyv2:1.0.2"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9091
@@ -2724,7 +2728,7 @@ spec:
       serviceAccountName: istio-pilot-service-account
       containers:
         - name: discovery
-          image: "docker.io/istio/pilot:1.0.1"
+          image: "docker.io/istio/pilot:1.0.2"
           imagePullPolicy: IfNotPresent
           args:
           - "discovery"
@@ -2769,7 +2773,7 @@ spec:
             mountPath: /etc/certs
             readOnly: true
         - name: istio-proxy
-          image: "docker.io/istio/proxyv2:1.0.1"
+          image: "docker.io/istio/proxyv2:1.0.2"
           imagePullPolicy: IfNotPresent
           ports:
           - containerPort: 15003
@@ -2877,14 +2881,14 @@ spec:
       serviceAccountName: istio-citadel-service-account
       containers:
         - name: citadel
-          image: "docker.io/istio/citadel:1.0.1"
+          image: "docker.io/istio/citadel:1.0.2"
           imagePullPolicy: IfNotPresent
           args:
             - --append-dns-names=true
             - --grpc-port=8060
             - --grpc-hostname=citadel
             - --citadel-storage-namespace=istio-system
-            - --custom-dns-names=istio-pilot-service-account.istio-system:istio-pilot.istio-system,istio-ingressgateway-service-account.istio-system:istio-ingress.istio-system
+            - --custom-dns-names=istio-pilot-service-account.istio-system:istio-pilot.istio-system,istio-ingressgateway-service-account.istio-system:istio-ingressgateway.istio-system
             - --self-signed-ca=true
           resources:
             requests:

diff --git a/third_party/istio-1.0.1/istio.yaml → third_party/istio-1.0.2/istio.yaml b/third_party/istio-1.0.1/istio.yaml → third_party/istio-1.0.2/istio.yaml
@@ -271,6 +271,10 @@ data:
       # for more details
       proxyAdminPort: 15000
       #
+      # Set concurrency to a specific number to control the number of Proxy worker threads.
+      # If set to 0 (default), then start worker thread for each CPU thread/core.
+      concurrency: 0
+      #
       # Zipkin trace collector
       zipkinAddress: zipkin.istio-system:9411
       #
@@ -303,7 +307,7 @@ data:
     template: |-
       initContainers:
       - name: istio-init
-        image: "docker.io/istio/proxy_init:1.0.1"
+        image: "docker.io/istio/proxy_init:1.0.2"
         args:
         - "-p"
         - [[ .MeshConfig.ProxyListenPort ]]
@@ -346,7 +350,7 @@ data:
         image: [[ if (isset .ObjectMeta.Annotations "sidecar.istio.io/proxyImage") -]]
         "[[ index .ObjectMeta.Annotations "sidecar.istio.io/proxyImage" ]]"
         [[ else -]]
-        docker.io/istio/proxyv2:1.0.1
+        docker.io/istio/proxyv2:1.0.2
         [[ end -]]
         args:
         - proxy
@@ -377,6 +381,10 @@ data:
         - [[ .ProxyConfig.StatsdUdpAddress ]]
         - --proxyAdminPort
         - [[ .ProxyConfig.ProxyAdminPort ]]
+        [[ if gt .ProxyConfig.Concurrency 0 -]]
+        - --concurrency
+        - [[ .ProxyConfig.Concurrency ]]
+        [[ end -]]
         - --controlPlaneAuthPolicy
         - [[ or (index .ObjectMeta.Annotations "sidecar.istio.io/controlPlaneAuthPolicy") .ProxyConfig.ControlPlaneAuthPolicy ]]
         env:
@@ -2318,7 +2326,7 @@ spec:
       serviceAccountName: istio-galley-service-account
       containers:
         - name: validator
-          image: "docker.io/istio/galley:1.0.1"
+          image: "docker.io/istio/galley:1.0.2"
           imagePullPolicy: IfNotPresent
           ports:
           - containerPort: 443
@@ -2432,7 +2440,7 @@ spec:
       serviceAccountName: istio-egressgateway-service-account
       containers:
         - name: istio-proxy
-          image: "docker.io/istio/proxyv2:1.0.1"
+          image: "docker.io/istio/proxyv2:1.0.2"
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
@@ -2568,7 +2576,7 @@ spec:
       serviceAccountName: istio-ingressgateway-service-account
       containers:
         - name: istio-proxy
-          image: "docker.io/istio/proxyv2:1.0.1"
+          image: "docker.io/istio/proxyv2:1.0.2"
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
@@ -2753,7 +2761,7 @@ spec:
                 - s390x
       containers:
       - name: mixer
-        image: "docker.io/istio/mixer:1.0.1"
+        image: "docker.io/istio/mixer:1.0.2"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9093
@@ -2778,7 +2786,7 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 5
       - name: istio-proxy
-        image: "docker.io/istio/proxyv2:1.0.1"
+        image: "docker.io/istio/proxyv2:1.0.2"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9091
@@ -2850,7 +2858,7 @@ spec:
         emptyDir: {}
       containers:
       - name: mixer
-        image: "docker.io/istio/mixer:1.0.1"
+        image: "docker.io/istio/mixer:1.0.2"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9093
@@ -2875,7 +2883,7 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 5
       - name: istio-proxy
-        image: "docker.io/istio/proxyv2:1.0.1"
+        image: "docker.io/istio/proxyv2:1.0.2"
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9091
@@ -2947,7 +2955,7 @@ spec:
       serviceAccountName: istio-pilot-service-account
       containers:
         - name: discovery
-          image: "docker.io/istio/pilot:1.0.1"
+          image: "docker.io/istio/pilot:1.0.2"
           imagePullPolicy: IfNotPresent
           args:
           - "discovery"
@@ -2992,7 +3000,7 @@ spec:
             mountPath: /etc/certs
             readOnly: true
         - name: istio-proxy
-          image: "docker.io/istio/proxyv2:1.0.1"
+          image: "docker.io/istio/proxyv2:1.0.2"
           imagePullPolicy: IfNotPresent
           ports:
           - containerPort: 15003
@@ -3100,14 +3108,14 @@ spec:
       serviceAccountName: istio-citadel-service-account
       containers:
         - name: citadel
-          image: "docker.io/istio/citadel:1.0.1"
+          image: "docker.io/istio/citadel:1.0.2"
           imagePullPolicy: IfNotPresent
           args:
             - --append-dns-names=true
             - --grpc-port=8060
             - --grpc-hostname=citadel
             - --citadel-storage-namespace=istio-system
-            - --custom-dns-names=istio-pilot-service-account.istio-system:istio-pilot.istio-system,istio-ingressgateway-service-account.istio-system:istio-ingress.istio-system
+            - --custom-dns-names=istio-pilot-service-account.istio-system:istio-pilot.istio-system,istio-ingressgateway-service-account.istio-system:istio-ingressgateway.istio-system
             - --self-signed-ca=true
           resources:
             requests:
@@ -3173,7 +3181,7 @@ spec:
       serviceAccountName: istio-sidecar-injector-service-account
       containers:
         - name: sidecar-injector-webhook
-          image: "docker.io/istio/sidecar_injector:1.0.1"
+          image: "docker.io/istio/sidecar_injector:1.0.2"
           imagePullPolicy: IfNotPresent
           args:
             - --caCertFile=/etc/istio/certs/root-cert.pem

diff --git a/third_party/istio-1.0.1/namespace.yaml.patch → third_party/istio-1.0.2/namespace.yaml.patch b/third_party/istio-1.0.1/namespace.yaml.patch → third_party/istio-1.0.2/namespace.yaml.patch