misc: added support for cronjob annotations and probes

scripts/devtron-reference-helm-charts/cronjob-chart_1-6-0/app-values.yaml

@@ -15,9 +15,34 @@ cronjobConfigs:
   suspend: false
   successfulJobsHistoryLimit: 3
   failedJobsHistoryLimit: 1
-  restartPolicy: OnFailure
   timeZone: "UTC"
-
+cronJobAnnotations: {}
+cronJobLabels: {}
+LivenessProbe:
+  Path: ""
+  command: []
+  failureThreshold: 3
+  httpHeaders: []
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  port: 8080
+  scheme: ""
+  successThreshold: 1
+  tcp: false
+  timeoutSeconds: 5
+ReadinessProbe:
+  Path: ""
+  command: []
+  failureThreshold: 3
+  httpHeaders: []
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  port: 8080
+  scheme: ""
+  successThreshold: 1
+  tcp: false
+  timeoutSeconds: 5
+restartPolicy: OnFailure
 kedaAutoscaling:
   envSourceContainerName: "" 
   minReplicaCount: 1 

scripts/devtron-reference-helm-charts/cronjob-chart_1-6-0/templates/_pod_template_spec.yaml

@@ -150,6 +150,79 @@ containers:
 {{- if $.Values.containerExtraSpecs }}	
 {{ toYaml .Values.containerExtraSpecs | indent 4 }}	
 {{- end }}
+    {{- if $.Values.LivenessProbe }}
+    {{- if or $.Values.LivenessProbe.Path $.Values.LivenessProbe.command $.Values.LivenessProbe.tcp $.Values.LivenessProbe.grpc }}
+    livenessProbe:
+    {{- if $.Values.LivenessProbe.Path }}
+      httpGet:
+        path: {{ $.Values.LivenessProbe.Path  }}
+        port: {{ $.Values.LivenessProbe.port }}
+        scheme: {{ $.Values.LivenessProbe.scheme }}
+      {{- if $.Values.LivenessProbe.httpHeaders }}
+        httpHeaders:
+        {{- range $.Values.LivenessProbe.httpHeaders}}
+          - name: {{.name}}
+            value: {{.value}}
+        {{- end}}
+    {{- end }}
+    {{- end }}
+    {{- if $.Values.LivenessProbe.command }}
+      exec:
+        command:
+    {{ toYaml .Values.LivenessProbe.command | indent 16 }}
+    {{- end}}
+    {{- if and $.Values.LivenessProbe.tcp }}
+      tcpSocket:
+        port: {{ $.Values.LivenessProbe.port }}
+    {{- end}}
+      initialDelaySeconds: {{ $.Values.LivenessProbe.initialDelaySeconds  }}
+      periodSeconds: {{ $.Values.LivenessProbe.periodSeconds  }}
+      successThreshold: {{ $.Values.LivenessProbe.successThreshold  }}
+      timeoutSeconds: {{ $.Values.LivenessProbe.timeoutSeconds  }}
+      failureThreshold: {{ $.Values.LivenessProbe.failureThreshold  }}
+    {{- if $.Values.LivenessProbe.grpc }}
+      grpc:
+    {{ toYaml .Values.LivenessProbe.grpc | indent 14 }}
+    {{- end }}
+    {{- end }}
+    {{- end }}
+    {{- if $.Values.ReadinessProbe }}
+    {{- if or $.Values.ReadinessProbe.Path  $.Values.ReadinessProbe.command $.Values.ReadinessProbe.tcp $.Values.ReadinessProbe.grpc }}
+    readinessProbe:
+    {{- if $.Values.ReadinessProbe.Path }}
+      httpGet:
+        path: {{ $.Values.ReadinessProbe.Path  }}
+        port: {{ $.Values.ReadinessProbe.port }}
+        scheme: {{ $.Values.ReadinessProbe.scheme }}
+      {{- if $.Values.ReadinessProbe.httpHeaders }}
+        httpHeaders:
+        {{- range $.Values.ReadinessProbe.httpHeaders}}
+          - name: {{.name}}
+            value: {{.value}}
+        {{- end}}
+    {{- end }}
+    {{- end }}
+    {{- if $.Values.ReadinessProbe.command }}
+      exec:
+        command:
+    {{ toYaml .Values.ReadinessProbe.command | indent 16 }}
+    {{- end}}
+    {{- if and $.Values.ReadinessProbe.tcp }}
+      tcpSocket:
+        port: {{ $.Values.ReadinessProbe.port }}
+    {{- end}}
+      initialDelaySeconds: {{ $.Values.ReadinessProbe.initialDelaySeconds  }}
+      periodSeconds: {{ $.Values.ReadinessProbe.periodSeconds  }}
+      successThreshold: {{ $.Values.ReadinessProbe.successThreshold  }}
+      timeoutSeconds: {{ $.Values.ReadinessProbe.timeoutSeconds  }}
+      failureThreshold: {{ $.Values.ReadinessProbe.failureThreshold  }}
+    {{- if $.Values.ReadinessProbe.grpc }}
+      grpc:
+    {{ toYaml .Values.ReadinessProbe.grpc | indent 14 }}
+      {{- end}}
+    {{- end }}
+    {{- end }}
+
 {{- if $.Values.privileged }}
     securityContext:
       privileged: true

