feat: support imagePullSecrets on the service account as well as the …

…deployment (#28) * feat: support imagePullSecrets on the service account as well as the deployment
pact-foundation · Feb 3, 2023 · 3a39ffc · 3a39ffc
1 parent e1090aa
commit 3a39ffc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/charts/pact-broker/Chart.yaml b/charts/pact-broker/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: pact-broker
 description: The Pact Broker is an application for sharing for Pact contracts and verification results.
 type: application
-version: 0.5.2
+version: 0.6.0
 appVersion: 2.105.0.1
 dependencies:
   - condition: postgresql.enabled

diff --git a/charts/pact-broker/README.md b/charts/pact-broker/README.md
@@ -1,6 +1,6 @@
 # pact-broker
 
-![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.105.0.1](https://img.shields.io/badge/AppVersion-2.105.0.1-informational?style=flat-square)
+![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.105.0.1](https://img.shields.io/badge/AppVersion-2.105.0.1-informational?style=flat-square)
 
 The Pact Broker is an application for sharing for Pact contracts and verification results.
 
@@ -185,6 +185,7 @@ helm upgrade -i <release_name> oci://ghcr.io/pact-foundation/pact-broker-chart/p
 | serviceAccount.annotations | Additional custom annotations for the ServiceAccount. | object | `{}` |
 | serviceAccount.automountServiceAccountToken | Auto-mount the service account token in the pod | bool | `true` |
 | serviceAccount.create | Enable the creation of a ServiceAccount for Pact Broker pods | bool | `true` |
+| serviceAccount.imagePullSecrets | Name of image pull secrets that should be attached to the service account | list | `[]` |
 | serviceAccount.labels | Additional custom labels to the service ServiceAccount. | object | `{}` |
 | serviceAccount.name | Name of the created ServiceAccount If not set and `serviceAccount.create` is true, a name is generated | string | `"broker-sa"` |
 

diff --git a/charts/pact-broker/templates/serviceaccount.yaml b/charts/pact-broker/templates/serviceaccount.yaml
@@ -1,19 +1,27 @@
 {{- if .Values.serviceAccount.create }}
+{{- with .Values.serviceAccount }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.serviceAccount.name }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ .name }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     app.kubernetes.io/component: pact-broker
-      {{- with .Values.serviceAccount.labels }}
+      {{- with .labels }}
       {{ toYaml . | trim | indent 8 }}
       {{- end }}
-  {{- if .Values.serviceAccount.annotations }}
+  {{- if .annotations }}
   annotations:
-    {{- with .Values.serviceAccount.annotations }}
+    {{- with .annotations }}
     {{ toYaml . | trim | indent 8 }}
     {{- end }}
   {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+automountServiceAccountToken: {{ .automountServiceAccountToken }}
+{{- if .imagePullSecrets }}
+imagePullSecrets:
+{{- range .imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/charts/pact-broker/values.yaml b/charts/pact-broker/values.yaml
@@ -498,3 +498,6 @@ serviceAccount:
 
   # -- Auto-mount the service account token in the pod
   automountServiceAccountToken: true
+
+  # -- Name of image pull secrets that should be attached to the service account
+  imagePullSecrets: []