Skip to content

Add option to disable removeRootsFromChain #1082

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+33 −1
Open

Add option to disable removeRootsFromChain #1082

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
0a71607
Add removeRootsFromChain option
mbauer-dilt Jun 26, 2025
f0c86c8
Add test for removeRootsFromChain
mbauer-dilt Jun 26, 2025
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
4 changes: 3 additions & 1 deletion api/v1beta1/vaultpkisecret_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ type VaultPKISecretSpec struct {
// ExcludeCNFromSans from DNS or Email Subject Alternate Names.
// Default: false
ExcludeCNFromSans bool `json:"excludeCNFromSans,omitempty"`
// +kubebuilder:default=true
RemoveRootsFromChain bool `json:"removeRootsFromChain,omitempty"`
}

// VaultPKISecretStatus defines the observed state of VaultPKISecret
Expand Down Expand Up @@ -163,7 +165,7 @@ func (v *VaultPKISecret) GetIssuerAPIData() map[string]interface{} {
"ttl": v.Spec.TTL,
"not_after": v.Spec.NotAfter,
"exclude_cn_from_sans": v.Spec.ExcludeCNFromSans,
"remove_roots_from_chain": true,
"remove_roots_from_chain": v.Spec.RemoveRootsFromChain,
}

if v.Spec.Format != "" {
Expand Down
30 changes: 30 additions & 0 deletions api/v1beta1/vaultpkisecret_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,36 @@ func TestVaultPKISecret_GetIssuerAPIData(t *testing.T) {
"remove_roots_from_chain": true,
},
},
{
name: "remove-roots-false",
spec: VaultPKISecretSpec{
CommonName: "qux",
AltNames: []string{"foo", "baz"},
IPSans: []string{"buz", "qux"},
URISans: []string{"*.foo.net", "*.baz.net"},
OtherSans: []string{"other1", "other2"},
UserIDs: []string{"12345", "67890"},
TTL: "30s",
NotAfter: "2026-05-01T00:00:00Z",
Format: "pem",
PrivateKeyFormat: "rsa",
RemoveRootsFromChain: false,
},
want: map[string]interface{}{
"common_name": "qux",
"alt_names": "foo,baz",
"ip_sans": "buz,qux",
"uri_sans": "*.foo.net,*.baz.net",
"other_sans": "other1,other2",
"user_ids": "12345,67890",
"ttl": "30s",
"not_after": "2026-05-01T00:00:00Z",
"exclude_cn_from_sans": false,
"format": "pem",
"private_key_format": "rsa",
"remove_roots_from_chain": false,
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
Loading