Skip to content

Backport of Update vault ca provider namespace configuration into release/1.14.x#19125

Closed
hc-github-team-consul-core wants to merge 0 commit intorelease/1.14.xfrom
backport/cthain/net-5807/vault-ca-namespace-config/heavily-rested-donkey
Closed

Backport of Update vault ca provider namespace configuration into release/1.14.x#19125
hc-github-team-consul-core wants to merge 0 commit intorelease/1.14.xfrom
backport/cthain/net-5807/vault-ca-namespace-config/heavily-rested-donkey

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #19095 to be assessed for backporting due to the inclusion of the label backport/1.14.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@cthain
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

This PR fixes the regression described in #19051. The Vault CA provider has been updated to only set the namespace on the Vault client if it is not empty, otherwise it falls back to the base namespace configured for the provider.

Testing & Reproduction steps

A new unit test TestVaultCAProvider_EnterpriseNamespace has been created to exercise the update. This requires a local Vault Enterprise binary and license to run, otherwise the test will automatically be skipped.

$ vault version
Vault v1.15.0+ent (d3729711f875a9dedea802079cd7f0e4b1d6e8d5), built 2023-09-22T21:04:53Z
$ export VAULT_LICENSE=$(cat /path/to/vault.license)
$ go test ./agent/connect/ca -run '^TestVaultCAProvider_EnterpriseNamespace$'
ok  	github.com/hashicorp/consul/agent/connect/ca	1.916s

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/cthain/net-5807/vault-ca-namespace-config/heavily-rested-donkey branch from 129d7fa to 020fffa Compare October 10, 2023 13:53
@hashicorp-cla
Copy link

hashicorp-cla commented Oct 10, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@cthain cthain closed this Oct 11, 2023
@cthain cthain force-pushed the backport/cthain/net-5807/vault-ca-namespace-config/heavily-rested-donkey branch from aff8f6c to 020fffa Compare October 11, 2023 15:48
@cthain
Copy link
Contributor

cthain commented Oct 11, 2023

See #19148

@github-actions github-actions bot deleted the backport/cthain/net-5807/vault-ca-namespace-config/heavily-rested-donkey branch August 29, 2025 06:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants