From 79a6421178b0fa149c942dd19386ae45045949e4 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Wed, 27 Mar 2019 09:35:34 +0200 Subject: [PATCH 1/4] Move load tester to Weaveworks Quay --- charts/loadtester/README.md | 2 ++ charts/loadtester/values.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/loadtester/README.md b/charts/loadtester/README.md index 796e9c13..cb891782 100644 --- a/charts/loadtester/README.md +++ b/charts/loadtester/README.md @@ -58,6 +58,8 @@ Parameter | Description | Default `service.port` | ClusterIP port | `80` `cmd.timeout` | Command execution timeout | `1h` `logLevel` | Log level can be debug, info, warning, error or panic | `info` +`meshName` | AWS App Mesh name | `none` +`backends` | AWS App Mesh virtual services | `none` Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/charts/loadtester/values.yaml b/charts/loadtester/values.yaml index 1d55891b..95db0b39 100644 --- a/charts/loadtester/values.yaml +++ b/charts/loadtester/values.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - repository: quay.io/stefanprodan/flagger-loadtester + repository: quay.io/weaveworks/flagger-loadtester tag: 0.2.0 pullPolicy: IfNotPresent From 960d506360cea2fd308f994598d86148c12adbd7 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Wed, 27 Mar 2019 09:40:11 +0200 Subject: [PATCH 2/4] Upgrade mesh definition to v1beta1 --- artifacts/appmesh/global-mesh.yaml | 3 +-- docs/gitbook/usage/appmesh-progressive-delivery.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/artifacts/appmesh/global-mesh.yaml b/artifacts/appmesh/global-mesh.yaml index d03c06db..01d6c8ff 100644 --- a/artifacts/appmesh/global-mesh.yaml +++ b/artifacts/appmesh/global-mesh.yaml @@ -1,7 +1,6 @@ -apiVersion: appmesh.k8s.aws/v1alpha1 +apiVersion: appmesh.k8s.aws/v1beta1 kind: Mesh metadata: name: global - namespace: appmesh-system spec: serviceDiscoveryType: dns diff --git a/docs/gitbook/usage/appmesh-progressive-delivery.md b/docs/gitbook/usage/appmesh-progressive-delivery.md index 9f006e1e..416671dc 100644 --- a/docs/gitbook/usage/appmesh-progressive-delivery.md +++ b/docs/gitbook/usage/appmesh-progressive-delivery.md @@ -11,7 +11,7 @@ then creates a series of objects (Kubernetes deployments, ClusterIP services, Ap These objects expose the application on the mesh and drive the canary analysis and promotion. The only App Mesh object you need to create by yourself is the mesh resource. -Create a mesh called `global` in the `appmesh-system` namespace: +Create a mesh called `global`: ```bash export REPO=https://raw.githubusercontent.com/weaveworks/flagger/master From 274c1469b44780ea75915b8b0990dbd659f08933 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Wed, 27 Mar 2019 09:46:06 +0200 Subject: [PATCH 3/4] Update changelog v0.10.0 --- CHANGELOG.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 144f18eb..e5328934 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,15 @@ All notable changes to this project are documented in this file. -## 0.10.0 (2019-03-26) +## 0.10.0 (2019-03-27) -Adds support for AWS App Mesh +Adds support for App Mesh #### Features -- AWS App Mesh integration [#107](https://github.com/weaveworks/flagger/pull/107) +- AWS App Mesh integration + [#107](https://github.com/weaveworks/flagger/pull/107) + [#123](https://github.com/weaveworks/flagger/pull/123) #### Improvements @@ -16,7 +18,7 @@ Adds support for AWS App Mesh #### Fixes -- Copy pod labels from canary to primary [#105](https://github.com/weaveworks/flagger/pull/105) +- Preserve pod labels on canary promotion [#105](https://github.com/weaveworks/flagger/pull/105) - Fix canary status Prometheus metric [#121](https://github.com/weaveworks/flagger/pull/121) ## 0.9.0 (2019-03-11) From ef5bf703861033c3a075ad78be8fc738f5968de0 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Wed, 27 Mar 2019 13:02:30 +0200 Subject: [PATCH 4/4] Update go to 1.12 --- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.loadtester | 2 +- docs/gitbook/install/flagger-install-on-eks-appmesh.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e01e91e..b9dc35a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required language: go go: -- 1.11.x +- 1.12.x services: - docker diff --git a/Dockerfile b/Dockerfile index da33fc79..85988a5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11 +FROM golang:1.12 RUN mkdir -p /go/src/github.com/weaveworks/flagger/ diff --git a/Dockerfile.loadtester b/Dockerfile.loadtester index de95a5e6..238ad5c1 100644 --- a/Dockerfile.loadtester +++ b/Dockerfile.loadtester @@ -1,4 +1,4 @@ -FROM golang:1.11 AS hey-builder +FROM golang:1.12 AS hey-builder RUN mkdir -p /go/src/github.com/rakyll/hey/ diff --git a/docs/gitbook/install/flagger-install-on-eks-appmesh.md b/docs/gitbook/install/flagger-install-on-eks-appmesh.md index 79da4438..5e64dba8 100644 --- a/docs/gitbook/install/flagger-install-on-eks-appmesh.md +++ b/docs/gitbook/install/flagger-install-on-eks-appmesh.md @@ -111,7 +111,7 @@ The installer does the following: * registers the App Mesh mutating webhook * deploys the App Mesh webhook in `appmesh-system` namespace * deploys the App Mesh CRDs -* deploys the App Mesh controller `appmesh-system` namespace +* deploys the App Mesh controller in `appmesh-system` namespace * creates a mesh called `global` Verify that the global mesh is active: