From df3baaaeecfec4a1acb8a20efe5659d107b296f5 Mon Sep 17 00:00:00 2001 From: Levi Blackstone Date: Tue, 18 Jan 2022 10:53:23 -0700 Subject: [PATCH] Fix import for Provider using server-side diff --- CHANGELOG.md | 1 + provider/pkg/provider/provider.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77dbf1b445..1be780a765 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - Disable last-applied-configuration annotation for replaced CRDs (https://github.com/pulumi/pulumi-kubernetes/pull/1868) - Fix Provider config diffs (https://github.com/pulumi/pulumi-kubernetes/pull/1869) - Fix replace for named resource using server-side diff (https://github.com/pulumi/pulumi-kubernetes/pull/1870) +- Fix import for Provider using server-side diff (https://github.com/pulumi/pulumi-kubernetes/pull/1872) ## 3.14.0 (January 12, 2022) diff --git a/provider/pkg/provider/provider.go b/provider/pkg/provider/provider.go index 8d261c25a5..10048bc4e1 100644 --- a/provider/pkg/provider/provider.go +++ b/provider/pkg/provider/provider.go @@ -2552,6 +2552,9 @@ func (k *kubeProvider) tryServerSidePatch(oldInputs, newInputs *unstructured.Uns return nil, nil, false } } + if err != nil { + return nil, nil, false + } // The server-side patch succeeded. return ssPatch, ssPatchBase, true