From 87f1a3c8d3a7d70b403f460ccc39dfbbd1853f72 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 31 Jul 2020 01:32:44 +0100
Subject: [PATCH] Disable webhooks for now, latest operator

---
 charts/kubezero-metrics/values.yaml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml
index a375b2f9..55278924 100644
--- a/charts/kubezero-metrics/values.yaml
+++ b/charts/kubezero-metrics/values.yaml
@@ -27,9 +27,11 @@ prometheus-operator:
     enabled: false
   defaultRules:
     create: false
-  # Default configuration of prometheus operator will create CRDs in the cluster idempotently
+
   prometheusOperator:
     enabled: true
+    image:
+      tag: v0.41.0
 
     # Run on controller nodes
     tolerations:
@@ -38,24 +40,17 @@ prometheus-operator:
     nodeSelector:
       node-role.kubernetes.io/master: ""
 
-    # We use Argo
+    # Argo takes care of CRDs
     manageCrds: false
     createCustomResource: true
 
     # Operator has TLS support starting 0.39, but chart does not support CAConfig and operator flags yet
     # see: https://github.com/coreos/prometheus-operator/blob/master/Documentation/user-guides/webhook.md#deploying-the-admission-webhook
-    # Until then we use the patch job and tls proxy, to be reviewed later on to use the kubezero local cluster CA from cert-manager
+    # Until then we disable them as the patching interferes with Argo anyways
     tlsProxy:
-      enabled: true
+      enabled: false
     admissionWebhooks:
-      enabled: true
-      patch:
-        enabled: true
-        tolerations:
-        - key: node-role.kubernetes.io/master
-          effect: NoSchedule
-        nodeSelector:
-          node-role.kubernetes.io/master: ""
+      enabled: false
 
     #namespaces:
     #  releaseNamespace: true