more

Signed-off-by: George Jenkins <[email protected]>
helm · Oct 10, 2023 · 475c7a8 · 475c7a8
1 parent 3f802da
commit 475c7a8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/hips/hip-00XX.md b/hips/hip-00XX.md
@@ -51,7 +51,7 @@ In a future version of Helm 3 cli, it might be desirable to omit a warning if a
 
 #### Custom resources
 
-Helm will utilize SSA for custom resources, which it previously simply replaced (TODO: reference). As SSA allows custom resources to be correctly merged based on metadata within the CRD. Or the API server will use the default approach <https://kubernetes.io/docs/reference/using-api/server-side-apply/#custom-resources>.
+Helm will utilize SSA for custom resources, which it previously [didn't merge](https://github.com/helm/helm/blob/1b260d0a796882a1e90f0fa3c832659dbe2e675c/pkg/kube/converter.go#L54-L69). As SSA allows custom resources to be correctly merged based on metadata within the CRD. Or the API server will use the default approach <https://kubernetes.io/docs/reference/using-api/server-side-apply/#custom-resources>.
 
 #### Conflicts and forcing
 
@@ -102,7 +102,6 @@ There are thought to be four main compatibility concerns for Helm switching to S
    - Default values
 2. Issues with a user enabling/disabling SSA over the lifetime of a release e.g. environment differences or older Helm clients which don't understand SSA
 3. SSA will apply to custom resources
-4. Requirement of PATCH RBAC verb (TODO: check if this is new)
 
 For 1., this HIP limits Helm to opt-in to server side apply, allowing users to verify SSA's behavior matches their expectations. For 2., the user can mitigate by ensuring SSA is consistently used within their environment. But the expectation is that SSA should generally produce equivalent Kubernetes objects as CSA.
 
@@ -154,4 +153,5 @@ ultimately pursued. -->
 - <https://kubernetes.io/docs/reference/using-api/server-side-apply/>
 - <https://github.com/kubernetes/enhancements/tree/master/keps/sig-cli/3805-ssa-default#summary>
 - <https://github.com/kubernetes/community/blob/master/contributors/devel/sig-api-machinery/strategic-merge-patch.md>
-- <https://github.com/kubernetes-sigs/structured-merge-diff>
+- <https://github.com/kubernetes-sigs/structured-merge-diff>
+- <https://pkg.go.dev/k8s.io/apimachinery/pkg/util/strategicpatch#CreateThreeWayMergePatch>