Allowed annotations and labels to be defined

templates/statefulset.yaml

@@ -2,6 +2,14 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: octopus
+  {{- if .Values.octopus.statefulSet.annotations }}
+  annotations:
+  {{ toYaml .Values.octopus.statefulSet.annotations | indent 2 }}
+  {{- end }}
+  {{- if .Values.octopus.statefulSet.labels }}
+  labels:
+  {{ toYaml .Values.octopus.statefulSet.labels | indent 2 }}
+  {{- end }}
 spec:
   selector:
     matchLabels:
@@ -12,6 +20,13 @@ spec:
     metadata:
       labels:
         app: octopus
+      {{- if .Values.octopus.pods.labels }}
+      {{ toYaml .Values.octopus.pods.labels | indent 2 }}
+      {{- end }}
+      {{- if .Values.octopus.pods.annotations }}
+      annotations:
+      {{ toYaml .Values.octopus.pods.annotations | indent 2 }}
+      {{- end }}
     spec:
       affinity:
         # Try and keep Octopus nodes on separate Kubernetes nodes

values.yaml

@@ -1,4 +1,10 @@
 octopus:
+  statefulSet:
+    annotations: {}
+    labels: {}
+  pods:
+    annotations: {}
+    labels: {}
   # The Octopus server image. Visit https://hub.docker.com/r/octopusdeploy/octopusdeploy for the available versions.
   image: octopusdeploy/octopusdeploy-prerelease:2020.3.0-beta1789.linux
   # Set this to 1 if you do not have a HA license.
@@ -52,10 +58,13 @@ dockerHub:
   # kubectl create secret docker-registry regcred --docker-username=myusername --docker-password=mypassword --dry-run=client -o yaml
   creds:
 
-# The MS SQL subchart values
+# The MS SQL subchart values. See https://github.com/helm/charts/tree/master/stable/mssql-linux for more details.
 mssql-linux:
   # If enabled, a simple MS SQL server will be deployed. Note that this server is not production ready, as it
   # uses ephemeral storage. A ClusterIP service with the hostname of mssql is also created.
   enabled: true
   # Set the SA password, used by the octopus.connectionString value
-  sapassword: Password01!
+  sapassword: Password01!
+  # Must be set to "Y" to accept the EULA
+  acceptEula:
+    value: "N"