From 128c883755d25e18dd7916c4f9d14002a9603dbf Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Mon, 7 Dec 2020 11:24:01 +0200 Subject: [PATCH 1/2] Update docs and examples to HPA v2beta2 Signed-off-by: Stefan Prodan --- .../tutorials/appmesh-progressive-delivery.md | 2 +- .../tutorials/contour-progressive-delivery.md | 2 +- .../tutorials/crossover-progressive-delivery.md | 2 +- docs/gitbook/tutorials/flagger-smi-istio.md | 2 +- .../tutorials/gloo-progressive-delivery.md | 2 +- docs/gitbook/tutorials/istio-ab-testing.md | 2 +- .../tutorials/istio-progressive-delivery.md | 2 +- docs/gitbook/tutorials/kubernetes-blue-green.md | 2 +- .../tutorials/linkerd-progressive-delivery.md | 4 ++-- .../tutorials/nginx-progressive-delivery.md | 2 +- .../tutorials/skipper-progressive-delivery.md | 2 +- .../tutorials/traefik-progressive-delivery.md | 2 +- .../tutorials/zero-downtime-deployments.md | 2 +- docs/gitbook/usage/how-it-works.md | 2 +- kustomize/podinfo/hpa.yaml | 16 +++++++++------- 15 files changed, 24 insertions(+), 22 deletions(-) diff --git a/docs/gitbook/tutorials/appmesh-progressive-delivery.md b/docs/gitbook/tutorials/appmesh-progressive-delivery.md index 15f5ca956..d828a22b9 100644 --- a/docs/gitbook/tutorials/appmesh-progressive-delivery.md +++ b/docs/gitbook/tutorials/appmesh-progressive-delivery.md @@ -76,7 +76,7 @@ spec: progressDeadlineSeconds: 60 # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/contour-progressive-delivery.md b/docs/gitbook/tutorials/contour-progressive-delivery.md index 953f1d33b..f95c33db7 100644 --- a/docs/gitbook/tutorials/contour-progressive-delivery.md +++ b/docs/gitbook/tutorials/contour-progressive-delivery.md @@ -79,7 +79,7 @@ spec: name: podinfo # HPA reference autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/crossover-progressive-delivery.md b/docs/gitbook/tutorials/crossover-progressive-delivery.md index cd26ed093..8f81dd9bf 100644 --- a/docs/gitbook/tutorials/crossover-progressive-delivery.md +++ b/docs/gitbook/tutorials/crossover-progressive-delivery.md @@ -142,7 +142,7 @@ spec: progressDeadlineSeconds: 60 # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/flagger-smi-istio.md b/docs/gitbook/tutorials/flagger-smi-istio.md index 90291e48f..f7ee750a2 100644 --- a/docs/gitbook/tutorials/flagger-smi-istio.md +++ b/docs/gitbook/tutorials/flagger-smi-istio.md @@ -122,7 +122,7 @@ spec: progressDeadlineSeconds: 60 # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/gloo-progressive-delivery.md b/docs/gitbook/tutorials/gloo-progressive-delivery.md index 6ec09c4f0..6ac14abff 100644 --- a/docs/gitbook/tutorials/gloo-progressive-delivery.md +++ b/docs/gitbook/tutorials/gloo-progressive-delivery.md @@ -97,7 +97,7 @@ spec: name: podinfo # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/istio-ab-testing.md b/docs/gitbook/tutorials/istio-ab-testing.md index b7a3f781b..00fe97207 100644 --- a/docs/gitbook/tutorials/istio-ab-testing.md +++ b/docs/gitbook/tutorials/istio-ab-testing.md @@ -86,7 +86,7 @@ spec: progressDeadlineSeconds: 60 # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/istio-progressive-delivery.md b/docs/gitbook/tutorials/istio-progressive-delivery.md index b476f84de..eaeb3bd98 100644 --- a/docs/gitbook/tutorials/istio-progressive-delivery.md +++ b/docs/gitbook/tutorials/istio-progressive-delivery.md @@ -87,7 +87,7 @@ spec: progressDeadlineSeconds: 60 # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/kubernetes-blue-green.md b/docs/gitbook/tutorials/kubernetes-blue-green.md index 59ff350c8..840e9d598 100644 --- a/docs/gitbook/tutorials/kubernetes-blue-green.md +++ b/docs/gitbook/tutorials/kubernetes-blue-green.md @@ -87,7 +87,7 @@ spec: progressDeadlineSeconds: 60 # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/linkerd-progressive-delivery.md b/docs/gitbook/tutorials/linkerd-progressive-delivery.md index 87c161d1c..f7314c255 100644 --- a/docs/gitbook/tutorials/linkerd-progressive-delivery.md +++ b/docs/gitbook/tutorials/linkerd-progressive-delivery.md @@ -57,7 +57,7 @@ spec: name: podinfo # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo # the maximum time in seconds for the canary deployment @@ -400,7 +400,7 @@ spec: kind: Deployment name: podinfo autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo service: diff --git a/docs/gitbook/tutorials/nginx-progressive-delivery.md b/docs/gitbook/tutorials/nginx-progressive-delivery.md index 136f180c6..f1ef1098e 100644 --- a/docs/gitbook/tutorials/nginx-progressive-delivery.md +++ b/docs/gitbook/tutorials/nginx-progressive-delivery.md @@ -116,7 +116,7 @@ spec: name: podinfo # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo # the maximum time in seconds for the canary deployment diff --git a/docs/gitbook/tutorials/skipper-progressive-delivery.md b/docs/gitbook/tutorials/skipper-progressive-delivery.md index 2df8a2f48..ca57d3f3e 100644 --- a/docs/gitbook/tutorials/skipper-progressive-delivery.md +++ b/docs/gitbook/tutorials/skipper-progressive-delivery.md @@ -109,7 +109,7 @@ spec: name: podinfo # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo # the maximum time in seconds for the canary deployment diff --git a/docs/gitbook/tutorials/traefik-progressive-delivery.md b/docs/gitbook/tutorials/traefik-progressive-delivery.md index 77d956699..687cfc202 100644 --- a/docs/gitbook/tutorials/traefik-progressive-delivery.md +++ b/docs/gitbook/tutorials/traefik-progressive-delivery.md @@ -96,7 +96,7 @@ spec: name: podinfo # HPA reference (optional) autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo # the maximum time in seconds for the canary deployment diff --git a/docs/gitbook/tutorials/zero-downtime-deployments.md b/docs/gitbook/tutorials/zero-downtime-deployments.md index 6eaad2803..7dc0dcab5 100644 --- a/docs/gitbook/tutorials/zero-downtime-deployments.md +++ b/docs/gitbook/tutorials/zero-downtime-deployments.md @@ -139,7 +139,7 @@ Note that without resource requests the horizontal pod autoscaler can't determin A production environment should be able to handle traffic bursts without impacting the quality of service. This can be achieved with Kubernetes autoscaling capabilities. Autoscaling in Kubernetes has two dimensions: the Cluster Autoscaler that deals with node scaling operations and the Horizontal Pod Autoscaler that automatically scales the number of pods in a deployment. ```yaml -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler spec: scaleTargetRef: diff --git a/docs/gitbook/usage/how-it-works.md b/docs/gitbook/usage/how-it-works.md index 7e44d1ef5..a28136b90 100644 --- a/docs/gitbook/usage/how-it-works.md +++ b/docs/gitbook/usage/how-it-works.md @@ -65,7 +65,7 @@ spec: kind: Deployment name: podinfo autoscalerRef: - apiVersion: autoscaling/v2beta1 + apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler name: podinfo ``` diff --git a/kustomize/podinfo/hpa.yaml b/kustomize/podinfo/hpa.yaml index 9824ef1d2..8c86aae70 100644 --- a/kustomize/podinfo/hpa.yaml +++ b/kustomize/podinfo/hpa.yaml @@ -1,4 +1,4 @@ -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler metadata: name: podinfo @@ -10,9 +10,11 @@ spec: minReplicas: 2 maxReplicas: 4 metrics: - - type: Resource - resource: - name: cpu - # scale up if usage is above - # 99% of the requested CPU (100m) - targetAverageUtilization: 99 + - type: Resource + resource: + name: cpu + target: + type: Utilization + # scale up if usage is above + # 99% of the requested CPU (100m) + averageUtilization: 99 From 1b9e575ba51f2444669de52ae4526615006eb779 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Mon, 7 Dec 2020 11:39:08 +0200 Subject: [PATCH 2/2] Release v1.4.0 Signed-off-by: Stefan Prodan --- CHANGELOG.md | 11 +++++++++++ artifacts/flagger/deployment.yaml | 2 +- charts/flagger/Chart.yaml | 4 ++-- charts/flagger/README.md | 9 +++++++++ charts/flagger/values.yaml | 4 ++-- kustomize/base/flagger/kustomization.yaml | 2 +- pkg/version/version.go | 2 +- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8b4230d6..6f7518c6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ All notable changes to this project are documented in this file. +## 1.4.0 (2020-12-07) + +Add support for Traefik ingress controller + +#### Features + +- Add Traefik support for progressive traffic shifting with `TraefikService` + [#736](https://github.com/weaveworks/flagger/pull/736) +- Add support for HPA v2beta2 behaviors + [#740](https://github.com/weaveworks/flagger/pull/740) + ## 1.3.0 (2020-11-23) Add support for custom weights when configuring traffic shifting diff --git a/artifacts/flagger/deployment.yaml b/artifacts/flagger/deployment.yaml index 813ef8090..9590baf62 100644 --- a/artifacts/flagger/deployment.yaml +++ b/artifacts/flagger/deployment.yaml @@ -22,7 +22,7 @@ spec: serviceAccountName: flagger containers: - name: flagger - image: weaveworks/flagger:1.3.0 + image: weaveworks/flagger:1.4.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/charts/flagger/Chart.yaml b/charts/flagger/Chart.yaml index 14b5574da..f70bc83a3 100644 --- a/charts/flagger/Chart.yaml +++ b/charts/flagger/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: flagger -version: 1.3.0 -appVersion: 1.3.0 +version: 1.4.0 +appVersion: 1.4.0 kubeVersion: ">=1.11.0-0" engine: gotpl description: Flagger is a progressive delivery operator for Kubernetes diff --git a/charts/flagger/README.md b/charts/flagger/README.md index d7d516311..19dbba6a5 100644 --- a/charts/flagger/README.md +++ b/charts/flagger/README.md @@ -83,6 +83,15 @@ $ helm upgrade -i flagger flagger/flagger \ --set prometheus.install=true ``` +To install Flagger and Prometheus for **Traefik**: + +```console +$ helm upgrade -i flagger flagger/flagger \ + --namespace traefik \ + --set prometheus.install=true \ + --set meshProvider=traefik +``` + The [configuration](#configuration) section lists the parameters that can be configured during installation. ## Uninstalling the Chart diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml index 2006335cc..4aed3cca7 100644 --- a/charts/flagger/values.yaml +++ b/charts/flagger/values.yaml @@ -2,7 +2,7 @@ image: repository: weaveworks/flagger - tag: 1.3.0 + tag: 1.4.0 pullPolicy: IfNotPresent pullSecret: @@ -19,7 +19,7 @@ podPriorityClassName: "" metricsServer: "http://prometheus:9090" -# accepted values are kubernetes, istio, linkerd, appmesh, nginx, gloo or supergloo:mesh.namespace (defaults to istio) +# accepted values are kubernetes, istio, linkerd, appmesh, contour, nginx, gloo, skipper, traefik meshProvider: "" # single namespace restriction diff --git a/kustomize/base/flagger/kustomization.yaml b/kustomize/base/flagger/kustomization.yaml index 28efdd5e3..6ee9c35cb 100644 --- a/kustomize/base/flagger/kustomization.yaml +++ b/kustomize/base/flagger/kustomization.yaml @@ -8,4 +8,4 @@ resources: - deployment.yaml images: - name: weaveworks/flagger - newTag: 1.3.0 + newTag: 1.4.0 diff --git a/pkg/version/version.go b/pkg/version/version.go index 7a5f63ec0..3efdd982f 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,4 +1,4 @@ package version -var VERSION = "1.3.0" +var VERSION = "1.4.0" var REVISION = "unknown"