[stable/spinnaker] Support adding custom annotations on the halyard pod (#12355)

* [stable/spinnaker] Support adding custom annotations on the halyard pod

Signed-off-by: costimuraru <costimuraru@gmail.com>

* Implement feedback

Signed-off-by: costimuraru <costimuraru@gmail.com>

* Fix comment

Signed-off-by: costimuraru <costimuraru@gmail.com>
This commit is contained in:
Costi Muraru
2019-03-20 10:37:47 -07:00
committed by Kubernetes Prow Robot
parent 7ca2c9a187
commit 138c78891c
5 changed files with 21 additions and 1 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
name: spinnaker
version: 1.8.0
version: 1.8.1
appVersion: 1.12.5
home: http://spinnaker.io/
sources:
+8
View File
@@ -155,3 +155,11 @@ halyard:
```
Any files added through `additionalConfigMaps` will be written to disk at `/opt/halyard/additionalConfigMaps`.
### Set custom annotations for the halyard pod
```yaml
halyard:
annotations:
iam.amazonaws.com/role: <role_arn>
```
@@ -11,6 +11,10 @@ metadata:
spec:
template:
metadata:
{{- if .Values.halyard.annotations }}
annotations:
{{ toYaml .Values.halyard.annotations | indent 8 }}
{{- end }}
labels:
{{ include "spinnaker.standard-labels" . | indent 8 }}
spec:
@@ -13,6 +13,10 @@ spec:
component: halyard
template:
metadata:
{{- if .Values.halyard.annotations }}
annotations:
{{ toYaml .Values.halyard.annotations | indent 8 }}
{{- end }}
labels:
{{ include "spinnaker.standard-labels" . | indent 8 }}
component: halyard
+4
View File
@@ -40,6 +40,10 @@ halyard:
## run by the init container before halyard is started.
# additionalInitScript: |-
## Uncomment if you want to add annotations on halyard and install-using-hal pods
# annotations:
# iam.amazonaws.com/role: <role_arn>
# Define which registries and repositories you want available in your
# Spinnaker pipeline definitions
# For more info visit: