From de51b2cd890649e2081dcafbc50afa8b07b54704 Mon Sep 17 00:00:00 2001 From: Nghia Tran Date: Fri, 5 Apr 2019 16:04:57 -0700 Subject: [PATCH] [RELEASE 0.5] Use Istio 1.0.7. (#3668) * Use Istio 1.0.7. * Update to offical release URL. * Use Istio 1.0.7 in tests. * Add `--now` to `kubectl delete` to avoid hanging tests. * More `--now` in `kubectl delete`. --- hack/generate-yamls.sh | 6 ++-- test/e2e-common.sh | 10 +++---- .../{istio-1.0.6 => istio-1.0.7}/README.md | 0 .../conn-timeout.yaml.patch | 0 .../download-istio.sh | 2 +- .../istio-crds.yaml | 0 .../istio-lean.yaml | 22 +++++++-------- .../{istio-1.0.6 => istio-1.0.7}/istio.yaml | 28 +++++++++---------- .../namespace.yaml.patch | 0 .../prestop-sleep.yaml.patch | 0 10 files changed, 34 insertions(+), 34 deletions(-) rename third_party/{istio-1.0.6 => istio-1.0.7}/README.md (100%) rename third_party/{istio-1.0.6 => istio-1.0.7}/conn-timeout.yaml.patch (100%) rename third_party/{istio-1.0.6 => istio-1.0.7}/download-istio.sh (99%) rename third_party/{istio-1.0.6 => istio-1.0.7}/istio-crds.yaml (100%) rename third_party/{istio-1.0.6 => istio-1.0.7}/istio-lean.yaml (99%) rename third_party/{istio-1.0.6 => istio-1.0.7}/istio.yaml (99%) rename third_party/{istio-1.0.6 => istio-1.0.7}/namespace.yaml.patch (100%) rename third_party/{istio-1.0.6 => istio-1.0.7}/prestop-sleep.yaml.patch (100%) diff --git a/hack/generate-yamls.sh b/hack/generate-yamls.sh index 0befb2eadb5e..3aa9986e0d6f 100755 --- a/hack/generate-yamls.sh +++ b/hack/generate-yamls.sh @@ -42,9 +42,9 @@ readonly YAML_REPO_ROOT=${1:?"First argument must be the repo root dir"} readonly YAML_LIST_FILE=${2:?"Second argument must be the output file"} # Location of istio YAMLs -readonly ISTIO_CRD_YAML=${YAML_REPO_ROOT}/third_party/istio-1.0.6/istio-crds.yaml -readonly ISTIO_YAML=${YAML_REPO_ROOT}/third_party/istio-1.0.6/istio.yaml -readonly ISTIO_LEAN_YAML=${YAML_REPO_ROOT}/third_party/istio-1.0.6/istio-lean.yaml +readonly ISTIO_CRD_YAML=${YAML_REPO_ROOT}/third_party/istio-1.0.7/istio-crds.yaml +readonly ISTIO_YAML=${YAML_REPO_ROOT}/third_party/istio-1.0.7/istio.yaml +readonly ISTIO_LEAN_YAML=${YAML_REPO_ROOT}/third_party/istio-1.0.7/istio-lean.yaml # Set output directory if [[ -z "${YAML_OUTPUT_DIR:-}" ]]; then diff --git a/test/e2e-common.sh b/test/e2e-common.sh index 87000e5d46da..99fb99a65c25 100644 --- a/test/e2e-common.sh +++ b/test/e2e-common.sh @@ -197,7 +197,7 @@ function knative_teardown() { echo ">> Uninstalling Knative serving from custom YAMLs" for yaml in ${INSTALL_CUSTOM_YAMLS}; do echo "Uninstalling '${yaml}'" - kubectl delete --ignore-not-found=true -f "${yaml}" || return 1 + kubectl delete --ignore-not-found=true --now -f "${yaml}" || return 1 done else echo ">> Uninstalling Knative serving" @@ -206,10 +206,10 @@ function knative_teardown() { echo "Knative Build YAML: ${INSTALL_BUILD_DIR}" echo "Knative Build Pipeline YAML: ${INSTALL_PIPELINE_DIR}" echo ">> Bringing down Serving" - ko delete --ignore-not-found=true -f "${INSTALL_RELEASE_YAML}" || return 1 + ko delete --ignore-not-found=true --now -f "${INSTALL_RELEASE_YAML}" || return 1 if [[ -n "${INSTALL_MONITORING_YAML}" ]]; then echo ">> Bringing down monitoring" - ko delete --ignore-not-found=true -f "${INSTALL_MONITORING_YAML}" || return 1 + ko delete --ignore-not-found=true --now -f "${INSTALL_MONITORING_YAML}" || return 1 fi echo ">> Bringing down Build" ko delete --ignore-not-found=true -f "${INSTALL_BUILD_DIR}" || return 1 @@ -234,6 +234,6 @@ function test_teardown() { echo ">> Removing test resources (test/config/)" ko delete --ignore-not-found=true -f test/config/ echo ">> Removing test namespace" - kubectl delete all --all --ignore-not-found=true -n serving-tests - kubectl delete --ignore-not-found=true namespace serving-tests + kubectl delete all --all --ignore-not-found=true --now -n serving-tests + kubectl delete --ignore-not-found=true --now namespace serving-tests } diff --git a/third_party/istio-1.0.6/README.md b/third_party/istio-1.0.7/README.md similarity index 100% rename from third_party/istio-1.0.6/README.md rename to third_party/istio-1.0.7/README.md diff --git a/third_party/istio-1.0.6/conn-timeout.yaml.patch b/third_party/istio-1.0.7/conn-timeout.yaml.patch similarity index 100% rename from third_party/istio-1.0.6/conn-timeout.yaml.patch rename to third_party/istio-1.0.7/conn-timeout.yaml.patch diff --git a/third_party/istio-1.0.6/download-istio.sh b/third_party/istio-1.0.7/download-istio.sh similarity index 99% rename from third_party/istio-1.0.6/download-istio.sh rename to third_party/istio-1.0.7/download-istio.sh index a2f3771cf4a9..074f9179ee9e 100755 --- a/third_party/istio-1.0.6/download-istio.sh +++ b/third_party/istio-1.0.7/download-istio.sh @@ -1,5 +1,5 @@ # Download and unpack Istio -ISTIO_VERSION=1.0.6 +ISTIO_VERSION=1.0.7 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.6/istio-crds.yaml b/third_party/istio-1.0.7/istio-crds.yaml similarity index 100% rename from third_party/istio-1.0.6/istio-crds.yaml rename to third_party/istio-1.0.7/istio-crds.yaml diff --git a/third_party/istio-1.0.6/istio-lean.yaml b/third_party/istio-1.0.7/istio-lean.yaml similarity index 99% rename from third_party/istio-1.0.6/istio-lean.yaml rename to third_party/istio-1.0.7/istio-lean.yaml index 652eec90b011..f98ce8f23cc2 100644 --- a/third_party/istio-1.0.6/istio-lean.yaml +++ b/third_party/istio-1.0.7/istio-lean.yaml @@ -2143,7 +2143,7 @@ spec: serviceAccountName: istio-galley-service-account containers: - name: validator - image: "docker.io/istio/galley:1.0.6" + image: "docker.io/istio/galley:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 443 @@ -2257,7 +2257,7 @@ spec: serviceAccountName: istio-egressgateway-service-account containers: - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 80 @@ -2396,7 +2396,7 @@ spec: serviceAccountName: istio-ingressgateway-service-account containers: - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 80 @@ -2584,7 +2584,7 @@ spec: - s390x containers: - name: mixer - image: "docker.io/istio/mixer:1.0.6" + image: "docker.io/istio/mixer:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 9093 @@ -2613,7 +2613,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 9091 @@ -2691,7 +2691,7 @@ spec: emptyDir: {} containers: - name: mixer - image: "docker.io/istio/mixer:1.0.6" + image: "docker.io/istio/mixer:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 9093 @@ -2719,7 +2719,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 9091 @@ -2797,7 +2797,7 @@ spec: serviceAccountName: istio-pilot-service-account containers: - name: discovery - image: "docker.io/istio/pilot:1.0.6" + image: "docker.io/istio/pilot:1.0.7" imagePullPolicy: IfNotPresent args: - "discovery" @@ -2842,7 +2842,7 @@ spec: mountPath: /etc/certs readOnly: true - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 15003 @@ -2950,7 +2950,7 @@ spec: serviceAccountName: istio-citadel-service-account containers: - name: citadel - image: "docker.io/istio/citadel:1.0.6" + image: "docker.io/istio/citadel:1.0.7" imagePullPolicy: IfNotPresent args: - --append-dns-names=true @@ -4009,7 +4009,7 @@ spec: serviceAccountName: cluster-local-gateway-service-account containers: - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 80 diff --git a/third_party/istio-1.0.6/istio.yaml b/third_party/istio-1.0.7/istio.yaml similarity index 99% rename from third_party/istio-1.0.6/istio.yaml rename to third_party/istio-1.0.7/istio.yaml index 13a91db6d149..6598d0acf27f 100644 --- a/third_party/istio-1.0.6/istio.yaml +++ b/third_party/istio-1.0.7/istio.yaml @@ -328,7 +328,7 @@ data: template: |- initContainers: - name: istio-init - image: "docker.io/istio/proxy_init:1.0.6" + image: "docker.io/istio/proxy_init:1.0.7" args: - "-p" - [[ .MeshConfig.ProxyListenPort ]] @@ -353,7 +353,7 @@ data: restartPolicy: Always containers: - name: istio-proxy - image: [[ annotation .ObjectMeta `sidecar.istio.io/proxyImage` "docker.io/istio/proxyv2:1.0.6" ]] + image: [[ annotation .ObjectMeta `sidecar.istio.io/proxyImage` "docker.io/istio/proxyv2:1.0.7" ]] # PATCH #2: Graceful shutdown of the istio-proxy. See https://github.com/istio/istio/issues/7136. lifecycle: preStop: @@ -2386,7 +2386,7 @@ spec: serviceAccountName: istio-galley-service-account containers: - name: validator - image: "docker.io/istio/galley:1.0.6" + image: "docker.io/istio/galley:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 443 @@ -2500,7 +2500,7 @@ spec: serviceAccountName: istio-egressgateway-service-account containers: - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 80 @@ -2639,7 +2639,7 @@ spec: serviceAccountName: istio-ingressgateway-service-account containers: - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 80 @@ -2827,7 +2827,7 @@ spec: - s390x containers: - name: mixer - image: "docker.io/istio/mixer:1.0.6" + image: "docker.io/istio/mixer:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 9093 @@ -2856,7 +2856,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 9091 @@ -2934,7 +2934,7 @@ spec: emptyDir: {} containers: - name: mixer - image: "docker.io/istio/mixer:1.0.6" + image: "docker.io/istio/mixer:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 9093 @@ -2962,7 +2962,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 9091 @@ -3040,7 +3040,7 @@ spec: serviceAccountName: istio-pilot-service-account containers: - name: discovery - image: "docker.io/istio/pilot:1.0.6" + image: "docker.io/istio/pilot:1.0.7" imagePullPolicy: IfNotPresent args: - "discovery" @@ -3085,7 +3085,7 @@ spec: mountPath: /etc/certs readOnly: true - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 15003 @@ -3193,7 +3193,7 @@ spec: serviceAccountName: istio-citadel-service-account containers: - name: citadel - image: "docker.io/istio/citadel:1.0.6" + image: "docker.io/istio/citadel:1.0.7" imagePullPolicy: IfNotPresent args: - --append-dns-names=true @@ -3266,7 +3266,7 @@ spec: serviceAccountName: istio-sidecar-injector-service-account containers: - name: sidecar-injector-webhook - image: "docker.io/istio/sidecar_injector:1.0.6" + image: "docker.io/istio/sidecar_injector:1.0.7" imagePullPolicy: IfNotPresent args: - --caCertFile=/etc/istio/certs/root-cert.pem @@ -4397,7 +4397,7 @@ spec: serviceAccountName: cluster-local-gateway-service-account containers: - name: istio-proxy - image: "docker.io/istio/proxyv2:1.0.6" + image: "docker.io/istio/proxyv2:1.0.7" imagePullPolicy: IfNotPresent ports: - containerPort: 80 diff --git a/third_party/istio-1.0.6/namespace.yaml.patch b/third_party/istio-1.0.7/namespace.yaml.patch similarity index 100% rename from third_party/istio-1.0.6/namespace.yaml.patch rename to third_party/istio-1.0.7/namespace.yaml.patch diff --git a/third_party/istio-1.0.6/prestop-sleep.yaml.patch b/third_party/istio-1.0.7/prestop-sleep.yaml.patch similarity index 100% rename from third_party/istio-1.0.6/prestop-sleep.yaml.patch rename to third_party/istio-1.0.7/prestop-sleep.yaml.patch