Adds support for configuring imagePullSecrets in deployments (#116)

* Adds support for configuring imagePullSecrets in deployments * Adds support for configuring imagePullSecrets in deployments --------- Co-authored-by: FelipeAFV <[email protected]>
AzBuilder · May 20, 2024 · 8b929af · 8b929af
1 parent ad9490e
commit 8b929af
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -231,6 +231,7 @@ Once you have completed the above steps you can complete the file values.yaml to
 | Key                                       | Required | Description                                                            |
 |:------------------------------------------|----------|------------------------------------------------------------------------|
 | name                                      | Yes      | Use "Terrakube"                                                        |
+| global.imagePullSecrets                   | No       | Global Secret used to pull images from private repository              |
 | security.adminGroup                       | Yes      | Admin group inside Terrakube                                           |
 | security.patSecret                        | Yes      | 32 Character secret to sign personal access token                      |
 | security.internalSecret                   | Yes      | 32 Character secret to sing internal                                   |
@@ -273,6 +274,7 @@ Once you have completed the above steps you can complete the file values.yaml to
 | api.properties.databasePassword           | No       |                                                                        |
 | api.securityContext                       | No       | Fill securityContext field                                             |
 | api.containerSecurityContext              | No       | Fill securityContext field in the container spec                       |
+| api.imagePullSecrets                      | No       | Specific Secret used to pull images from private repository            |
 | executor.enabled                          | Yes      | true/false                                                             |
 | executor.image                            | No       | Executor image repository                                              |
 | executor.version                          | Yes      | Terrakube Executor version                                             |
@@ -286,6 +288,7 @@ Once you have completed the above steps you can complete the file values.yaml to
 | executor.properties.toolsBranch           | Yes      | Example: main                                                          |
 | executor.securityContext                  | No       | Fill securityContext field                                             |
 | executor.containerSecurityContext         | No       | Fill securityContext field in the container spec                       |
+| executor.imagePullSecrets                 | No       | Specific Secret used to pull images from private repository            |
 | registry.enabled                          | Yes      |                                                                        |
 | registry.image                            | No       | Registry image repository                                              |
 | registry.version                          | Yes      |                                                                        |
@@ -297,6 +300,7 @@ Once you have completed the above steps you can complete the file values.yaml to
 | registry.volumeMounts                     | No       |                                                                        |
 | registry.securityContext                  | No       | Fill securityContext field                                             |
 | registry.containerSecurityContext         | No       | Fill securityContext field in the container spec                       |
+| registry.imagePullSecrets                 | No       | Specific Secret used to pull images from private repository            |
 | ui.enabled                                | Yes      | true/false                                                             |
 | ui.image                                  | No       | UI image repository                                                    |
 | ui.version                                | Yes      |                                                                        |
@@ -305,6 +309,7 @@ Once you have completed the above steps you can complete the file values.yaml to
 | ui.serviceType                            | Yes      | ClusterIP/NodePort/LoadBalancer/ExternalName                           |
 | ui.securityContext                        | No       | Fill securityContext field                                             |
 | ui.containerSecurityContext               | No       | Fill securityContext field in the container spec                       |
+| ui.imagePullSecrets                       | No       | Specific Secret used to pull images from private repository            |
 | ingress.ui.ingressClassName               | Yes      | Default is set to nginx                                                |
 | ingress.ui.useTls                         | Yes      | true/false                                                             |
 | ingress.ui.enabled                        | Yes      | true/false                                                             |

diff --git a/charts/terrakube/Chart.yaml b/charts/terrakube/Chart.yaml
@@ -15,7 +15,7 @@ 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: 3.16.2
+version: 3.17.0
 
 # 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

diff --git a/charts/terrakube/templates/deployment-api.yaml b/charts/terrakube/templates/deployment-api.yaml
@@ -20,6 +20,10 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secrets-api.yaml") . | sha256sum }}
     spec:
+      {{- with .Values.api.imagePullSecrets | default .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: terrakube-api
         image: {{ .Values.api.image }}:{{ default .Chart.AppVersion .Values.api.version }}

diff --git a/charts/terrakube/templates/deployment-executor.yaml b/charts/terrakube/templates/deployment-executor.yaml
@@ -20,6 +20,10 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secrets-executor.yaml") . | sha256sum }}
     spec:
+      {{- with .Values.executor.imagePullSecrets | default .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: terrakube-executor
         image: {{ .Values.executor.image }}:{{ default .Chart.AppVersion .Values.executor.version }}

diff --git a/charts/terrakube/templates/deployment-registry.yaml b/charts/terrakube/templates/deployment-registry.yaml
@@ -20,6 +20,10 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secrets-registry.yaml") . | sha256sum }}
     spec:
+      {{- with .Values.registry.imagePullSecrets | default .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: terrakube-registry
         image: {{ .Values.registry.image }}:{{ default .Chart.AppVersion .Values.registry.version }}

diff --git a/charts/terrakube/templates/deployment-ui.yaml b/charts/terrakube/templates/deployment-ui.yaml
@@ -20,6 +20,10 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secrets-ui.yaml") . | sha256sum }}
     spec:
+      {{- with .Values.ui.imagePullSecrets | default .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: terrakube-ui
         image: {{ .Values.ui.image }}:{{ default .Chart.AppVersion .Values.ui.version }}

diff --git a/charts/terrakube/values.yaml b/charts/terrakube/values.yaml
@@ -1,6 +1,9 @@
 ## Global Name
 name: "terrakube"
 
+global:
+  imagePullSecrets: []
+
 ## Azure Active Directory Security
 security:
   useOpenLDAP: true
@@ -176,6 +179,7 @@ api:
   terraformReleasesUrl: "https://releases.hashicorp.com/terraform/index.json"
   securityContext: {}
   containerSecurityContext: {}
+  imagePullSecrets: []
   cache:
     moduleCacheMaxTotal: "128"
     moduleCacheMaxIdle: "128"
@@ -217,6 +221,7 @@ executor:
     toolsBranch: "main"
   securityContext: {}
   containerSecurityContext: {}
+  imagePullSecrets: []
 ## Registry properties
 registry:
   enabled: true
@@ -230,6 +235,7 @@ registry:
   podLabels: {}
   securityContext: {}
   containerSecurityContext: {}
+  imagePullSecrets: []
 
 ## UI Properties
 ui:
@@ -244,6 +250,7 @@ ui:
   podLabels: {}
   securityContext: {}
   containerSecurityContext: {}
+  imagePullSecrets: []
 
 ## Ingress properties
 ingress: