Merge pull request #209 from devtron-labs/argo-cert-chart

chore: adding new version of Argo cert chart

Author: prakarsh-dt

charts/argocd-certificate-refresh/Chart.yaml

@@ -1,8 +1,10 @@
 name: argocd-certificate-refresh
 description: Helm chart to deploy argocd certificate refresh CronJob.
-version: 0.10.7
+version: 0.10.8
 appVersion: 0.1.0
 apiVersion: v1
 maintainers:
 - email: [email protected]
   name: Ajay
+- email: [email protected]
+  name: Badal Kumar

charts/argocd-certificate-refresh/templates/argo-cert-expire-alert-job.yaml

@@ -7,8 +7,10 @@ apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: argocd-cert-alert
+  namespace: {{ $.Values.argocdNamespace| default .Release.Namespace }}
 spec:
   schedule: {{ $.Values.alert.schedule | quote }}
+  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
       template:
@@ -23,12 +25,17 @@ spec:
           - name: argocd-alert-container
             image:  {{ $.Values.alert.image }}
             imagePullPolicy: IfNotPresent
-            command: ["/bin/sh", "-c", "chmod +x alert.sh && ./alert.sh"]
             env:
-              - name: discord_url
-                value: {{$.Values.alert.discord_url | quote }}
-              - name: alert_before
-                value: {{$.Values.alert.alert_before | quote}}
+              - name: devtronNamespace
+                value: {{ $.Values.devtronNamespace| default .Release.Namespace }}
+              - name: argocdNamespace
+                value: {{ $.Values.argocdNamespace| default .Release.Namespace }}
+              - name: discordUrl
+                value: {{ $.Values.alert.discordUrl | quote }}
+              - name: alertBefore
+                value: {{ $.Values.alert.alertBefore | quote }}
+              - name: cronJobRunAfter
+                value: {{ $.Values.alert.cronJobRunAfter | quote }}
             {{- if $.Values.containerSecurityContext }}
             securityContext: 
 {{ toYaml $.Values.containerSecurityContext | indent 14 }}         

charts/argocd-certificate-refresh/templates/role.yaml renamed to charts/argocd-certificate-refresh/templates/clusterrole.yaml

@@ -1,15 +1,21 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
+kind: ClusterRole
 metadata:
   name: argocd-cert-role
 rules:
-- apiGroups: [""]
+- apiGroups: 
+    - ""
+    - batch
+    - apps
   resources:
   - pods
   - secrets
+  - cronjobs
+  - deployments
   verbs:
   - create
   - get
+  - watch
   - list
   - delete
   - update

charts/argocd-certificate-refresh/templates/rolebinding.yaml renamed to charts/argocd-certificate-refresh/templates/clusterrolebinding.yaml

@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
+kind: ClusterRoleBinding
 metadata:
   name: argocd-cert-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: Role
+  kind: ClusterRole
   name: argocd-cert-role
 subjects:
 - kind: ServiceAccount
   name: argocd-cert-sa
-  namespace: devtroncd
+  namespace: {{ $.Values.argocdNamespace| default .Release.Namespace }}

charts/argocd-certificate-refresh/templates/cronjob.yaml

@@ -6,8 +6,10 @@ apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: argocd-cert-cronjob
+  namespace: {{ $.Values.argocdNamespace| default .Release.Namespace }}
 spec:
   schedule: {{ $.Values.cronjob.schedule | quote }}
+  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
       template:
@@ -19,10 +21,17 @@ spec:
           serviceAccountName: argocd-cert-sa
           serviceAccount: argocd-cert-sa
           containers:
-          - name: argocd-cert-con
+          - name: argocd-cert-cron
             image: {{ $.Values.image }}
+            env:
+              - name: devtronNamespace
+                value: {{ $.Values.devtronNamespace| default .Release.Namespace }}
+              - name: argocdNamespace
+                value: {{ $.Values.argocdNamespace| default .Release.Namespace }}
+              - name: clusterType
+                value: {{ $.Values.clusterType | default "ENTERPRISE"  | quote }}
             imagePullPolicy: IfNotPresent
-            command: ["./argocd.sh"]  
+            command: ["/bin/bash", "-c", "chmod +x argocd.sh && bash argocd.sh"]
             {{- if $.Values.containerSecurityContext }}
             securityContext: 
 {{ toYaml $.Values.containerSecurityContext | indent 14 }}         

charts/argocd-certificate-refresh/templates/serviceaccount.yaml

@@ -2,3 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: argocd-cert-sa
+  namespace: {{ .Release.Namespace }}
+
+

charts/argocd-certificate-refresh/values.yaml

@@ -4,23 +4,35 @@
 
 
 # docker image information
-image: quay.io/devtron/argocd-cert-refresh:v7
+image: quay.io/devtron/argocd-cert-refresh:v10
+#accepted values are ENTERPRISE & OSS 
+# clusterType: ENTERPRISE
+# If not namespace is provided then by default it will take in which namespace it will deploy
+# devtronNamespace: devtroncd
+# argocdNamespace: devtroncd
+
+
 
 
 # values for cronjob
+#currently it will run At 23:59 on 1st day-of-month in every 6th month
 cronjob:
-  schedule: "59 23 * */6 *"
+  schedule: "59 23 1 */6 *"
 
 
 
 
 #set up this If you need alert for argocd cert expire
 alert:
   enabled: false
-  image: quay.io/devtron/k8s-utils:3f8c7b04-489-16490
-  discord_url: " " 
-  schedule: "59 23 * */6 *"
-  alert_before: 10
+  image: quay.io/devtron/argocd-cert-refresh:alert-v9
+  discordUrl: "" 
+  #Daily At 07:00AM GMT so it will be 12:30PM in IST
+  schedule: "0 7 * * *"
+  # if the certificate will expire after 10 days you will get alert
+  alertBefore: 10
+  # if the next cron will be run after 2 days you will get alert
+  cronJobRunAfter: 2