fix: allow for templating of command

knechtionscoding · Apr 5, 2023 · 33472b6 · 33472b6
1 parent 1598997
commit 33472b6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/charts/ecr-cleanup/Chart.yaml b/charts/ecr-cleanup/Chart.yaml
@@ -20,10 +20,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.6
+version: 0.2.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.2.6"
+appVersion: "0.2.7"
diff --git a/charts/ecr-cleanup/README.md b/charts/ecr-cleanup/README.md
@@ -6,13 +6,14 @@ Deploys a job that cleans up an ECR repo based on the following rules.
 3. Has the container been tagged with the word `keep`
 4. Is the container the only tag in the ECR repository
 
-![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.6](https://img.shields.io/badge/AppVersion-0.2.6-informational?style=flat-square)
+![Version: 0.2.7](https://img.shields.io/badge/Version-0.2.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.7](https://img.shields.io/badge/AppVersion-0.2.7-informational?style=flat-square)
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | awsRegistryId | string | `""` | ECR Registry ID to override picking the default |
+| command | list | `["/code/main.py"]` | Command being run by the cronjob |
 | fullnameOverride | string | `""` | Override fullname |
 | image.pullPolicy | string | `"IfNotPresent"` | Pull Policy for images in cronjob |
 | image.registry | string | `"ghcr.io"` | Image Registry |

diff --git a/charts/ecr-cleanup/templates/cronjob.yaml b/charts/ecr-cleanup/templates/cronjob.yaml
@@ -28,13 +28,12 @@ spec:
             - name: main
               image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               imagePullPolicy: IfNotPresent
-              {{- if .Values.awsRegistryId }}
+              {{- if or .Values.awsRegistryId .Values.env}}
               env:
                 - name: AWS_REGISTRY_ID
                   value: "{{ .Values.awsRegistryId }}"
               {{- end }}
-              command:
-                - /code/main.py
+              command: {{- .Values.command }}
               securityContext:
                 {{- toYaml .Values.securityContext | nindent 16 }}
               resources:

diff --git a/charts/ecr-cleanup/values.schema.json b/charts/ecr-cleanup/values.schema.json
@@ -8,8 +8,8 @@
         "fullnameOverride": {
             "type": "string"
         },
-        "schedule": {
-            "type": "string"
+        "command": {
+            "type": "array"
         },
         "image": {
             "type": "object",
@@ -43,6 +43,9 @@
         "resources": {
             "type": "object"
         },
+        "schedule": {
+            "type": "string"
+        },
         "securityContext": {
             "type": "object"
         },

diff --git a/charts/ecr-cleanup/values.yaml b/charts/ecr-cleanup/values.yaml
@@ -23,6 +23,10 @@ nameOverride: ""
 # -- Override fullname
 fullnameOverride: ""
 
+# -- Command being run by the cronjob
+command:
+  - /code/main.py
+
 serviceAccount:
   # -- Specifies whether a service account should be created
   create: true