Skip to content

Commit

Permalink
Fall back to client-side diff if server-side diff fails (#685)
Browse files Browse the repository at this point in the history
  • Loading branch information
lblackstone committed Aug 2, 2019
1 parent dcac855 commit e16f63d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
## 0.25.5 (Unreleased)

### Supported Kubernetes versions

- v1.15.x
- v1.14.x
- v1.13.x

### Bug fixes

- Fall back to client-side diff if server-side diff fails. (https://github.com/pulumi/pulumi-kubernetes/pull/685).

## 0.25.4 (August 1, 2019)

### Supported Kubernetes versions
Expand Down Expand Up @@ -27,6 +37,7 @@ that this change is not disruptive.

- Properly reference override values in Python Helm SDK (https://github.com/pulumi/pulumi-kubernetes/pull/676).
- Handle Output values in diffs. (https://github.com/pulumi/pulumi-kubernetes/pull/682).
- Fall back to client-side diff if server-side diff fails. (https://github.com/pulumi/pulumi-kubernetes/pull/685).

## 0.25.3 (July 29, 2019)

Expand Down
3 changes: 2 additions & 1 deletion pkg/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,8 @@ func (k *kubeProvider) Diff(
se, isStatusError := err.(*errors.StatusError)
if isStatusError && se.Status().Code == 400 &&
(se.Status().Message == "the dryRun alpha feature is disabled" ||
se.Status().Message == "the dryRun beta feature is disabled") {
se.Status().Message == "the dryRun beta feature is disabled" ||
strings.Contains(se.Status().Message, "does not support dry run")) {

isInputPatch = true
patch, err = k.inputPatch(oldInputs, newInputs)
Expand Down

0 comments on commit e16f63d

Please sign in to comment.