Merge branch 'master' into qualify-pulumi-types

pulumi · Nov 17, 2022 · 2f0101c · 2f0101c
2 parents 59f71a5 + 201bb40
commit 2f0101c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Add allowNullValues boolean option to pass Null values through helm configs without having them
   scrubbed (https://github.com/pulumi/pulumi-kubernetes/issues/2089)
+- Add allowNullValues boolean option to pass Null values through helm configs without having them scrubbed (https://github.com/pulumi/pulumi-kubernetes/issues/2089)
+- For SSA conflicts, add a note to the error message about how to resolve (https://github.com/pulumi/pulumi-kubernetes/issues/2235)
 - Make room for the `resource` API in Kubernetes 1.26.0 by qualifying the type of the same name in
   .NET code templates (https://github.com/pulumi/pulumi-kubernetes/pull/2237)
 

diff --git a/provider/pkg/await/await.go b/provider/pkg/await/await.go
@@ -196,6 +196,10 @@ func Creation(c CreateConfig) (*unstructured.Unstructured, error) {
 				}
 				outputs, err = client.Patch(
 					c.Context, c.Inputs.GetName(), types.ApplyPatchType, objYAML, options)
+
+				if errors.IsConflict(err) {
+					err = fmt.Errorf(`use the "pulumi.com/patchForce" annotation if you want to overwrite the existing values: %w`, err)
+				}
 			} else {
 				var options metav1.CreateOptions
 				if c.Preview {