From f50388c36d602be2e3a6645495e839a09a1b6b95 Mon Sep 17 00:00:00 2001 From: nrav Date: Wed, 6 Jul 2022 14:57:20 +0200 Subject: [PATCH 1/5] feat: add podLables to sentry Hooks The init jobs do not have unique podLables The lables can be used for mapping these init jobs with services Use case: To allow access to services inside Consul mesh, a service is needed. --- sentry/templates/hooks/sentry-db-check.job.yaml | 3 +++ sentry/templates/hooks/sentry-db-init.job.yaml | 3 +++ sentry/templates/hooks/snuba-db-init.job.yaml | 3 +++ sentry/templates/hooks/snuba-migrate.job.yaml | 3 +++ sentry/values.yaml | 5 +++++ 5 files changed, 17 insertions(+) diff --git a/sentry/templates/hooks/sentry-db-check.job.yaml b/sentry/templates/hooks/sentry-db-check.job.yaml index 4b21a1870..7cbb80844 100644 --- a/sentry/templates/hooks/sentry-db-check.job.yaml +++ b/sentry/templates/hooks/sentry-db-check.job.yaml @@ -35,6 +35,9 @@ spec: {{- if .Values.sentry.worker.podLabels }} {{ toYaml .Values.sentry.worker.podLabels | indent 8 }} {{- end }} + {{- if .Values.hooks.dbCheck.podLabels }} +{{ toYaml .Values.hooks.dbCheck.podLabels | indent 8 }} + {{- end }} spec: {{- if .Values.hooks.dbCheck.affinity }} affinity: diff --git a/sentry/templates/hooks/sentry-db-init.job.yaml b/sentry/templates/hooks/sentry-db-init.job.yaml index 510b367a6..312bb175d 100644 --- a/sentry/templates/hooks/sentry-db-init.job.yaml +++ b/sentry/templates/hooks/sentry-db-init.job.yaml @@ -32,6 +32,9 @@ spec: {{- if .Values.sentry.worker.podLabels }} {{ toYaml .Values.sentry.worker.podLabels | indent 8 }} {{- end }} + {{- if .Values.hooks.dbInit.podLabels }} +{{ toYaml .Values.hooks.dbInit.podLabels | indent 8 }} + {{- end }} spec: {{- if .Values.hooks.dbInit.affinity }} affinity: diff --git a/sentry/templates/hooks/snuba-db-init.job.yaml b/sentry/templates/hooks/snuba-db-init.job.yaml index 591ed8d69..145c0e03f 100644 --- a/sentry/templates/hooks/snuba-db-init.job.yaml +++ b/sentry/templates/hooks/snuba-db-init.job.yaml @@ -34,6 +34,9 @@ spec: {{- if .Values.snuba.podLabels }} {{ toYaml .Values.snuba.podLabels | indent 8 }} {{- end }} + {{- if .Values.hooks.snubaInit.podLabels }} +{{ toYaml .Values.hooks.snubaInit.podLabels | indent 8 }} + {{- end }} spec: {{- if .Values.hooks.snubaInit.affinity }} affinity: diff --git a/sentry/templates/hooks/snuba-migrate.job.yaml b/sentry/templates/hooks/snuba-migrate.job.yaml index b2977dbf4..b381cdcd5 100644 --- a/sentry/templates/hooks/snuba-migrate.job.yaml +++ b/sentry/templates/hooks/snuba-migrate.job.yaml @@ -34,6 +34,9 @@ spec: {{- if .Values.snuba.podLabels }} {{ toYaml .Values.snuba.podLabels | indent 8 }} {{- end }} + {{- if .Values.hooks.snubaMigrate.podLabels }} +{{ toYaml .Values.hooks.snubaMigrate.podLabels | indent 8 }} + {{- end }} spec: {{- if .Values.hooks.snubaInit.affinity }} affinity: diff --git a/sentry/values.yaml b/sentry/values.yaml index b1b1a7c10..1d2ca9961 100644 --- a/sentry/values.yaml +++ b/sentry/values.yaml @@ -419,6 +419,7 @@ hooks: # pullPolicy: IfNotPresent imagePullSecrets: [] env: [] + # podLabels: [] podAnnotations: {} resources: limits: @@ -432,6 +433,7 @@ hooks: # tolerations: [] dbInit: env: [] + # podLabels: [] podAnnotations: {} resources: limits: @@ -445,6 +447,7 @@ hooks: nodeSelector: {} # tolerations: [] snubaInit: + # podLabels: [] podAnnotations: {} resources: limits: @@ -456,6 +459,8 @@ hooks: affinity: {} nodeSelector: {} # tolerations: [] + snubaMigrate: + # podLabels: [] system: ## be sure to include the scheme on the url, for example: "https://sentry.example.com" From 988f8d386fb10dd50a5f85f436030e3d82292611 Mon Sep 17 00:00:00 2001 From: nrav Date: Thu, 7 Jul 2022 08:49:45 +0200 Subject: [PATCH 2/5] fix: nil pointer evaluation error in values.yaml --- sentry/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry/values.yaml b/sentry/values.yaml index 1d2ca9961..9d5014ce0 100644 --- a/sentry/values.yaml +++ b/sentry/values.yaml @@ -459,7 +459,7 @@ hooks: affinity: {} nodeSelector: {} # tolerations: [] - snubaMigrate: + snubaMigrate: {} # podLabels: [] system: From aa66834863a8e6dee5e38e68e532a201818323e5 Mon Sep 17 00:00:00 2001 From: nrav Date: Thu, 7 Jul 2022 09:30:05 +0200 Subject: [PATCH 3/5] chore: updated chart version to 15.0.1 --- sentry/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml index 4b7850d65..d3fd5f5fb 100644 --- a/sentry/Chart.yaml +++ b/sentry/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: sentry description: A Helm chart for Kubernetes type: application -version: 15.0.0 +version: 15.0.1 appVersion: 22.6.0 dependencies: - name: redis From de950fa5527fa8f43ee809e350f52e3cd79b5c24 Mon Sep 17 00:00:00 2001 From: nrav Date: Thu, 14 Jul 2022 11:46:14 +0200 Subject: [PATCH 4/5] fix: removed traling whitespaces in values.yaml --- sentry/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sentry/values.yaml b/sentry/values.yaml index 9d5014ce0..780ed9a0a 100644 --- a/sentry/values.yaml +++ b/sentry/values.yaml @@ -7,7 +7,7 @@ user: ## set this value to an existingSecret name to create the admin user with the password in the secret # existingSecret: sentry-admin-password - + ## set this value to an existingSecretKey which holds the password to be used for sentry admin user default key is `admin-password` # existingSecretKey: admin-password @@ -574,7 +574,7 @@ nginx: replicaCount: 1 service: type: ClusterIP - ports: + ports: http: 80 ## Use this to enable an extra service account # serviceAccount: @@ -750,7 +750,7 @@ kafka: socketRequestMaxBytes: "50000000" service: - ports: + ports: client: 9092 ## Use this to enable an extra service account From 348b086138e4741e4bf9475f4f8137c28a3cc73d Mon Sep 17 00:00:00 2001 From: nrav Date: Thu, 21 Jul 2022 13:18:43 +0200 Subject: [PATCH 5/5] chore: updated chart to 5.0.2 --- sentry/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml index d3fd5f5fb..e84c39163 100644 --- a/sentry/Chart.yaml +++ b/sentry/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: sentry description: A Helm chart for Kubernetes type: application -version: 15.0.1 +version: 15.0.2 appVersion: 22.6.0 dependencies: - name: redis