Fix duplicate NGINX labels
What does this MR do?
Fix duplicate NGINX labels
Removes the 'selectorLabels' template from the normal NGINX 'labels' template, which was leading to duplication.
This was an unintentional change from !2267 (merged).
Related issues
Closes #3058 (closed)
Checklist
See Definition of done.
For anything in this list which will not be completed, please provide a reason in the MR discussion.
Required
-
Merge Request Title and Description are up to date, accurate, and descriptive -
MR targeting the appropriate branch -
MR has a green pipeline on GitLab.com
Expected (please provide an explanation if not completing)
-
Test plan indicating conditions for success has been posted and passes -
Documentation created/updated -
Tests added -
Integration tests added to GitLab QA -
Equivalent MR/issue for omnibus-gitlab opened
Closes #3058 (closed)
Merge request reports
Activity
changed milestone to %14.7
added devopssystems groupdistribution sectioncore platform typebug labels
assigned to @mnielsen
added Pick into 14.6 label
added workflowready for review label
/cc @WarheadsSE FYI - another fixup from !2267 (merged).
Confirmed, at v5.6.0.
# Source: gitlab/charts/nginx-ingress/templates/controller-deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: labels: app: nginx-ingress chart: nginx-ingress-4.0.6 release: gitlab heritage: Helm component: "controller" helm.sh/chart: nginx-ingress-4.0.6 app: nginx-ingress release: gitlab app.kubernetes.io/version: "1.0.4" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller
# Source: gitlab/charts/nginx-ingress/templates/controller-deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: labels: app: nginx-ingress chart: nginx-ingress-4.0.6 release: RELEASE-NAME heritage: Helm component: "controller" helm.sh/chart: nginx-ingress-4.0.6 app.kubernetes.io/version: "1.0.4" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller
Edited by Jason Plumadded workflowin review label and removed workflowready for review label
requested review from @WarheadsSE
mentioned in commit c11b6624
picked the changes into the branch
cherry-pick-c11b6624
with commit 990152dcmentioned in commit 990152dc
mentioned in merge request !2329 (merged)
mentioned in issue #3058 (closed)
removed Pick into 14.6 label