Skip to content

NET-5389- Remove global.acls.nodeSelector and global.acls.annotations from Gateway Resources Jobs #2869

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

Merged
sophie-gairo merged 3 commits into from
Sep 1, 2023
Merged

NET-5389- Remove global.acls.nodeSelector and global.acls.annotations from Gateway Resources Jobs #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc3b0d6
Remove and from Gateway Resources Jobs
sophie-gairo Aug 29, 2023
d40e81b
changelog
sophie-gairo Aug 30, 2023
a515c7d
Remove acl annotations from gateway resources unit tests
sophie-gairo Aug 30, 2023
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
3 changes: 3 additions & 0 deletions .changelog/2869.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
bug: Remove `global.acls.nodeSelector` and `global.acls.annotations` from Gateway Resources Jobs
```
7 changes: 0 additions & 7 deletions charts/consul/templates/gateway-cleanup-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ spec:
{{- end }}
annotations:
"consul.hashicorp.com/connect-inject": "false"
{{- if .Values.global.acls.annotations }}
{{- tpl .Values.global.acls.annotations . | nindent 8 }}
{{- end }}
spec:
restartPolicy: Never
serviceAccountName: {{ template "consul.fullname" . }}-gateway-cleanup
Expand All @@ -58,8 +55,4 @@ spec:
tolerations:
{{ tpl .Values.global.acls.tolerations . | indent 8 | trim }}
{{- end }}
{{- if .Values.global.acls.nodeSelector }}
nodeSelector:
{{ tpl .Values.global.acls.nodeSelector . | indent 8 | trim }}
{{- end }}
{{- end }}
7 changes: 0 additions & 7 deletions charts/consul/templates/gateway-resources-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ spec:
{{- end }}
annotations:
"consul.hashicorp.com/connect-inject": "false"
{{- if .Values.global.acls.annotations }}
{{- tpl .Values.global.acls.annotations . | nindent 8 }}
{{- end }}
spec:
restartPolicy: Never
serviceAccountName: {{ template "consul.fullname" . }}-gateway-resources
Expand Down Expand Up @@ -119,10 +116,6 @@ spec:
tolerations:
{{ tpl .Values.global.acls.tolerations . | indent 8 | trim }}
{{- end }}
{{- if .Values.global.acls.nodeSelector }}
nodeSelector:
{{ tpl .Values.global.acls.nodeSelector . | indent 8 | trim }}
{{- end }}
volumes:
- name: config
configMap:
Expand Down
10 changes: 0 additions & 10 deletions charts/consul/test/unit/gateway-cleanup-job.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,3 @@ target=templates/gateway-cleanup-job.yaml
yq -r '.spec.template.metadata.annotations | del(."consul.hashicorp.com/connect-inject") | del(."consul.hashicorp.com/config-checksum")' | tee /dev/stderr)
[ "${actual}" = "{}" ]
}

@test "gatewaycleanup/Job: annotations can be set" {
cd `chart_dir`
local actual=$(helm template \
-s $target \
--set 'global.acls.annotations=foo: bar' \
. | tee /dev/stderr |
yq -r '.spec.template.metadata.annotations.foo' | tee /dev/stderr)
[ "${actual}" = "bar" ]
}
10 changes: 0 additions & 10 deletions charts/consul/test/unit/gateway-resources-job.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,3 @@ target=templates/gateway-resources-job.yaml
yq -r '.spec.template.metadata.annotations | del(."consul.hashicorp.com/connect-inject") | del(."consul.hashicorp.com/config-checksum")' | tee /dev/stderr)
[ "${actual}" = "{}" ]
}

@test "gatewayresources/Job: annotations can be set" {
cd `chart_dir`
local actual=$(helm template \
-s $target \
--set 'global.acls.annotations=foo: bar' \
. | tee /dev/stderr |
yq -r '.spec.template.metadata.annotations.foo' | tee /dev/stderr)
[ "${actual}" = "bar" ]
}