Merge pull request 'merging_edfbuilder_0_9_9' (#4 ) from merging_edfbuilder_0_9_9 into development

Reviewed-on: #4
Merge branch 'development' into merging_edfbuilder_0_9_9
2024-12-17 19:28:59 +00:00 · 2024-12-17 20:26:54 +01:00 · 2024-12-17 19:45:28 +01:00
2 changed files with 4 additions and 4 deletions
--- a/template/stacks/core/ingress-nginx/values.yaml
+++ b/template/stacks/core/ingress-nginx/values.yaml
@ -15,7 +15,7 @@ controller:
    proxy-buffer-size: 32k
    use-forwarded-headers: "true"

-  #monitoring nginx
+  # monitoring nginx
  metrics:
    enabled: true
    serviceMonitor:
--- a/template/stacks/monitoring/kube-prometheus/values.yaml
+++ b/template/stacks/monitoring/kube-prometheus/values.yaml
@ -13,9 +13,9 @@ grafana:
      type: loki
      url: http://loki-loki-distributed-gateway.monitoring:80

-  syncPolicy:
-    syncOptions:
-    - ServerSideApply=true
+  # syncPolicy:
+  #   syncOptions:
+  #   - ServerSideApply=true

  sidecar:
    dashboards:
Author	SHA1	Message	Date
richardrobertreitz	a366fc45e4	Merge pull request 'merging_edfbuilder_0_9_9' (#4 ) from merging_edfbuilder_0_9_9 into development Reviewed-on: #4	2024-12-17 19:28:59 +00:00
Richard Robert Reitz	c27f75eb69	Merge branch 'development' into merging_edfbuilder_0_9_9	2024-12-17 20:26:54 +01:00
Richard Robert Reitz	4128ea7466	merge step 1	2024-12-17 19:45:28 +01:00