adding annotations and resources (#81)

Co-authored-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>

charts/spire/templates/agent-daemonset.yaml

@@ -13,6 +13,10 @@ spec:
     type: RollingUpdate
   template:
     metadata:
+      {{- with .Values.agent.service.annotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
         {{- include "spire.agent.selectorLabels" . | nindent 8 }}
     spec:
@@ -28,6 +32,8 @@ spec:
           image: {{ template "spire.image" .Values.waitForIt }}
           imagePullPolicy: {{ .Values.waitForIt.image.pullPolicy }}
           args: ["-t", "30", "{{ include "spire.fullname" . }}-server:8081"]
+          resources:
+            {{- toYaml .Values.waitForIt.resources | nindent 12 }}
       {{- with .Values.agent.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -45,7 +51,7 @@ spec:
               mountPath: /run/spire/bundle
               readOnly: true
             - name: spire-agent-socket-dir
-              mountPath: /run/spire/agent-sockets
+              mountPath: {{ dir .Values.agent.config.socketPath }}
               readOnly: false
             - name: spire-token
               mountPath: /var/run/secrets/tokens
@@ -135,7 +141,7 @@ spec:
             name: {{ include "spire.fullname" . }}-bundle
         - name: spire-agent-sockets
           hostPath:
-            path: /run/spire/agent-sockets
+            path: {{ dir .Values.agent.config.socketPath }}
             type: DirectoryOrCreate
         - name: spire-token
           projected:
@@ -146,7 +152,7 @@ spec:
                 audience: spire-server
         - name: spire-agent-socket-dir
           hostPath:
-            path: /run/spire/agent-sockets
+            path: {{ dir .Values.agent.config.socketPath }}
             type: DirectoryOrCreate
         # This volume is where the socket for kubelet->driver communication lives
         - name: spiffe-csi-socket-dir

charts/spire/templates/server-service.yaml

@@ -3,6 +3,10 @@ kind: Service
 metadata:
   name: {{ include "spire.fullname" . }}-server
   namespace: {{ .Release.Namespace }}
+  {{- with .Values.server.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 8 }}
+  {{- end }}
   labels:
     {{- include "spire.server.labels" . | nindent 4 }}
 spec:

charts/spire/templates/server-statefulset.yaml

@@ -93,6 +93,8 @@ spec:
             - name: spire-workload-registrar-config
               mountPath: /run/spire/k8s-workload-registrar/config
               readOnly: true
+          resources:
+            {{- toYaml .Values.workloadRegistrar.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -105,6 +107,10 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.server.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: spire-workload-registrar-config
           configMap:

charts/spire/templates/workload-registrar-service.yaml

@@ -3,6 +3,10 @@ kind: Service
 metadata:
   name: {{ include "spire.fullname" . }}-k8s-workload-registrar
   namespace: {{ .Release.Namespace }}
+  {{- with .Values.workloadRegistrar.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 8 }}
+  {{- end }}
   labels:
     {{- include "spire.server.labels" . | nindent 4 }}
 spec: