Skip to content
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

Allow the consul namespace to be a destination. #1163

Merged
merged 2 commits into from
Apr 13, 2022
Merged

Allow the consul namespace to be a destination. #1163

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
6f20167
Allow the consul namespace to be a destination.
lkysow Apr 13, 2022
665f981
changelog
lkysow Apr 13, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ BUG FIXES:
IMPROVEMENTS:
* Helm
* API Gateway: Allow controller to read ReferencePolicy in order to determine if route is allowed for backend in different namespace. [[GH-1148](https://github.com/hashicorp/consul-k8s/pull/1148)]
* Allow `consul` to be a destination namespace. [[GH-1163](https://github.com/hashicorp/consul-k8s/pull/1163)]

## 0.42.0 (April 04, 2022)

Expand Down
2 changes: 1 addition & 1 deletion charts/consul/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Usage: {{ template "consul.reservedNamesFailer" (list .Values.key "key") }}
{{- define "consul.reservedNamesFailer" -}}
{{- $name := index . 0 -}}
{{- $key := index . 1 -}}
{{- if or (eq "system" $name) (eq "universal" $name) (eq "consul" $name) (eq "operator" $name) (eq "root" $name) }}
{{- if or (eq "system" $name) (eq "universal" $name) (eq "operator" $name) (eq "root" $name) }}
{{- fail (cat "The name" $name "set for key" $key "is reserved by Consul for future use." ) }}
{{- end }}
{{- end -}}
4 changes: 0 additions & 4 deletions charts/consul/test/unit/connect-inject-deployment.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1926,10 +1926,6 @@ EOF
reservedNameTest "universal"
}

@test "connectInject/Deployment: fails when consulDestinationNamespace=consul" {
reservedNameTest "consul"
}

@test "connectInject/Deployment: fails when consulDestinationNamespace=operator" {
reservedNameTest "operator"
}
Expand Down
4 changes: 0 additions & 4 deletions charts/consul/test/unit/partition-init-job.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,6 @@ load _helpers
reservedNameTest "universal"
}

@test "partitionInit/Job: fails when adminPartitions.name=consul" {
reservedNameTest "consul"
}

@test "partitionInit/Job: fails when adminPartitions.name=operator" {
reservedNameTest "operator"
}
Expand Down
4 changes: 0 additions & 4 deletions charts/consul/test/unit/sync-catalog-deployment.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,10 +1358,6 @@ load _helpers
reservedNameTest "universal"
}

@test "syncCatalog/Deployment: fails when consulDestinationNamespace=consul" {
reservedNameTest "consul"
}

@test "syncCatalog/Deployment: fails when consulDestinationNamespace=operator" {
reservedNameTest "operator"
}
Expand Down