Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/spinnaker] Allow serviceAccount annotations for Halyard #21060

Merged
merged 12 commits into from
Jun 28, 2020
Merged

[stable/spinnaker] Allow serviceAccount annotations for Halyard #21060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e6e2e5c
[stable/spinnaker] Option to add annotation to the created Halyard se…
aRobinson-R7 Feb 26, 2020
4b33cc6
[stable/spinnaker] Updating README with information about Halyard ser…
aRobinson-R7 Feb 26, 2020
22d0fd9
[stable/spinnaker] Updating Chart version
aRobinson-R7 Feb 26, 2020
c4e1f84
Merge branch 'master' into allow_serviceaccount_annotations_for_halyard
snorlaX-sleeps Apr 17, 2020
36d5e5f
[stable/spinnaker] Increment Chart version
snorlaX-sleeps Jun 11, 2020
62f50a6
Merge branch 'master' into allow_serviceaccount_annotations_for_halyard
snorlaX-sleeps Jun 11, 2020
8c1eb21
[stable/spinnaker] Setting version level with current
snorlaX-sleeps Jun 11, 2020
bc80887
[stable/spinnaker] Incrementing version
snorlaX-sleeps Jun 11, 2020
e6acbfe
[stable/spinnaker] Use correct name (serviceAccountAnnotations) in th…
snorlaX-sleeps Jun 19, 2020
ba0a366
[stable/spinnaker] Increment Chart version
snorlaX-sleeps Jun 19, 2020
f9c96ab
Merge branch 'master' into allow_serviceaccount_annotations_for_halyard
snorlaX-sleeps Jun 19, 2020
275bd64
Merge branch 'master' into allow_serviceaccount_annotations_for_halyard
snorlaX-sleeps Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/spinnaker/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: 2.0.0-rc8
version: 2.0.0-rc9
appVersion: 1.16.2
home: http://spinnaker.io/
sources:
Expand Down
8 changes: 8 additions & 0 deletions stable/spinnaker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,14 @@ halyard:
iam.amazonaws.com/role: <role_arn>
```

### Set custom annotations for the halyard serviceaccount

```yaml
serviceAccount:
serviceAccountAnnotations:
eks.amazonaws.com/role-arn: <role_arn>
```

### Set environment variables on the halyard pod

```yaml
Expand Down
4 changes: 4 additions & 0 deletions stable/spinnaker/templates/rbac/halyard-sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{ include "spinnaker.standard-labels" . | indent 4 }}
{{- if .Values.serviceAccount.serviceAccountAnnotations }}
annotations:
{{ toYaml .Values.serviceAccount.serviceAccountAnnotations | indent 4 }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to fix the indentation try nindent 6

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have thought 4 was correct? an indent of 2 below annotations?

{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions stable/spinnaker/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ serviceAccount:
# If left blank it is auto-generated from the fullname of the release
halyardName:
spinnakerName:
serviceAccountAnnotations: {}
securityContext:
# Specifies permissions to write for user/group
runAsUser: 1000
Expand Down