Merge pull request #19 from Rely-io/fix/helm_imagepullsecrets

ops(helm): add support to imagepullsecrets and cronjob resources
Rely-io · Oct 18, 2024 · 7ae6810 · 7ae6810
2 parents 18d4eec + 13d48e6
commit 7ae6810
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/deploy/helm/galaxy/README.md b/deploy/helm/galaxy/README.md
@@ -21,6 +21,7 @@ Rely Galaxy Framework Helm chart for Kubernetes
 | image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the image |
 | image.repository | string | `"devrelyio/galaxy"` |  |
 | image.tag | string | `""` | Tag to use for deploying the application |
+| imagePullSecrets | list | `[]` | The image pull secrets to use for pulling the image imagePullSecrets is an array of objects with the following keys name -- The name of the image pull secret eg.: imagePullSecrets: - name: myregistrykey https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ |
 | integration | object | `{"apiUrl":"https://magneto.rely.io/","daemonInterval":60,"executionType":"cronjob","type":null}` | The configuration for the integration |
 | integration.apiUrl | string | `"https://magneto.rely.io/"` | The url for the Rely API |
 | integration.daemonInterval | int | `60` | The interval in minutes at which the integration should run only required if the execution type is daemon |

diff --git a/deploy/helm/galaxy/templates/cronjob.yaml b/deploy/helm/galaxy/templates/cronjob.yaml
@@ -27,10 +27,14 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
         spec:
+          {{- with .Values.imagePullSecrets }}
+          imagePullSecrets:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           serviceAccountName: {{ include "galaxy-helm.serviceAccountName" . }}
           {{- with .Values.podSecurityContext }}
           securityContext:
-            {{- toYaml . | nindent 10 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
           containers:
           - name: {{ .Chart.Name }}
@@ -64,7 +68,19 @@ spec:
               - secretRef:
                   name: {{ include "galaxy-helm.fullname" . }}
             {{- end }}
+            {{- with .Values.resources }}
+            resources:
+              {{- toYaml . | nindent 14 }}
+            {{- end }}
+            {{- with .Values.volumeMounts }}
+            volumeMounts:
+              {{- toYaml . | nindent 14 }}
+            {{- end }}
           restartPolicy: Never
+          {{- with .Values.volumes }}
+          volumes:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.nodeSelector }}
           nodeSelector:
             {{- toYaml . | nindent 12 }}

diff --git a/deploy/helm/galaxy/templates/deployment.yaml b/deploy/helm/galaxy/templates/deployment.yaml
@@ -24,6 +24,10 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       serviceAccountName: {{ include "galaxy-helm.serviceAccountName" . }}
       {{- with .Values.podSecurityContext }}
       securityContext:

diff --git a/deploy/helm/galaxy/values.yaml b/deploy/helm/galaxy/values.yaml
@@ -51,6 +51,14 @@ env:
   # env.RELY_INTEGRATION_ID -- The identifier of this integration instance
   RELY_INTEGRATION_ID:
 
+# imagePullSecrets -- The image pull secrets to use for pulling the image
+# imagePullSecrets is an array of objects with the following keys
+# name -- The name of the image pull secret
+# eg.:
+# imagePullSecrets:
+# - name: myregistrykey
+# https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+imagePullSecrets: []
 # nameOverride -- Override the name of the chart
 nameOverride: ""
 # fullnameOverride -- Override the fullname of the chart