mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-10 00:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: add support for VAULT_SKIP_VERIFY in KMS ConfigMap

Browse Source 
When the KMS VaultTokens is configured through a Kubernetens ConfigMap,
the `VAULT_SKIP_VERIFY` option was not taken into account. The option
maps to the `vaultCAVerify` value in the configuration file, but has the
reverse meaning.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-01-29 09:30:04 +01:00 committed by mergify[bot]
parent d480eb4bda
commit df81022349
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/util/vault_tokens.go
View File

@ -62,6 +62,7 @@ type standardVault struct {
VaultClientCert string `json:"VAULT_CLIENT_CERT"` VaultClientCert string `json:"VAULT_CLIENT_CERT"`
VaultClientKey string `json:"VAULT_CLIENT_KEY"` VaultClientKey string `json:"VAULT_CLIENT_KEY"`
VaultNamespace string `json:"VAULT_NAMESPACE"` VaultNamespace string `json:"VAULT_NAMESPACE"`
VaultSkipVerify *bool `json:"VAULT_SKIP_VERIFY"`
} }
type vaultTokenConf struct { type vaultTokenConf struct {
@ -73,6 +74,7 @@ type vaultTokenConf struct {
VaultClientCertFromSecret string `json:"vaultClientCertFromSecret"` VaultClientCertFromSecret string `json:"vaultClientCertFromSecret"`
VaultClientCertKeyFromSecret string `json:"vaultClientCertKeyFromSecret"` VaultClientCertKeyFromSecret string `json:"vaultClientCertKeyFromSecret"`
VaultNamespace string `json:"vaultNamespace"` VaultNamespace string `json:"vaultNamespace"`
VaultCAVerify bool `json:"vaultCAVerify"`
} }
func (v *vaultTokenConf) convertStdVaultToCSIConfig(s *standardVault) { func (v *vaultTokenConf) convertStdVaultToCSIConfig(s *standardVault) {
@ -84,6 +86,13 @@ func (v *vaultTokenConf) convertStdVaultToCSIConfig(s *standardVault) {
v.VaultClientCertKeyFromSecret = s.VaultClientKey v.VaultClientCertKeyFromSecret = s.VaultClientKey
v.VaultNamespace = s.VaultNamespace v.VaultNamespace = s.VaultNamespace
v.VaultTLSServerName = s.VaultTLSServerName v.VaultTLSServerName = s.VaultTLSServerName
// by default the CA should get verified, only when VaultSkipVerify is
// set, verification should be disabled
v.VaultCAVerify = true
if s.VaultSkipVerify != nil {
v.VaultCAVerify = *s.VaultSkipVerify
}
} }
// getVaultConfiguration fetches the vault configuration from the kubernetes // getVaultConfiguration fetches the vault configuration from the kubernetes