Merge branch 'master' into aslafy-z-patch-2

stakater · Jul 6, 2023 · 748c86c · 748c86c
2 parents 262e896 + a7c73a4
commit 748c86c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,11 +3,14 @@
 
 All notable changes to this project will be documented here.
 
-### v2.1.16
+### v2.1.17
 - feat: allow overriding revisionHistoryLimit [PR-257](https://github.com/stakater/application/pull/257)
 
   > Caution: This PR changes the default value for `revisionHistoryLimit` from 10 to 2.
 
+### v2.1.16
+- fix: optional service account [PR-213](https://github.com/stakater/application/pull/213)
+
 ### v2.1.15
 - fix: allow setting arbitrary resource constraints [PR-255](https://github.com/stakater/application/pull/255)
 

diff --git a/README.md b/README.md
@@ -205,6 +205,7 @@ Periodic probe of container liveness. Container will be restarted if the probe f
 | service.annotations | Annotations for service                                                                                                                                                                          | `{}`                                                                                                                                                  |
 | service.ports | Ports for applications service                                                                                                                                                                   | - port: 8080<br>&nbsp;&nbsp;name: http<br>&nbsp;&nbsp;protocol: TCP<br>&nbsp;&nbsp;targetPort: 8080                                                   |
 | service.type | Type of service                                                                                                                                                                          | `ClusterIP`                                                                                                                                                  |
+| service.clusterIP | Fixed IP for a ClusterIP service. Set to `None` for an headless service.                                                                                                                                                                          | `null`                                                                                                                                                  |
 
 
 

diff --git a/application/Chart.yaml b/application/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 
 # Helm chart Version
 
-version: 2.1.15
+version: 2.1.16
 
 
 keywords:

diff --git a/application/templates/deployment.yaml b/application/templates/deployment.yaml
@@ -291,9 +291,11 @@ spec:
         {{- end }}
         {{- end }}
       {{- end }}
+      {{- if .Values.rbac.serviceAccount.enabled }}
       {{- if .Values.rbac.serviceAccount.name }}
       serviceAccountName: {{ .Values.rbac.serviceAccount.name }}
-        {{- else }}
-      serviceAccountName: {{ template "application.name" . }}
+      {{- else }}
+      serviceAccountName: {{ template "application.name" $ }}
+      {{- end }}
       {{- end }}
 {{- end }}
diff --git a/application/tests/deployment_test.yaml b/application/tests/deployment_test.yaml
@@ -75,3 +75,29 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].image
           value: example-image:example-tag@sha256:example-digest
+
+  - it: yields empty service account name when disabled
+    set:
+      rbac.serviceAccount.enabled: false
+    asserts:
+      - notExists:
+          path: spec.template.spec.serviceAccountName
+
+  - it: uses service account name override when present
+    set:
+      rbac.serviceAccount.enabled: true
+      rbac.serviceAccount.name: example-sa
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: example-sa
+
+  - it: uses a generated service account name when not given
+    set:
+      applicationName: example-app
+      rbac.serviceAccount.enabled: true
+      rbac.serviceAccount.name: ""
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: example-app
diff --git a/application/values-test.yaml b/application/values-test.yaml
@@ -399,7 +399,7 @@ rbac:
   # Service Account to use by pods
   serviceAccount:
     enabled: true
-    name: ""
+    name: "application"
 
     # Additional Labels on service account
     additionalLabels: