merge conflict fix for nginx helm values (#252)

* enable ingress virtual server for dashboard - enable CRD in dos-arbitrator - modify scheme for service-insight in helm values issue ref: #245 * disable nginx virtual server * fix patch for ingress controller helm * merge conflict fix for nginx helm values --------- Signed-off-by: Shain Singh <[email protected]>
apcj-f5 · Jul 15, 2023 · c19d132 · c19d132
1 parent 6af9d10
commit c19d132
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/argocd/manifests/nginx-ingress-controller/kustomization.yaml b/argocd/manifests/nginx-ingress-controller/kustomization.yaml
@@ -10,5 +10,5 @@ helmCharts:
 resources:
   - nginx-regcred.yaml
   - tls.yaml
-patchesStrategicMerge:
+patches:
   - path: configmap.yaml