scripts/devtron-reference-helm-charts/cronjob-chart_1-6-0/templates/cronjob.yaml

@@ -12,6 +12,13 @@ metadata:
     chart: {{ template ".Chart.Name .chart" $ }}
     release: {{ $.Release.Name }}
     releaseVersion: {{ $.Values.releaseVersion | quote }}
+{{- if .Values.cronJobLabels }}
+{{ toYaml .Values.cronJobLabels | indent 4 }}
+{{- end }}
+{{- if .Values.cronJobAnnotations }}
+  annotations:
+{{ toYaml .Values.cronJobAnnotations | indent 4 }}
+{{- end }}
 spec:
   {{- if $.Values.cronjobConfigs }}
   {{- if $.Values.cronjobConfigs.timeZone }}
@@ -26,10 +33,8 @@ spec:
   {{- if $.Values.cronjobConfigs.concurrencyPolicy }}
   concurrencyPolicy: {{ $.Values.cronjobConfigs.concurrencyPolicy }}
   {{- end }}
-  {{- if semverCompare ">1.20" .Capabilities.KubeVersion.GitVersion }}
-  {{- if $.Values.cronjobConfigs.suspend }}
-  suspend: {{ $.Values.cronjobConfigs.suspend }}
-  {{- end }}
+  {{- if semverCompare ">1.20.0-0" .Capabilities.KubeVersion.Version }}
+  suspend: {{ $.Values.cronjobConfigs.suspend | default false }}
   {{- end }}
   {{- if $.Values.cronjobConfigs.successfulJobsHistoryLimit }}
   successfulJobsHistoryLimit: {{ $.Values.cronjobConfigs.successfulJobsHistoryLimit }}

scripts/devtron-reference-helm-charts/cronjob-chart_1-6-0/templates/externalsecrets.yaml

@@ -4,7 +4,11 @@
   {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}}
 {{- if .esoSecretData.secretStore }}
 ---
+{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }}
+apiVersion: external-secrets.io/v1
+{{- else }}
 apiVersion: external-secrets.io/v1beta1
+{{- end }}
 kind: SecretStore
 metadata:
   name: {{ .name}}
@@ -22,7 +26,11 @@ spec:
     {{- toYaml .esoSecretData.secretStore | nindent 4 }}
 {{- end }}
 ---
-apiVersion: external-secrets.io/v1beta1 
+{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }}
+apiVersion: external-secrets.io/v1
+{{- else }}
+apiVersion: external-secrets.io/v1beta1
+{{- end }}
 kind: ExternalSecret
 metadata:
   name: {{ .name }}

scripts/devtron-reference-helm-charts/cronjob-chart_1-6-0/templates/job.yaml

@@ -9,6 +9,14 @@ metadata:
     release: {{ $.Release.Name }}
     releaseVersion: {{ $.Values.releaseVersion | quote }}
     pipelineName: {{ .Values.pipelineName }}
+{{- if .Values.jobLabels }}
+{{ toYaml .Values.jobLabels | indent 4 }}
+{{- end }}
+{{- if .Values.jobAnnotations }}
+  annotations:
+{{ toYaml .Values.jobAnnotations | indent 4 }}
+{{- end }}
+
 spec:
   {{- include "job-template-spec" . | indent 2 }}
 {{ end }}

