Merge pull request #37 from mia-platform/feat/argocd_support

[ monitoring ] ArgoCD Support
mia-platform · Nov 15, 2024 · fe642ca · fe642ca
2 parents d88f0e8 + aa4e313
commit fe642ca
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 6 deletions.
diff --git a/charts/monitoring/Chart.yaml b/charts/monitoring/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: monitoring
-version: 2.2.5
+version: 2.3.0
 kubeVersion: ">= 1.20.0-0"
 appVersion: v0.74.0
 description: "A Kubernetes monitoring stack based on Prometheus Operator"

diff --git a/charts/monitoring/templates/hooks/create-certificates.yaml b/charts/monitoring/templates/hooks/create-certificates.yaml
@@ -1,14 +1,17 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name:  {{ include "mia-monitoring.hooks.fullname" . | quote }}
+  name:  create-certificates
   annotations:
+    argocd.argoproj.io/hook: PreSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation,HookSucceeded
     helm.sh/hook: "pre-install,pre-upgrade"
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
+    helm.sh/hook-weight: "-1"
   labels:
     {{- include "mia-monitoring.hooks.labels" . | nindent 4 }}
 spec:
-  ttlSecondsAfterFinished: 0
+  ttlSecondsAfterFinished: 60
   template:
     metadata:
       name:  {{ include "mia-monitoring.hooks.fullname" . | quote }}

diff --git a/charts/monitoring/templates/hooks/patch-webhooks.yaml b/charts/monitoring/templates/hooks/patch-webhooks.yaml
@@ -1,14 +1,17 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name:  {{ include "mia-monitoring.hooks.fullname" . | quote }}
+  name:  patch-webhooks
   annotations:
+    argocd.argoproj.io/hook: PostSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation,HookSucceeded
     helm.sh/hook: "post-install,post-upgrade"
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
+    helm.sh/hook-weight: "-1"
   labels:
     {{- include "mia-monitoring.hooks.labels" . | nindent 4 }}
 spec:
-  ttlSecondsAfterFinished: 0
+  ttlSecondsAfterFinished: 60
   template:
     metadata:
       name:  {{ include "mia-monitoring.hooks.fullname" . | quote }}

diff --git a/charts/monitoring/templates/hooks/rbac/clusterrole.yaml b/charts/monitoring/templates/hooks/rbac/clusterrole.yaml
@@ -5,8 +5,11 @@ metadata:
   labels:
     {{- include "mia-monitoring.hooks.labels" . | nindent 4 }}
   annotations:
+    argocd.argoproj.io/hook: PreSync,PostSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation,HookSucceeded
     helm.sh/hook: "pre-install,pre-upgrade,post-install,post-upgrade"
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
+    helm.sh/hook-weight: "-5"
 rules:
   - apiGroups:
       - ""

diff --git a/charts/monitoring/templates/hooks/rbac/clusterrolebinding.yaml b/charts/monitoring/templates/hooks/rbac/clusterrolebinding.yaml
@@ -5,8 +5,11 @@ metadata:
   labels:
     {{- include "mia-monitoring.hooks.labels" . | nindent 4 }}
   annotations:
+    argocd.argoproj.io/hook: PreSync,PostSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation,HookSucceeded
     helm.sh/hook: "pre-install,pre-upgrade,post-install,post-upgrade"
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
+    helm.sh/hook-weight: "-5"
 roleRef:
   apiGroup: "rbac.authorization.k8s.io"
   kind: "ClusterRole"

diff --git a/charts/monitoring/templates/hooks/rbac/psp.yaml b/charts/monitoring/templates/hooks/rbac/psp.yaml
@@ -6,8 +6,11 @@ metadata:
   labels:
     {{- include "mia-monitoring.hooks.labels" . | nindent 4 }}
   annotations:
+    argocd.argoproj.io/hook: PreSync,PostSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation,HookSucceeded
     helm.sh/hook: "pre-install,pre-upgrade,post-install,post-upgrade"
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
+    helm.sh/hook-weight: "-5"
     seccomp.security.alpha.kubernetes.io/allowedProfileNames: "runtime/default"
     seccomp.security.alpha.kubernetes.io/defaultProfileName:  "runtime/default"
 spec:

diff --git a/charts/monitoring/templates/hooks/rbac/serviceaccount.yaml b/charts/monitoring/templates/hooks/rbac/serviceaccount.yaml
@@ -5,5 +5,8 @@ metadata:
   labels:
     {{- include "mia-monitoring.hooks.labels" . | nindent 4 }}
   annotations:
+    argocd.argoproj.io/hook: PreSync,PostSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation,HookSucceeded
     helm.sh/hook: "pre-install,pre-upgrade,post-install,post-upgrade"
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
+    helm.sh/hook-weight: "-5"
diff --git a/charts/monitoring/values.yaml b/charts/monitoring/values.yaml
@@ -180,7 +180,7 @@ kubeStateMetrics:
   replicas: 1
   image:
     # Override the default Docker image name if you use a custom image or a repository mirror
-    name: "k8s.gcr.io/kube-state-metrics/kube-state-metrics"
+    name: "registry.k8s.io/kube-state-metrics/kube-state-metrics"
     # Use this optional value to override the tag of the image to relase instead of relying on the Chart one
     version: "v2.12.0"