From c395737ed8e66fc19cab6ec5535d4a0a23fd031a Mon Sep 17 00:00:00 2001 From: ewelinagr Date: Mon, 20 Jan 2025 11:31:56 +0100 Subject: [PATCH] Remove unnecessary sentry helper variables, update sentry name and release. --- charts/app-config/templates/_helpers.tpl | 14 -------------- charts/app-config/templates/deployment.yaml | 4 ++-- charts/catalog-server/templates/_helpers.tpl | 14 -------------- charts/catalog-server/templates/deployment.yaml | 8 ++++---- .../data-dashboard-backend/templates/_helpers.tpl | 14 -------------- .../templates/deployment.yaml | 4 ++-- charts/management-portal/templates/_helpers.tpl | 14 -------------- charts/management-portal/templates/deployment.yaml | 4 ++-- charts/radar-appserver/templates/_helpers.tpl | 14 -------------- charts/radar-appserver/templates/deployment.yaml | 4 ++-- .../radar-fitbit-connector/templates/_helpers.tpl | 14 -------------- .../templates/deployment.yaml | 4 ++-- charts/radar-gateway/templates/_helpers.tpl | 14 -------------- charts/radar-gateway/templates/deployment.yaml | 4 ++-- charts/radar-jdbc-connector/templates/_helpers.tpl | 14 -------------- .../radar-jdbc-connector/templates/deployment.yaml | 4 ++-- charts/radar-oura-connector/templates/_helpers.tpl | 14 -------------- .../radar-oura-connector/templates/deployment.yaml | 4 ++-- charts/radar-output/templates/_helpers.tpl | 14 -------------- charts/radar-output/templates/deployment.yaml | 4 ++-- .../templates/_helpers.tpl | 14 -------------- .../templates/deployment.yaml | 4 ++-- .../templates/_helpers.tpl | 14 -------------- .../templates/deployment.yaml | 4 ++-- 24 files changed, 26 insertions(+), 194 deletions(-) diff --git a/charts/app-config/templates/_helpers.tpl b/charts/app-config/templates/_helpers.tpl index b00c96fd..9d770c68 100644 --- a/charts/app-config/templates/_helpers.tpl +++ b/charts/app-config/templates/_helpers.tpl @@ -98,17 +98,3 @@ Create the name of the service account to use {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "app-config.sentryName" -}} -{{- printf "%s" (include "app-config.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "app-config.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/app-config/templates/deployment.yaml b/charts/app-config/templates/deployment.yaml index 015e8f64..87f0dbab 100644 --- a/charts/app-config/templates/deployment.yaml +++ b/charts/app-config/templates/deployment.yaml @@ -90,9 +90,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "app-config.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "app-config.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "app-config.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/catalog-server/templates/_helpers.tpl b/charts/catalog-server/templates/_helpers.tpl index 8366ac0a..9d8fbb65 100644 --- a/charts/catalog-server/templates/_helpers.tpl +++ b/charts/catalog-server/templates/_helpers.tpl @@ -68,17 +68,3 @@ Create chart name and version as used by the chart label. {{- define "catalog-server.saslJaasConfig" -}} {{- printf "org.apache.kafka.common.security.plain.PlainLoginModule required username='%s' password='%s';" .apiKey .apiSecret | b64enc | quote -}} {{- end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "catalog-server.sentryName" -}} -{{- printf "%s" (include "catalog-server.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "catalog-server.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/catalog-server/templates/deployment.yaml b/charts/catalog-server/templates/deployment.yaml index f5e1148e..ac9120b0 100644 --- a/charts/catalog-server/templates/deployment.yaml +++ b/charts/catalog-server/templates/deployment.yaml @@ -94,9 +94,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "catalog-server.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "catalog-server.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "catalog-server.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} @@ -135,9 +135,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "catalog-server.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "catalog-server.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "catalog-server.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/data-dashboard-backend/templates/_helpers.tpl b/charts/data-dashboard-backend/templates/_helpers.tpl index b8113e08..6e29cd3b 100644 --- a/charts/data-dashboard-backend/templates/_helpers.tpl +++ b/charts/data-dashboard-backend/templates/_helpers.tpl @@ -85,17 +85,3 @@ Selector labels app.kubernetes.io/name: {{ include "data-dashboard-backend.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "data-dashboard-backend.sentryName" -}} -{{- printf "%s" (include "data-dashboard-backend.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "data-dashboard-backend.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/data-dashboard-backend/templates/deployment.yaml b/charts/data-dashboard-backend/templates/deployment.yaml index 30fddc27..e8d5f70e 100644 --- a/charts/data-dashboard-backend/templates/deployment.yaml +++ b/charts/data-dashboard-backend/templates/deployment.yaml @@ -80,9 +80,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "data-dashboard-backend.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "data-dashboard-backend.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "data-dashboard-backend.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/management-portal/templates/_helpers.tpl b/charts/management-portal/templates/_helpers.tpl index 34225068..19dd941a 100644 --- a/charts/management-portal/templates/_helpers.tpl +++ b/charts/management-portal/templates/_helpers.tpl @@ -86,17 +86,3 @@ Return true if a secret object should be created {{- true -}} {{- end -}} {{- end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "management-portal.sentryName" -}} -{{- printf "%s" (include "management-portal.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "management-portal.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/management-portal/templates/deployment.yaml b/charts/management-portal/templates/deployment.yaml index c114e93e..b80453aa 100644 --- a/charts/management-portal/templates/deployment.yaml +++ b/charts/management-portal/templates/deployment.yaml @@ -154,9 +154,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "management-portal.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "management-portal.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "management-portal.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/radar-appserver/templates/_helpers.tpl b/charts/radar-appserver/templates/_helpers.tpl index 0f19ad3f..3ec9c04a 100644 --- a/charts/radar-appserver/templates/_helpers.tpl +++ b/charts/radar-appserver/templates/_helpers.tpl @@ -86,17 +86,3 @@ Selector labels app.kubernetes.io/name: {{ include "radar-appserver.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "radar-appserver.sentryName" -}} -{{- printf "%s" (include "radar-appserver.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "radar-appserver.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/radar-appserver/templates/deployment.yaml b/charts/radar-appserver/templates/deployment.yaml index 1707ccf8..93314110 100644 --- a/charts/radar-appserver/templates/deployment.yaml +++ b/charts/radar-appserver/templates/deployment.yaml @@ -151,9 +151,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "radar-appserver.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "radar-appserver.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "radar-appserver.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/radar-fitbit-connector/templates/_helpers.tpl b/charts/radar-fitbit-connector/templates/_helpers.tpl index e1eb2c5a..ad15d239 100644 --- a/charts/radar-fitbit-connector/templates/_helpers.tpl +++ b/charts/radar-fitbit-connector/templates/_helpers.tpl @@ -64,17 +64,3 @@ Create chart name and version as used by the chart label. {{- define "radar-fitbit-connector.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "radar-fitbit-connector.sentryName" -}} -{{- printf "%s" (include "radar-fitbit-connector.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "radar-fitbit-connector.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/radar-fitbit-connector/templates/deployment.yaml b/charts/radar-fitbit-connector/templates/deployment.yaml index 107cf0d7..2f64ee2a 100644 --- a/charts/radar-fitbit-connector/templates/deployment.yaml +++ b/charts/radar-fitbit-connector/templates/deployment.yaml @@ -111,9 +111,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "radar-fitbit-connector.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "radar-fitbit-connector.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "radar-fitbit-connector.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/radar-gateway/templates/_helpers.tpl b/charts/radar-gateway/templates/_helpers.tpl index aa22f5a1..fb4de08c 100644 --- a/charts/radar-gateway/templates/_helpers.tpl +++ b/charts/radar-gateway/templates/_helpers.tpl @@ -64,17 +64,3 @@ Create chart name and version as used by the chart label. {{- define "radar-gateway.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "radar-gateway.sentryName" -}} -{{- printf "%s" (include "radar-gateway.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "radar-gateway.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/radar-gateway/templates/deployment.yaml b/charts/radar-gateway/templates/deployment.yaml index 175ec30a..b0762315 100644 --- a/charts/radar-gateway/templates/deployment.yaml +++ b/charts/radar-gateway/templates/deployment.yaml @@ -81,9 +81,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "radar-gateway.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "radar-gateway.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "radar-gateway.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/radar-jdbc-connector/templates/_helpers.tpl b/charts/radar-jdbc-connector/templates/_helpers.tpl index 90ca90bb..52181b93 100644 --- a/charts/radar-jdbc-connector/templates/_helpers.tpl +++ b/charts/radar-jdbc-connector/templates/_helpers.tpl @@ -76,17 +76,3 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- fail "Mode must be 'source' for JDBC source connector or 'sink' for JDBC sink connector."}} {{- end -}} {{- end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "radar-jdbc-connector.sentryName" -}} -{{- printf "%s" (include "radar-jdbc-connector.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "radar-jdbc-connector.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/radar-jdbc-connector/templates/deployment.yaml b/charts/radar-jdbc-connector/templates/deployment.yaml index 2ad83354..fd6e3d00 100644 --- a/charts/radar-jdbc-connector/templates/deployment.yaml +++ b/charts/radar-jdbc-connector/templates/deployment.yaml @@ -105,9 +105,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "radar-jdbc-connector.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "radar-jdbc-connector.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "radar-jdbc-connector.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/radar-oura-connector/templates/_helpers.tpl b/charts/radar-oura-connector/templates/_helpers.tpl index e2ed4374..271e4d38 100644 --- a/charts/radar-oura-connector/templates/_helpers.tpl +++ b/charts/radar-oura-connector/templates/_helpers.tpl @@ -64,17 +64,3 @@ Create chart name and version as used by the chart label. {{- define "radar-oura-connector.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "radar-oura-connector.sentryName" -}} -{{- printf "%s" (include "radar-oura-connector.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "radar-oura-connector.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/radar-oura-connector/templates/deployment.yaml b/charts/radar-oura-connector/templates/deployment.yaml index 36305513..f4cd055c 100644 --- a/charts/radar-oura-connector/templates/deployment.yaml +++ b/charts/radar-oura-connector/templates/deployment.yaml @@ -110,9 +110,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "radar-oura-connector.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "radar-oura-connector.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "radar-oura-connector.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/radar-output/templates/_helpers.tpl b/charts/radar-output/templates/_helpers.tpl index 1867052e..ed21f07e 100644 --- a/charts/radar-output/templates/_helpers.tpl +++ b/charts/radar-output/templates/_helpers.tpl @@ -86,17 +86,3 @@ Selector labels app.kubernetes.io/name: {{ include "radar-output.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "radar-output.sentryName" -}} -{{- printf "%s" (include "radar-output.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "radar-output.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/radar-output/templates/deployment.yaml b/charts/radar-output/templates/deployment.yaml index 430abeef..3495761e 100644 --- a/charts/radar-output/templates/deployment.yaml +++ b/charts/radar-output/templates/deployment.yaml @@ -141,9 +141,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "radar-output.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "radar-output.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "radar-output.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/radar-rest-sources-backend/templates/_helpers.tpl b/charts/radar-rest-sources-backend/templates/_helpers.tpl index efa8c9fb..f1e2cdfc 100644 --- a/charts/radar-rest-sources-backend/templates/_helpers.tpl +++ b/charts/radar-rest-sources-backend/templates/_helpers.tpl @@ -94,17 +94,3 @@ Return true if a secret object should be created {{- end -}} {{- end -}} {{ end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "radar-rest-sources-backend.sentryName" -}} -{{- printf "%s" (include "radar-rest-sources-backend.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "radar-rest-sources-backend.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/radar-rest-sources-backend/templates/deployment.yaml b/charts/radar-rest-sources-backend/templates/deployment.yaml index 5bba2fbb..4a8a9c4e 100644 --- a/charts/radar-rest-sources-backend/templates/deployment.yaml +++ b/charts/radar-rest-sources-backend/templates/deployment.yaml @@ -68,9 +68,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "radar-rest-sources-backend.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "radar-rest-sources-backend.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "radar-rest-sources-backend.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }} diff --git a/charts/radar-upload-source-connector/templates/_helpers.tpl b/charts/radar-upload-source-connector/templates/_helpers.tpl index ab7f0fb6..de074550 100644 --- a/charts/radar-upload-source-connector/templates/_helpers.tpl +++ b/charts/radar-upload-source-connector/templates/_helpers.tpl @@ -64,17 +64,3 @@ Create chart name and version as used by the chart label. {{- define "radar-upload-source-connector.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} - -{{/* -Service name to be used by Sentry -*/}} -{{- define "radar-upload-source-connector.sentryName" -}} -{{- printf "%s" (include "radar-upload-source-connector.fullname" .) -}} -{{- end -}} - -{{/* -App release to be used by Sentry -*/}} -{{- define "radar-upload-source-connector.sentryRelease" -}} -{{- printf "%s" .Chart.AppVersion -}} -{{- end -}} diff --git a/charts/radar-upload-source-connector/templates/deployment.yaml b/charts/radar-upload-source-connector/templates/deployment.yaml index 61fdb7e6..93476879 100644 --- a/charts/radar-upload-source-connector/templates/deployment.yaml +++ b/charts/radar-upload-source-connector/templates/deployment.yaml @@ -105,9 +105,9 @@ spec: value: {{ .Values.sentry.stacktrace.packages}} {{- end }} - name: SENTRY_NAME - value: {{ include "radar-upload-source-connector.sentryName" . }} + value: {{ .Values.sentry.service.name | default (include "radar-upload-source-connector.fullname" .) }} - name: SENTRY_RELEASE - value: {{ include "radar-upload-source-connector.sentryRelease" . }} + value: {{ .Values.sentry.service.release | default (printf "%s-%s" .Chart.Version .Chart.AppVersion) }} - name: SENTRY_ENVIRONMENT value: {{ .Values.sentry.service.environment }} {{- else }}