From f56a69770c11b853c4661b92b5f9d40e70313fec Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Mon, 28 Oct 2019 14:08:33 +0200 Subject: [PATCH 1/5] Update Linkerd to v2.6.0 --- test/e2e-kind.sh | 2 +- test/e2e-linkerd.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh index ea41df54..ddbbfc73 100755 --- a/test/e2e-kind.sh +++ b/test/e2e-kind.sh @@ -21,7 +21,7 @@ chmod +x kind sudo mv kind /usr/local/bin/kind echo ">>> Creating kind cluster" -kind create cluster --wait 5m +kind create cluster --wait 5m #--image kindest/node:v1.16.2 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" kubectl get pods --all-namespaces diff --git a/test/e2e-linkerd.sh b/test/e2e-linkerd.sh index 69849a17..ebef79a5 100755 --- a/test/e2e-linkerd.sh +++ b/test/e2e-linkerd.sh @@ -2,7 +2,7 @@ set -o errexit -LINKERD_VER="stable-2.5.0" +LINKERD_VER="stable-2.6.0" REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" @@ -23,4 +23,4 @@ echo '>>> Installing Flagger' kubectl apply -k ${REPO_ROOT}/kustomize/linkerd kubectl -n linkerd set image deployment/flagger flagger=test/flagger:latest -kubectl -n linkerd rollout status deployment/flagger \ No newline at end of file +kubectl -n linkerd rollout status deployment/flagger From c9bacdfe05cd3093fe4439b092cc0443e979078a Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Mon, 28 Oct 2019 15:07:07 +0200 Subject: [PATCH 2/5] Update Istio to v1.3.3 --- pkg/controller/scheduler.go | 3 +-- test/container-push.sh | 3 --- test/e2e-gloo-tests.sh | 3 --- test/e2e-istio.sh | 2 +- test/e2e-nginx-tests.sh | 2 +- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pkg/controller/scheduler.go b/pkg/controller/scheduler.go index 62b2ed18..2d1486d1 100644 --- a/pkg/controller/scheduler.go +++ b/pkg/controller/scheduler.go @@ -751,7 +751,6 @@ func (c *Controller) analyseCanary(r *flaggerv1.Canary) bool { // create observer based on the mesh provider observerFactory := c.observerFactory - observer := observerFactory.Observer(metricsProvider) // override the global metrics server if one is specified in the canary spec metricsServer := c.observerFactory.Client.GetMetricsServer() @@ -763,8 +762,8 @@ func (c *Controller) analyseCanary(r *flaggerv1.Canary) bool { c.recordEventErrorf(r, "Error building Prometheus client for %s %v", r.Spec.MetricsServer, err) return false } - observer = observerFactory.Observer(metricsProvider) } + observer := observerFactory.Observer(metricsProvider) // run metrics checks for _, metric := range r.Spec.CanaryAnalysis.Metrics { diff --git a/test/container-push.sh b/test/container-push.sh index ceaf3918..bf2a7fe1 100755 --- a/test/container-push.sh +++ b/test/container-push.sh @@ -13,9 +13,6 @@ push () { else docker tag test/flagger:latest weaveworks/flagger:${CIRCLE_TAG}; docker push weaveworks/flagger:${CIRCLE_TAG}; - LT_VERSION=$(grep 'VERSION' cmd/loadtester/main.go | awk '{ print $4 }' | tr -d '"' | head -n1); - docker tag test/flagger-loadtester:latest weaveworks/flagger-loadtester:${LT_VERSION}; - docker push weaveworks/flagger-loadtester:${LT_VERSION}; fi } diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh index 2b614c47..edeea8a3 100755 --- a/test/e2e-gloo-tests.sh +++ b/test/e2e-gloo-tests.sh @@ -36,9 +36,6 @@ spec: upstreamGroup: name: podinfo namespace: test - routePlugins: - prefixRewrite: - prefixRewrite: "/" EOF cat < Date: Mon, 28 Oct 2019 15:31:17 +0200 Subject: [PATCH 3/5] Update loadtester Helm to v3.0.0-beta.5 --- Dockerfile.loadtester | 2 +- artifacts/loadtester/deployment.yaml | 2 +- charts/loadtester/Chart.yaml | 4 ++-- charts/loadtester/values.yaml | 2 +- cmd/loadtester/main.go | 2 +- kustomize/tester/deployment.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.loadtester b/Dockerfile.loadtester index 91413195..8e249c45 100644 --- a/Dockerfile.loadtester +++ b/Dockerfile.loadtester @@ -14,7 +14,7 @@ chmod +x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/helm && \ chmod +x linux-amd64/tiller && mv linux-amd64/tiller /usr/local/bin/tiller && \ rm -rf linux-amd64 -RUN curl -sSL "https://get.helm.sh/helm-v3.0.0-beta.3-linux-amd64.tar.gz" | tar xvz && \ +RUN curl -sSL "https://get.helm.sh/helm-v3.0.0-beta.5-linux-amd64.tar.gz" | tar xvz && \ chmod +x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/helmv3 && \ rm -rf linux-amd64 diff --git a/artifacts/loadtester/deployment.yaml b/artifacts/loadtester/deployment.yaml index dc067b84..9a8292e6 100644 --- a/artifacts/loadtester/deployment.yaml +++ b/artifacts/loadtester/deployment.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: loadtester - image: weaveworks/flagger-loadtester:0.9.0 + image: weaveworks/flagger-loadtester:0.10.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/charts/loadtester/Chart.yaml b/charts/loadtester/Chart.yaml index 3629d86d..5fca6322 100644 --- a/charts/loadtester/Chart.yaml +++ b/charts/loadtester/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: loadtester -version: 0.9.0 -appVersion: 0.9.0 +version: 0.10.0 +appVersion: 0.10.0 kubeVersion: ">=1.11.0-0" engine: gotpl description: Flagger's load testing services based on rakyll/hey and bojand/ghz that generates traffic during canary analysis when configured as a webhook. diff --git a/charts/loadtester/values.yaml b/charts/loadtester/values.yaml index 3ac1dc70..c176716d 100644 --- a/charts/loadtester/values.yaml +++ b/charts/loadtester/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 image: repository: weaveworks/flagger-loadtester - tag: 0.9.0 + tag: 0.10.0 pullPolicy: IfNotPresent podAnnotations: diff --git a/cmd/loadtester/main.go b/cmd/loadtester/main.go index ff80ee4e..a922fc9f 100644 --- a/cmd/loadtester/main.go +++ b/cmd/loadtester/main.go @@ -10,7 +10,7 @@ import ( "time" ) -var VERSION = "0.9.0" +var VERSION = "0.10.0" var ( logLevel string port string diff --git a/kustomize/tester/deployment.yaml b/kustomize/tester/deployment.yaml index fb592dbb..5f80e1e0 100644 --- a/kustomize/tester/deployment.yaml +++ b/kustomize/tester/deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: loadtester - image: weaveworks/flagger-loadtester:0.9.0 + image: weaveworks/flagger-loadtester:0.10.0 imagePullPolicy: IfNotPresent ports: - name: http From 51fe43e16963791bb9a69dafb4e275914548ecbc Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Mon, 28 Oct 2019 15:32:02 +0200 Subject: [PATCH 4/5] Update e2e Helm to v2.15.1 --- test/e2e-kind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh index ddbbfc73..dc569bb9 100755 --- a/test/e2e-kind.sh +++ b/test/e2e-kind.sh @@ -3,7 +3,7 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) -HELM_VERSION=v2.14.3 +HELM_VERSION=v2.15.1 KIND_VERSION=v0.5.1 if [[ "$1" ]]; then From eeea3123ac8ec212cd5ca1d8d57788bb4f37c539 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Mon, 28 Oct 2019 15:47:25 +0200 Subject: [PATCH 5/5] Update e2e NGINX ingress to v1.24.4 --- test/e2e-nginx-custom-annotations.sh | 2 +- test/e2e-nginx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e-nginx-custom-annotations.sh b/test/e2e-nginx-custom-annotations.sh index a1980ac6..a78837e9 100755 --- a/test/e2e-nginx-custom-annotations.sh +++ b/test/e2e-nginx-custom-annotations.sh @@ -4,7 +4,7 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" -NGINX_VERSION=1.12.1 +NGINX_VERSION=1.24.4 echo '>>> Installing NGINX Ingress' helm upgrade -i nginx-ingress stable/nginx-ingress --version=${NGINX_VERSION} \ diff --git a/test/e2e-nginx.sh b/test/e2e-nginx.sh index 0ee57f26..fae2e74e 100755 --- a/test/e2e-nginx.sh +++ b/test/e2e-nginx.sh @@ -4,7 +4,7 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" -NGINX_VERSION=1.12.1 +NGINX_VERSION=1.24.4 echo '>>> Installing NGINX Ingress' helm upgrade -i nginx-ingress stable/nginx-ingress --version=${NGINX_VERSION} \