diff --git a/charts/opslevel/templates/elasticsearch/statefulset.yaml b/charts/opslevel/templates/elasticsearch/statefulset.yaml index aedd549..705af6c 100644 --- a/charts/opslevel/templates/elasticsearch/statefulset.yaml +++ b/charts/opslevel/templates/elasticsearch/statefulset.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/faktory/statefulset.yaml b/charts/opslevel/templates/faktory/statefulset.yaml index da8e36e..ba7b4f5 100644 --- a/charts/opslevel/templates/faktory/statefulset.yaml +++ b/charts/opslevel/templates/faktory/statefulset.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/minio/statefulset.yaml b/charts/opslevel/templates/minio/statefulset.yaml index d31e74d..99cd6be 100644 --- a/charts/opslevel/templates/minio/statefulset.yaml +++ b/charts/opslevel/templates/minio/statefulset.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/mysql/statefulset.yaml b/charts/opslevel/templates/mysql/statefulset.yaml index 6bf74a2..73f27e8 100644 --- a/charts/opslevel/templates/mysql/statefulset.yaml +++ b/charts/opslevel/templates/mysql/statefulset.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/opslevel/scheduler.yaml b/charts/opslevel/templates/opslevel/scheduler.yaml index bb00283..842e7d2 100644 --- a/charts/opslevel/templates/opslevel/scheduler.yaml +++ b/charts/opslevel/templates/opslevel/scheduler.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/opslevel/web.yaml b/charts/opslevel/templates/opslevel/web.yaml index 103a324..9d718f1 100644 --- a/charts/opslevel/templates/opslevel/web.yaml +++ b/charts/opslevel/templates/opslevel/web.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/opslevel/worker-faktory.yaml b/charts/opslevel/templates/opslevel/worker-faktory.yaml index 92dd14e..e32cde2 100644 --- a/charts/opslevel/templates/opslevel/worker-faktory.yaml +++ b/charts/opslevel/templates/opslevel/worker-faktory.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/opslevel/worker-high.yaml b/charts/opslevel/templates/opslevel/worker-high.yaml index 044aad8..544e3cd 100644 --- a/charts/opslevel/templates/opslevel/worker-high.yaml +++ b/charts/opslevel/templates/opslevel/worker-high.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/opslevel/worker-low.yaml b/charts/opslevel/templates/opslevel/worker-low.yaml index f354c0f..672e280 100644 --- a/charts/opslevel/templates/opslevel/worker-low.yaml +++ b/charts/opslevel/templates/opslevel/worker-low.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/opslevel/worker-search.yaml b/charts/opslevel/templates/opslevel/worker-search.yaml index ac64690..08986af 100644 --- a/charts/opslevel/templates/opslevel/worker-search.yaml +++ b/charts/opslevel/templates/opslevel/worker-search.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/opssight/web.yaml b/charts/opslevel/templates/opssight/web.yaml index fcbf3d6..9f1a137 100644 --- a/charts/opslevel/templates/opssight/web.yaml +++ b/charts/opslevel/templates/opssight/web.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/opssight/worker.yaml b/charts/opslevel/templates/opssight/worker.yaml index e5d8944..e7de794 100644 --- a/charts/opslevel/templates/opssight/worker.yaml +++ b/charts/opslevel/templates/opssight/worker.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/postgres/statefulset.yaml b/charts/opslevel/templates/postgres/statefulset.yaml index 2e0ef19..93ea3c5 100644 --- a/charts/opslevel/templates/postgres/statefulset.yaml +++ b/charts/opslevel/templates/postgres/statefulset.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/redis/deployment.yaml b/charts/opslevel/templates/redis/deployment.yaml index e2b2efa..0757090 100644 --- a/charts/opslevel/templates/redis/deployment.yaml +++ b/charts/opslevel/templates/redis/deployment.yaml @@ -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" . }} diff --git a/charts/opslevel/templates/runner/new-mode.yaml b/charts/opslevel/templates/runner/new-mode.yaml index d3beeeb..1f5bfd1 100644 --- a/charts/opslevel/templates/runner/new-mode.yaml +++ b/charts/opslevel/templates/runner/new-mode.yaml @@ -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 diff --git a/charts/opslevel/templates/runner/old-mode.yaml b/charts/opslevel/templates/runner/old-mode.yaml index 9761577..a5be2d4 100644 --- a/charts/opslevel/templates/runner/old-mode.yaml +++ b/charts/opslevel/templates/runner/old-mode.yaml @@ -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 diff --git a/charts/opslevel/values.yaml b/charts/opslevel/values.yaml index 94be074..5e4e05c 100644 --- a/charts/opslevel/values.yaml +++ b/charts/opslevel/values.yaml @@ -45,6 +45,8 @@ opslevel: username: "Alice Wonderland" email: "alice@opslevel.com" password: "wonderland" + pod: + annotations: {} web: replicas: 3 resources: *resourcesMedium @@ -79,6 +81,8 @@ runner: create: true name: opslevel-runner annotations: {} + pod: + annotations: {} secret: name: "opslevel-runner" create: true @@ -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 @@ -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 @@ -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 @@ -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" @@ -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 @@ -186,6 +200,8 @@ objectStorage: repositoryCLI: "minio/mc" tagCLI: "RELEASE.2023-02-28T00-12-59Z" resources: *resourcesMedium + pod: + annotations: {} serviceAccount: create: true name: minio @@ -207,6 +223,8 @@ faktory: resources: *resourcesMedium storageClass: "" storageSize: "8Gi" + pod: + annotations: {} secret: name: "opslevel-faktory" password: "admin1234"