Skip to content

Commit

Permalink
fix: Ident podLabels on deployments (#3153)
Browse files Browse the repository at this point in the history 
Signed-off-by: Joao Pedro Silva <jp.silva15@gmail.com>
Co-authored-by: Rita Zhang <rita.z.zhang@gmail.com>
  • Loading branch information
@joaosilva15 @ritazh
joaosilva15 and ritazh committed Nov 28, 2023
1 parent 6276cb2 commit 5db70c1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmd/build/helmify/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (ks *kindSet) Write() error {
}

if kind == DeploymentKind {
obj = strings.Replace(obj, " labels:", " labels:\n{{- include \"gatekeeper.podLabels\" . }}", 1)
obj = strings.Replace(obj, " labels:", " labels:\n{{- include \"gatekeeper.podLabels\" . | nindent 8 }}", 1)
}

if name == "gatekeeper-manager-role" && kind == "Role" {
Expand Down
2 changes: 1 addition & 1 deletion manifest_staging/charts/gatekeeper/templates/gatekeeper-audit-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
{{- toYaml .Values.auditPodAnnotations | trim | nindent 8 }}
{{- end }}
labels:
{{- include "gatekeeper.podLabels" . }}
{{- include "gatekeeper.podLabels" . | nindent 8 }}
app: '{{ template "gatekeeper.name" . }}'
chart: '{{ template "gatekeeper.name" . }}'
control-plane: audit-controller
Expand Down
2 changes: 1 addition & 1 deletion manifest_staging/charts/gatekeeper/templates/gatekeeper-controller-manager-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
{{- toYaml .Values.podAnnotations | trim | nindent 8 }}
{{- end }}
labels:
{{- include "gatekeeper.podLabels" . }}
{{- include "gatekeeper.podLabels" . | nindent 8 }}
app: '{{ template "gatekeeper.name" . }}'
chart: '{{ template "gatekeeper.name" . }}'
control-plane: controller-manager
Expand Down

3 comments on commit 5db70c1

@zestrells
Copy link

@zestrells zestrells commented on 5db70c1 Nov 28, 2023 •
edited

Choose a reason for hiding this comment

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

@ritazh When do we think this is getting released? We just hit this limitation and is now a breaking issue for us. Appreciate the answer/ help in advance 🙏🏽

@joaosilva15
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@zestrells I'm not a maintainer so I do not know 😅

@ritazh
Copy link
Member

@ritazh ritazh commented on 5db70c1 Nov 29, 2023

Choose a reason for hiding this comment

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

@ritazh When do we think this is getting released? We just hit this limitation and is now a breaking issue for us. Appreciate the answer/ help in advance 🙏🏽

This should be part of the next release 3.15, targeted for end of Jan https://github.com/open-policy-agent/gatekeeper/milestone/26

Please sign in to comment.