From 138c78891c32628ed852596c2cd7ff8fb7dc483b Mon Sep 17 00:00:00 2001 From: Costi Muraru Date: Wed, 20 Mar 2019 19:37:47 +0200 Subject: [PATCH] [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 * Implement feedback Signed-off-by: costimuraru * Fix comment Signed-off-by: costimuraru --- stable/spinnaker/Chart.yaml | 2 +- stable/spinnaker/README.md | 8 ++++++++ stable/spinnaker/templates/hooks/install-using-hal.yaml | 4 ++++ stable/spinnaker/templates/statefulsets/halyard.yaml | 4 ++++ stable/spinnaker/values.yaml | 4 ++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index 9778c71d6c..c0b9ff518f 100644 --- a/stable/spinnaker/Chart.yaml +++ b/stable/spinnaker/Chart.yaml @@ -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: diff --git a/stable/spinnaker/README.md b/stable/spinnaker/README.md index f772746135..9d011f267f 100644 --- a/stable/spinnaker/README.md +++ b/stable/spinnaker/README.md @@ -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: +``` \ No newline at end of file diff --git a/stable/spinnaker/templates/hooks/install-using-hal.yaml b/stable/spinnaker/templates/hooks/install-using-hal.yaml index 636b1de98f..5fa796aa31 100644 --- a/stable/spinnaker/templates/hooks/install-using-hal.yaml +++ b/stable/spinnaker/templates/hooks/install-using-hal.yaml @@ -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: diff --git a/stable/spinnaker/templates/statefulsets/halyard.yaml b/stable/spinnaker/templates/statefulsets/halyard.yaml index 7d16ae7f8f..3d52da7bff 100644 --- a/stable/spinnaker/templates/statefulsets/halyard.yaml +++ b/stable/spinnaker/templates/statefulsets/halyard.yaml @@ -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 diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml index cc16bd2033..4dcd31d411 100644 --- a/stable/spinnaker/values.yaml +++ b/stable/spinnaker/values.yaml @@ -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: + # Define which registries and repositories you want available in your # Spinnaker pipeline definitions # For more info visit: