From 7be12de4e8485e890879c88060f798aea89a7858 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sat, 15 Aug 2020 15:59:57 +0100
Subject: [PATCH] Add cert-manager state handling for argo

---
 charts/kubezero-argo-cd/Chart.yaml     |  2 +-
 charts/kubezero-argo-cd/values.yaml    | 25 +++++++++++++++++++++++++
 charts/kubezero-logging/Chart.yaml     |  2 +-
 charts/kubezero/templates/logging.yaml | 16 ++++++++++++++++
 deploy/templates/values.yaml           | 11 ++++++++++-
 5 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/charts/kubezero-argo-cd/Chart.yaml b/charts/kubezero-argo-cd/Chart.yaml
index fe1bc6dc..324f89d5 100644
--- a/charts/kubezero-argo-cd/Chart.yaml
+++ b/charts/kubezero-argo-cd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 name: kubezero-argo-cd
-version: 0.3.10
+version: 0.3.11
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero-argo-cd/values.yaml b/charts/kubezero-argo-cd/values.yaml
index c02fed24..5adc1a19 100644
--- a/charts/kubezero-argo-cd/values.yaml
+++ b/charts/kubezero-argo-cd/values.yaml
@@ -44,6 +44,31 @@ argo-cd:
       # argo-cd.server.config.url -- ArgoCD hostname to be exposed via Istio
       url: argocd.example.com
 
+  resource.customizations: |
+    cert-manager.io/Certificate:
+      # Lua script for customizing the health status assessment
+      health.lua: |
+        hs = {}
+        if obj.status ~= nil then
+          if obj.status.conditions ~= nil then
+            for i, condition in ipairs(obj.status.conditions) do
+              if condition.type == "Ready" and condition.status == "False" then
+                hs.status = "Degraded"
+                hs.message = condition.message
+                return hs
+              end
+              if condition.type == "Ready" and condition.status == "True" then
+                hs.status = "Healthy"
+                hs.message = condition.message
+                return hs
+              end
+            end
+          end
+        end
+        hs.status = "Progressing"
+        hs.message = "Waiting for certificate"
+        return hs
+
     # Rename former https port to grpc, works with istio + insecure
     service:
       servicePortHttpsName: grpc
diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml
index 87fc2f01..099b6234 100644
--- a/charts/kubezero-logging/Chart.yaml
+++ b/charts/kubezero-logging/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-logging
 description: KubeZero Umbrella Chart for complete EFK stack
 type: application
-version: 0.0.2
+version: 0.1.0
 appVersion: 1.2.1
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
diff --git a/charts/kubezero/templates/logging.yaml b/charts/kubezero/templates/logging.yaml
index d696c420..90cf116f 100644
--- a/charts/kubezero/templates/logging.yaml
+++ b/charts/kubezero/templates/logging.yaml
@@ -3,6 +3,22 @@
   syncPolicy:
     automated:
       prune: true
+
+  ignoreDifferences:
+  - group: admissionregistration.k8s.io
+    kind: ValidatingWebhookConfiguration
+    jsonPointers:
+    - /webhooks/0/clientConfig/caBundle
+    - /webhooks/1/clientConfig/caBundle
+    - /webhooks/2/clientConfig/caBundle
+    - /webhooks/3/clientConfig/caBundle
+    - /webhooks/4/clientConfig/caBundle
+    - /webhooks/5/clientConfig/caBundle
+    - /webhooks/6/clientConfig/caBundle
+  - group: apiextensions.k8s.io
+    kind: CustomResourceDefinition
+    jsonPointers:
+    - /status
 ---
 apiVersion: v1
 kind: Namespace
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index fdc4d0b4..9bb2f9f1 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -133,11 +133,12 @@ kubezero:
 
       {{- if .Values.logging.version }}
       version: {{ .Values.logging.version }}
+      {{- end }}
 
       {{- if .Values.logging.fullnameOverride }}
-      {{- end }}
       fullnameOverride: {{ .Values.logging.fullnameOverride }}
       {{- end }}
+
       es:
         {{- if .Values.logging.es.nodeSets }}
         nodeSets:
@@ -146,6 +147,14 @@ kubezero:
         {{- end }}
         {{- end }}
         prometheus: {{ .Values.metrics.enabled }}
+
+        {{- if .Values.logging.es.s3Snapshot }}
+        s3Snapshot:
+          {{- with .Values.logging.es.s3Snapshot }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+        {{- end }}
+
       {{- if .Values.logging.kibana }}
       kibana:
         {{- with .Values.logging.kibana }}