scripts/devtron-reference-helm-charts/cronjob-chart_1-6-0/test_values.yaml

@@ -18,8 +18,40 @@ cronjobConfigs:
   suspend: false
   successfulJobsHistoryLimit: 3
   failedJobsHistoryLimit: 1
-  restartPolicy: OnFailure
   timeZone: "UTC"
+cronJobAnnotations:
+  example.com/dummy: "true"                 
+cronJobLabels:
+  example.com/dummy: "true"     
+jobAnnotations:
+  example.com/dummy: "true"                 
+jobLabels:
+  example.com/dummy: "true"               
+LivenessProbe:
+  Path: "/"
+  command: []
+  failureThreshold: 3
+  httpHeaders: []
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  port: 8080
+  scheme: ""
+  successThreshold: 1
+  tcp: false
+  timeoutSeconds: 5
+ReadinessProbe:
+  Path: "/"
+  command: []
+  failureThreshold: 3
+  httpHeaders: []
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  port: 8080
+  scheme: ""
+  successThreshold: 1
+  tcp: false
+  timeoutSeconds: 5
+restartPolicy: Always
 
 imagePullSecrets:
   - test1
@@ -222,25 +254,34 @@ ConfigMaps:
 ConfigSecrets:
   enabled: true
   secrets:
-  - name: config-secret-1
-    type: environment
-    external: true
-    externalType: ESO_AWSSecretsManager
-    esoSecretData:
-      secretStoreRef:
-        kind: ClusteSecret
-        name: test-secret
-        aws:
-          service: SecretsManager
-          region: us-east-1
-          auth:
-            secretRef:
-              accessKeyIDSecretRef:
-                name: awssm-secret
-                key: access-key
-              secretAccessKeySecretRef:
-                name: awssm-secret
-                key: secret-access-key
+    - name: config-secret-1
+      type: environment
+      external: true
+      externalType: ESO_AWSSecretsManager
+      esoSecretData:
+        refreshInterval: "30m"
+
+        # Option 1: Define an inline SecretStore
+        secretStore:
+          aws:
+            service: SecretsManager
+            region: us-east-1
+            auth:
+              secretRef:
+                accessKeyIDSecretRef:
+                  name: awssm-secret
+                  key: access-key
+                secretAccessKeySecretRef:
+                  name: awssm-secret
+                  key: secret-access-key
+
+        # Option 2: Reference an existing SecretStore / ClusterSecretStore
+        # (comment out if not needed)
+        secretStoreRef:
+          kind: ClusterSecretStore   # or SecretStore
+          name: test-secret
+
+        # Map individual keys from AWS Secrets Manager into K8s Secret
       esoData:
         - secretKey: prod-mysql-password
           key: secrets/prod-mysql-secrets
@@ -254,10 +295,10 @@ ConfigSecrets:
         - secretKey: prod-mysql-password
           key: secrets/prod-mysql-secrets
           property: prodPassword
-    data:
-      key1: key1value-1
-      key2: key2value-1
-      key3: key3value-1
+      data:
+        key1: key1value-1
+        key2: key2value-1
+        key3: key3value-1
   # - name: config-secret-1
   #   type: environment
   #   external: false

scripts/devtron-reference-helm-charts/cronjob-chart_1-6-0/values.yaml

@@ -30,6 +30,30 @@ ContainerPort:
   #   port: 8090
   #   servicePort: 8080
   #   useGRPC: true
+LivenessProbe:
+  Path: ""
+  command: []
+  failureThreshold: 3
+  httpHeaders: []
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  port: 8080
+  scheme: ""
+  successThreshold: 1
+  tcp: false
+  timeoutSeconds: 5
+ReadinessProbe:
+  Path: ""
+  command: []
+  failureThreshold: 3
+  httpHeaders: []
+  initialDelaySeconds: 20
+  periodSeconds: 10
+  port: 8080
+  scheme: ""
+  successThreshold: 1
+  tcp: false
+  timeoutSeconds: 5
 
 pauseForSecondsBeforeSwitchActive: 30
 waitForSecondsBeforeScalingDown: 30
@@ -322,4 +346,4 @@ imagePullSecrets: []
   # - test1
   # - test2
 
-persistentVolumeClaim: {}
+persistentVolumeClaim: {}