feat: using patches instead of patchesStrategicMerge

changelog.d/20231123_202154_jhony.avella_kustomize_patches_migration.md

@@ -0,0 +1,3 @@
+- 💥[Improvement] Replacing "patchesStrategicMerge" key with "patches" key in the main Kustomization file. [patchesStrategicMerge](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patchesstrategicmerge/) is going to be deprecated in future releases of the Kustomization API. It is replaced by the [patches](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patches/) key which is more powerful and allows defining different patch types. This has the following consequences:
+    - The patch "kustomization-patches-strategic-merge" was renamed to "kustomization-patches"
+    - Extra Kustomization patches added via the "kustomization-patches" Tutor patch must respect the format specified [here](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patches/). It implies moving old "patchesStrategicMerge" extra patches to the "patches" format.

docs/reference/patches.rst

@@ -138,14 +138,14 @@ File: ``kustomization.yml``
 
 File: ``kustomization.yml``
 
-.. patch:: kustomization-patches-strategic-merge
+.. patch:: kustomization-patches
 
-``kustomization-patches-strategic-merge``
+``kustomization-patches``
 =========================================
 
 File: ``kustomization.yml``
 
-This can be used to add more Kustomization patches that make use of the `strategic merge mechanism <https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/#customizing>`__. 
+This can be used to add more Kustomization patches. See more details `here <https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patches/>`__.
 
 .. patch:: kustomization-resources
 

tutor/templates/kustomization.yml

@@ -65,12 +65,12 @@ configMapGenerator:
         app.kubernetes.io/name: redis
 {{ patch("kustomization-configmapgenerator") }}
 
-{%- if patch("k8s-override") or patch("kustomization-patches-strategic-merge") %}
-patchesStrategicMerge:
+{%- if patch("k8s-override") or patch("kustomization-patches") %}
+patches:
 {%- if patch("k8s-override") %}
-- k8s/override.yml
+- path: k8s/override.yml
 {%- endif %}
-{{ patch("kustomization-patches-strategic-merge") }}
+{{ patch("kustomization-patches") }}
 {%- endif %}
 
 {{ patch("kustomization") }}