Skip to content

[BUG] - Modified labels and annotations logic for deployments #485

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

Open
tyu0912 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[BUG] - Modified labels and annotations logic for deployments #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c8c12e
update
tyu0912 Jul 23, 2025
e8a5c61
modify all deployment type labels and annotation logic
tyu0912 Jul 23, 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
10 changes: 5 additions & 5 deletions reportportal/templates/service-api/api-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ spec:
template:
metadata:
labels:
{{- range $key, $value := .Values.serviceapi.podLabels }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceapi.podLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
component: {{ include "reportportal.fullname" . }}-api
component: { { include "reportportal.fullname" . } }-api
annotations:
{{- range $key, $value := .Values.serviceapi.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceapi.podAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.serviceapi.affinity }}
Expand Down
10 changes: 5 additions & 5 deletions reportportal/templates/service-authorization/uat-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ spec:
template:
metadata:
labels:
{{- range $key, $value := .Values.uat.podLabels }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.uat.podLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
component: {{ include "reportportal.fullname" . }}-uat
component: { { include "reportportal.fullname" . } }-uat
annotations:
{{- range $key, $value := .Values.uat.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.uat.podAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.uat.affinity }}
Expand Down
10 changes: 5 additions & 5 deletions reportportal/templates/service-index/index-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ spec:
template:
metadata:
labels:
{{- range $key, $value := .Values.serviceindex.podLabels }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceindex.podLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
component: {{ include "reportportal.fullname" . }}-index
component: { { include "reportportal.fullname" . } }-index
annotations:
{{- range $key, $value := .Values.serviceindex.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceindex.podAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.serviceindex.affinity }}
Expand Down
10 changes: 5 additions & 5 deletions reportportal/templates/service-jobs/jobs-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ spec:
template:
metadata:
labels:
{{- range $key, $value := .Values.servicejobs.podLabels }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.servicejobs.podLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
component: {{ include "reportportal.fullname" . }}-jobs
component: { { include "reportportal.fullname" . } }-jobs
annotations:
{{- range $key, $value := .Values.servicejobs.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.servicejobs.podAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.servicejobs.affinity }}
Expand Down
10 changes: 5 additions & 5 deletions reportportal/templates/service-migrations/migrations-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ spec:
template:
metadata:
labels:
{{- range $key, $value := .Values.migrations.podLabels }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.migrations.podLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
component: {{ include "reportportal.fullname" . }}-migrations
annotations:
{{- range $key, $value := .Values.migrations.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.migrations.podAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
restartPolicy: OnFailure
Expand Down Expand Up @@ -89,6 +89,6 @@ spec:
{{ toYaml .Values.migrations.securityContext | indent 8}}
serviceAccountName: {{ .Values.migrations.serviceAccountName | default (include "reportportal.serviceAccountName" .) }}
{{- with .Values.tolerations }}
tolerations:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
10 changes: 5 additions & 5 deletions reportportal/templates/service-ui/ui-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ spec:
template:
metadata:
labels:
{{- range $key, $value := .Values.serviceui.podLabels }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceui.podLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
component: {{ include "reportportal.fullname" . }}-ui
component: { { include "reportportal.fullname" . } }-ui
annotations:
{{- range $key, $value := .Values.serviceui.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceui.podAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.serviceui.affinity }}
Expand Down
10 changes: 5 additions & 5 deletions reportportal/templates/statefullset-auto-analyzer/analyzer-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ spec:
template:
metadata:
labels:
{{- range $key, $value := .Values.serviceanalyzer.podLabels }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceanalyzer.podLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
component: {{ include "reportportal.fullname" . }}-analyzer
component: { { include "reportportal.fullname" . } }-analyzer
annotations:
{{- range $key, $value := .Values.serviceanalyzer.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceanalyzer.podAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.serviceanalyzer.affinity }}
Expand Down
10 changes: 5 additions & 5 deletions reportportal/templates/statefullset-auto-analyzer/analyzertrain-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ spec:
template:
metadata:
labels:
{{- range $key, $value := .Values.serviceanalyzertrain.podLabels }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceanalyzertrain.podLabels }}
{{- toYaml . | nindent 4 }}
Copy link

Copilot AI Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nindent value of 4 may not provide proper indentation for labels in YAML. Labels should typically be indented to align with the 'labels:' key, which would require 8 spaces based on the visible indentation structure.

Suggested change
{{- toYaml . | nindent 4 }}
{{- toYaml . | nindent 8 }}

Copilot uses AI. Check for mistakes.
{{- end }}
component: {{ include "reportportal.fullname" . }}-analyzer-train
component: { { include "reportportal.fullname" . } }-analyzer-train
annotations:
{{- range $key, $value := .Values.serviceanalyzertrain.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- with .Values.serviceanalyzertrain.podAnnotations }}
{{- toYaml . | nindent 4 }}
Copy link

Copilot AI Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nindent value of 4 may not provide proper indentation for annotations in YAML. Annotations should typically be indented to align with the 'annotations:' key, which would require 8 spaces based on the visible indentation structure.

Suggested change
{{- toYaml . | nindent 4 }}
{{- toYaml . | nindent 8 }}

Copilot uses AI. Check for mistakes.
{{- end }}
spec:
{{- with .Values.serviceanalyzertrain.affinity }}
Expand Down