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.

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

Add ability to specify pod template annotations #53

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions charts/opslevel/templates/elasticsearch/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ spec:
app.kubernetes.io/part-of: elasticsearch
annotations:
checksum/secret: {{ include (print $.Template.BasePath "/elasticsearch/secret.yaml") . | sha256sum }}
{{- with .Values.elasticsearch.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/faktory/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/faktory/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/faktory/secret.yaml") . | sha256sum }}
{{- with .Values.faktory.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/minio/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ spec:
app.kubernetes.io/part-of: minio
annotations:
checksum/secret: {{ include (print $.Template.BasePath "/elasticsearch/secret.yaml") . | sha256sum }}
{{- with .Values.objectStorage.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/mysql/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
app.kubernetes.io/part-of: mysql
annotations:
checksum/secret: {{ include (print $.Template.BasePath "/mysql/secret.yaml") . | sha256sum }}
{{- with .Values.mysql.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/opslevel/scheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/opslevel/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/opslevel/secret.yaml") . | sha256sum }}
{{- with .Values.opslevel.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/opslevel/web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/opslevel/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/opslevel/secret.yaml") . | sha256sum }}
{{- with .Values.opslevel.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/opslevel/worker-faktory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/opslevel/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/opslevel/secret.yaml") . | sha256sum }}
{{- with .Values.opslevel.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/opslevel/worker-high.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/opslevel/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/opslevel/secret.yaml") . | sha256sum }}
{{- with .Values.opslevel.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/opslevel/worker-low.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/opslevel/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/opslevel/secret.yaml") . | sha256sum }}
{{- with .Values.opslevel.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/opslevel/worker-search.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/opslevel/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/opslevel/secret.yaml") . | sha256sum }}
{{- with .Values.opslevel.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/opssight/web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/opssight/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/opssight/secret.yaml") . | sha256sum }}
{{- with .Values.opssight.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/opssight/worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/opssight/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/opssight/secret.yaml") . | sha256sum }}
{{- with .Values.opssight.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/postgres/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
app.kubernetes.io/part-of: postgres
annotations:
checksum/secret: {{ include (print $.Template.BasePath "/postgres/secret.yaml") . | sha256sum }}
{{- with .Values.postgres.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
5 changes: 5 additions & 0 deletions charts/opslevel/templates/redis/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ spec:
labels:
app.kubernetes.io/component: app
app.kubernetes.io/part-of: redis
annotations:
checksum/secret: {{ include (print $.Template.BasePath "/redis/secret.yaml") . | sha256sum }}
{{- with .Values.redis.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "opslevel.pullSecrets" . }}
{{- template "global.nodeSelector" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/runner/new-mode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
app.kubernetes.io/part-of: runner-faktory
annotations:
checksum/secret: {{ include (print $.Template.BasePath "/runner/secret.yaml") . | sha256sum }}
{{- with .Values.runner.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "global.nodeSelector" . }}
priorityClassName: opslevel-normal
Expand Down
3 changes: 3 additions & 0 deletions charts/opslevel/templates/runner/old-mode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
app.kubernetes.io/part-of: runner
annotations:
checksum/secret: {{ include (print $.Template.BasePath "/runner/secret.yaml") . | sha256sum }}
{{- with .Values.runner.pod.annotations }}
{{ toYaml . | indent 8 }}
{{- end }}
spec:
{{- template "global.nodeSelector" . }}
priorityClassName: opslevel-normal
Expand Down
18 changes: 18 additions & 0 deletions charts/opslevel/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ opslevel:
username: "Alice Wonderland"
email: "[email protected]"
password: "wonderland"
pod:
annotations: {}
web:
replicas: 3
resources: *resourcesMedium
Expand Down Expand Up @@ -79,6 +81,8 @@ runner:
create: true
name: opslevel-runner
annotations: {}
pod:
annotations: {}
secret:
name: "opslevel-runner"
create: true
Expand All @@ -89,6 +93,8 @@ opssight:
image:
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/opssight"
tag: "selfhosted-production-b8a797f-1726845192"
pod:
annotations: {}
web:
replicas: 2
resources: *resourcesMedium
Expand All @@ -106,6 +112,8 @@ mysql:
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/mysql"
tag: "8.0.34-debian"
resources: *resourcesMedium
pod:
annotations: {}
serviceAccount:
create: true
name: mysql
Expand All @@ -127,6 +135,8 @@ postgres:
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/postgres"
tag: "16.1-bookworm"
resources: *resourcesMedium
pod:
annotations: {}
serviceAccount:
create: true
name: postgres
Expand All @@ -148,6 +158,8 @@ redis:
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/redis"
tag: "6.2.6"
resources: *resourcesMedium
pod:
annotations: {}
secret:
create: true
name: "opslevel-redis"
Expand All @@ -163,6 +175,8 @@ elasticsearch:
repository: "746108190720.dkr.ecr.us-east-1.amazonaws.com/elasticsearch"
tag: "8.8.2"
resources: *resourcesLarge
pod:
annotations: {}
serviceAccount:
create: true
name: elasticsearch
Expand All @@ -186,6 +200,8 @@ objectStorage:
repositoryCLI: "minio/mc"
tagCLI: "RELEASE.2023-02-28T00-12-59Z"
resources: *resourcesMedium
pod:
annotations: {}
serviceAccount:
create: true
name: minio
Expand All @@ -207,6 +223,8 @@ faktory:
resources: *resourcesMedium
storageClass: ""
storageSize: "8Gi"
pod:
annotations: {}
secret:
name: "opslevel-faktory"
password: "admin1234"
Expand Down