Skip to content

Commit

Permalink
Default blue/green mode as deploy; docs
Browse files Browse the repository at this point in the history
  • Loading branch information
jcmoraisjr committed Aug 26, 2018
1 parent d2ad4c2 commit e04281a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Current snapshot tag (v0.7)

Breaking backward compatibility from `v0.6`

* Default blue/green deployment mode changed from `pod` to `deploy`. Use `ingress.kubernetes.io/blue-green-mode` annotation to change to the v0.6 behavior. See also the blue/green deployment [doc](/README.md#blue-green).

Fixes and improvements since `v0.6`

* Add SSL config on TCP services [#192](https://github.com/jcmoraisjr/haproxy-ingress/pull/192) - [doc](/README.md#tcp-services-configmap)
Expand Down Expand Up @@ -36,6 +40,10 @@ Fixes and improvements since `v0.6`
* Configmap options:
* `http-port`
* `https-port`
* Add blue/green balance mode [#201](https://github.com/jcmoraisjr/haproxy-ingress/pull/201) - [doc](/README.md#blue-green)
* Annotations:
* `ingress.kubernetes.io/blue-green-balance`
* `ingress.kubernetes.io/blue-green-mode`

## v0.6-beta.2

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ selector and another that matches the blue/green selector.

* `ingress.kubernetes.io/blue-green-balance`: comma separated list of labels and weights
* `ingress.kubernetes.io/blue-green-deploy`: deprecated on v0.7, this is an alias to `ingress.kubernetes.io/blue-green-balance`.
* `ingress.kubernetes.io/blue-green-mode`: how to apply the weights, might be `pod` or `deploy`
* `ingress.kubernetes.io/blue-green-mode`: defaults to `deploy` on v0.7, defines how to apply the weights, might be `pod` or `deploy`

The following configuration `group=blue=1,group=green=4` will redirect 20% of the load to the
`group=blue` group and 80% of the load to `group=green` group.
Expand Down
2 changes: 1 addition & 1 deletion examples/blue-green/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Running 100 requests...

---

Changing to deploy mode. This mode targets the balance config to the whole deployment
Changing to *deploy* mode. This mode targets the balance config to the whole deployment
instead of single pods.

**Note:** BG mode was added on v0.7. On v0.6, the only supported mode is `pod`.
Expand Down
2 changes: 1 addition & 1 deletion pkg/common/ingress/annotations/bluegreen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (bg bgdeploy) Parse(ing *extensions.Ingress) (interface{}, error) {
if mode != "" {
glog.Warningf("unsupported blue/green mode '%v' on '%v/%v', falling back to 'pod'", mode, ing.Namespace, ing.Name)
}
mode = "pod"
mode = "deploy"
}
return &Config{
DeployWeight: dw,
Expand Down

0 comments on commit e04281a

Please sign in to comment.