Fix import for Provider using server-side diff

pulumi · Jan 18, 2022 · df3baaa · df3baaa
1 parent 72378fb
commit df3baaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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