feat: replacing Kustomize JSON patches with strategic merge patches.

These patches prevent resource fields replacement
eduNEXT · Nov 1, 2023 · 65a4b70 · 65a4b70
1 parent 1f80b22
commit 65a4b70
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 27 deletions.
diff --git a/drydock/patches/kustomization b/drydock/patches/kustomization
@@ -13,44 +13,21 @@ patches:
 - target:
     kind: Job
     labelSelector: app.kubernetes.io/component=job
-  patch: |-
-    - op: add
-      path: /metadata/annotations
-      value:
-        argocd.argoproj.io/hook: Skip
-        argocd.argoproj.io/hook-delete-policy: HookFailed
-    - op: add
-      path: /spec
-      value:
-        ttlSecondsAfterFinished: 100
+  path: plugins/drydock/k8s/patches/tutor-jobs.yml
 # Patch the sync waves
 - target:
     kind: Deployment
     name:  "lms-worker|cms-worker|forum"
-  patch: |-
-    - op: add
-      path: /metadata/annotations
-      value:
-        argocd.argoproj.io/sync-wave: "4"
+  path: plugins/drydock/k8s/patches/sync-wave-4.yml
 {%- if DRYDOCK_DEBUG is defined and DRYDOCK_DEBUG %}
 - target:
     kind: Deployment|Ingress|Service
     name:  "cms-debug|lms-debug|ingress-debug"
-  patch: |-
-    - op: add
-      path: /metadata/annotations
-      value:
-        argocd.argoproj.io/sync-wave: "5"
+  path: plugins/drydock/k8s/patches/sync-wave-5.yml
 {%- endif %}
-{%- if POD_AUTOSCALING_LMS_HPA is defined and POD_AUTOSCALING_LMS_HPA %}
 - target:
     kind: HorizontalPodAutoscaler
-  patch: |-
-    - op: add
-      path: /metadata/annotations
-      value:
-        argocd.argoproj.io/sync-wave: "5"
-{%- endif %}
+  path: plugins/drydock/k8s/patches/sync-wave-5.yml
 {% if DRYDOCK_ENABLE_CELERY_TUNING %}
 - path: plugins/drydock/k8s/celery/cms-worker.yml
 - path: plugins/drydock/k8s/celery/lms-worker.yml

diff --git a/drydock/templates/drydock/k8s/patches/sync-wave-4.yml b/drydock/templates/drydock/k8s/patches/sync-wave-4.yml
@@ -0,0 +1,6 @@
+apiVersion: not-used
+kind: not-used
+metadata:
+  name: not-used
+  annotations:
+    argocd.argoproj.io/sync-wave: "4"
diff --git a/drydock/templates/drydock/k8s/patches/sync-wave-5.yml b/drydock/templates/drydock/k8s/patches/sync-wave-5.yml
@@ -0,0 +1,6 @@
+apiVersion: not-used
+kind: not-used
+metadata:
+  name: not-used
+  annotations:
+    argocd.argoproj.io/sync-wave: "5"
diff --git a/drydock/templates/drydock/k8s/patches/tutor-jobs.yml b/drydock/templates/drydock/k8s/patches/tutor-jobs.yml
@@ -0,0 +1,9 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: not-used
+  annotations:
+    argocd.argoproj.io/hook: Skip
+    argocd.argoproj.io/hook-delete-policy: HookFailed
+spec:
+  ttlSecondsAfterFinished: 100