Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(annotations): add secret annotations #458

Merged
merged 5 commits into from
Feb 26, 2025
Merged

feat(annotations): add secret annotations #458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16a6ad0
feat(annotations): add secret annotations
Feb 20, 2025
91e964a
rename secretAnnotations to secret.annotations
Feb 26, 2025
eeff762
fix typo
Feb 26, 2025
dc23bc9
use global context
Feb 26, 2025
199f61c
fix typo chema
Feb 26, 2025
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 charts/atlantis/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
appVersion: v0.33.0
description: A Helm chart for Atlantis https://www.runatlantis.io
name: atlantis
version: 5.14.0
version: 5.15.0
keywords:
- terraform
home: https://www.runatlantis.io
Expand Down
3 changes: 2 additions & 1 deletion charts/atlantis/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ extraManifests:
| environment | object | `{}` | Environment values to add to the Atlantis pod. Check values.yaml for examples. |
| environmentRaw | list | `[]` | Optionally specify additional environment variables in raw yaml format. Useful to specify variables refering to k8s objects. Check values.yaml for examples. |
| environmentSecrets | list | `[]` | Optionally specify additional environment variables to be populated from Kubernetes secrets. Useful for passing in TF_VAR_foo or other secret environment variables from Kubernetes secrets. Check values.yaml for examples. |
| extraAnnotations | object | `{}` | |
| extraAnnotations | object | `{}` | These annotations will be added to all the resources. Check values.yaml for examples. |
| extraArgs | list | `[]` | Optionally specify extra arguments for the Atlantis pod. Check values.yaml for examples. |
| extraContainers | list | `[]` | Optionally specify extra containers for the Atlantis pod. Check values.yaml for examples. |
| extraManifests | list | `[]` | Optionally specify additional manifests to be created. Check values.yaml for examples. |
Expand Down Expand Up @@ -183,6 +183,7 @@ extraManifests:
| replicaCount | int | `1` | Replica count for Atlantis pods. |
| repoConfig | string | `""` | Use Server Side Repo Config, ref: https://www.runatlantis.io/docs/server-side-repo-config.html. Check values.yaml for examples. |
| resources | object | `{}` | Resources for Atlantis. Check values.yaml for examples. |
| secretAnnotations | object | `{}` | These annotations will be added to secrets. Check values.yaml for examples. |
| service.annotations | object | `{}` | |
| service.externalTrafficPolicy | string | `nil` | |
| service.loadBalancerIP | string | `nil` | |
Expand Down
7 changes: 6 additions & 1 deletion charts/atlantis/templates/secret-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "atlantis.labels" . | nindent 4 }}
{{- with .Values.extraAnnotations }}
{{- if or .Values.secretAnnotations .Values.extraAnnotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
data:
apisecret: {{ .Values.api.secret | b64enc }}
Expand Down
7 changes: 6 additions & 1 deletion charts/atlantis/templates/secret-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "atlantis.labels" . | nindent 4 }}
{{- with .Values.extraAnnotations }}
{{- if or .Values.secretAnnotations .Values.extraAnnotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
data:
{{- if .Values.aws.credentials }}
Expand Down
7 changes: 6 additions & 1 deletion charts/atlantis/templates/secret-basic-auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "atlantis.labels" . | nindent 4 }}
{{- with .Values.extraAnnotations }}
{{- if or .Values.secretAnnotations .Values.extraAnnotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
data:
username: {{ .Values.basicAuth.username | b64enc }}
Expand Down
7 changes: 6 additions & 1 deletion charts/atlantis/templates/secret-gitconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "atlantis.labels" . | nindent 4 }}
{{- with .Values.extraAnnotations }}
{{- if or .Values.secretAnnotations .Values.extraAnnotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
data:
gitconfig: {{ .Values.gitconfig | b64enc }}
Expand Down
7 changes: 6 additions & 1 deletion charts/atlantis/templates/secret-netrc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "atlantis.labels" . | nindent 4 }}
{{- with .Values.extraAnnotations }}
{{- if or .Values.secretAnnotations .Values.extraAnnotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
data:
netrc: {{ .Values.netrc | b64enc }}
Expand Down
7 changes: 6 additions & 1 deletion charts/atlantis/templates/secret-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "atlantis.labels" . | nindent 4 }}
{{- with .Values.extraAnnotations }}
{{- if or .Values.secretAnnotations .Values.extraAnnotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
data:
password: {{ .Values.redis.password | b64enc }}
Expand Down
7 changes: 6 additions & 1 deletion charts/atlantis/templates/secret-service-account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@ metadata:
labels:
component: service-account-secret
{{- include "atlantis.labels" $ | nindent 4 }}
{{- with $.Values.extraAnnotations }}
{{- if or .Values.secretAnnotations .Values.extraAnnotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
data:
service-account.json: {{ $secret }}
Expand Down
7 changes: 6 additions & 1 deletion charts/atlantis/templates/secret-webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "atlantis.labels" . | nindent 4 }}
{{- with .Values.extraAnnotations }}
{{- if or .Values.secretAnnotations .Values.extraAnnotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.extraAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
data:
{{- if .Values.githubApp }}
Expand Down
10 changes: 10 additions & 0 deletions charts/atlantis/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,16 @@
"description": "SecurityContext configuration for atlantis containers.",
"$ref": "#/definitions/io.k8s.api.core.v1.SecurityContext"
},
"secretAnnotations": {
"type": "object",
"description": "Add additional secret annotations",
"items": {
"type": "object"
},
"examples": {
"team": "example"
}
},
"servicemonitor": {
"type": "object",
"description": "ServiceMonitor configuration for atlantis containers.",
Expand Down
8 changes: 7 additions & 1 deletion charts/atlantis/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,13 @@ dnsConfig: {}

hostNetwork: false

# - These annotations will be added to all the resources.
# -- These annotations will be added to secrets.
# Check values.yaml for examples.
secretAnnotations: {}
# secretAnnotations:
# team: example

# -- These annotations will be added to all the resources.
# Check values.yaml for examples.
extraAnnotations: {}
# extraAnnotations:
Expand Down