Merge pull request #12 from appuio/fix/resource-locker-patch-strategy

Use the merge-patch strategy for the `ingress.config.openshift.io` patch
appuio · Oct 15, 2021 · c29cb8e · c29cb8e
2 parents 4518bdb + 8976f93
commit c29cb8e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/component/main.jsonnet b/component/main.jsonnet
@@ -114,7 +114,11 @@ local consoleRoutePatch =
         }
       else
         obj
-      for obj in rl.Patch(target, patch)
+      for obj in rl.Patch(
+        target,
+        patch,
+        patchstrategy='application/merge-patch+json'
+      )
     ]
   else
     null;

diff --git a/...en/custom-route-legacy/openshift4-console/openshift4-console/20_ingress_config_patch.yaml b/...en/custom-route-legacy/openshift4-console/openshift4-console/20_ingress_config_patch.yaml
@@ -53,7 +53,7 @@ spec:
     - id: patch1
       patchTemplate: "\"spec\":\n  \"componentRoutes\":\n  - \"hostname\": \"console.cluster.example.org\"\
         \n    \"name\": \"console\"\n    \"namespace\": \"openshift-console\""
-      patchType: application/strategic-merge-patch+json
+      patchType: application/merge-patch+json
       targetObjectRef:
         apiVersion: config.openshift.io/v1
         kind: Ingress

diff --git a/...stom-route-managed-tls/openshift4-console/openshift4-console/20_ingress_config_patch.yaml b/...stom-route-managed-tls/openshift4-console/openshift4-console/20_ingress_config_patch.yaml
@@ -54,7 +54,7 @@ spec:
       patchTemplate: "\"spec\":\n  \"componentRoutes\":\n  - \"hostname\": \"console.cluster.example.org\"\
         \n    \"name\": \"console\"\n    \"namespace\": \"openshift-console\"\n  \
         \  \"servingCertKeyPairSecret\":\n      \"name\": \"console-cluster-example-org-tls\""
-      patchType: application/strategic-merge-patch+json
+      patchType: application/merge-patch+json
       targetObjectRef:
         apiVersion: config.openshift.io/v1
         kind: Ingress

diff --git a/tests/golden/custom-route/openshift4-console/openshift4-console/20_ingress_config_patch.yaml b/tests/golden/custom-route/openshift4-console/openshift4-console/20_ingress_config_patch.yaml
@@ -54,7 +54,7 @@ spec:
       patchTemplate: "\"spec\":\n  \"componentRoutes\":\n  - \"hostname\": \"console.cluster.example.org\"\
         \n    \"name\": \"console\"\n    \"namespace\": \"openshift-console\"\n  \
         \  \"servingCertKeyPairSecret\":\n      \"name\": \"console-cluster-example-org-tls\""
-      patchType: application/strategic-merge-patch+json
+      patchType: application/merge-patch+json
       targetObjectRef:
         apiVersion: config.openshift.io/v1
         kind: Ingress
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,7 +114,11 @@ local consoleRoutePatch = @@
             }
           else
             obj
-          for obj in rl.Patch(target, patch)
+          for obj in rl.Patch(
+            target,
+            patch,
+            patchstrategy='application/merge-patch+json'
+          )
         ]
       else
         null;
@@ Expand Down @@