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

rbd: store VaultCAVerify as a string

Browse Source 
storing VaultCAVerify as a string.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2021-02-03 18:12:17 +05:30 committed by mergify[bot]
parent bf5c36822f
commit f63ccb0cce
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/util/vault_tokens.go
View File

@ -22,6 +22,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"os" "os"
"strconv"
"github.com/hashicorp/vault/api" "github.com/hashicorp/vault/api"
loss "github.com/libopenstorage/secrets" loss "github.com/libopenstorage/secrets"
@ -74,7 +75,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"` VaultCAVerify string `json:"vaultCAVerify"`
} }
func (v *vaultTokenConf) convertStdVaultToCSIConfig(s *standardVault) { func (v *vaultTokenConf) convertStdVaultToCSIConfig(s *standardVault) {
@ -89,9 +90,9 @@ func (v *vaultTokenConf) convertStdVaultToCSIConfig(s *standardVault) {
// by default the CA should get verified, only when VaultSkipVerify is // by default the CA should get verified, only when VaultSkipVerify is
// set, verification should be disabled // set, verification should be disabled
v.VaultCAVerify = true v.VaultCAVerify = "true"
if s.VaultSkipVerify != nil { if s.VaultSkipVerify != nil {
v.VaultCAVerify = *s.VaultSkipVerify v.VaultCAVerify = strconv.FormatBool(*s.VaultSkipVerify)
} }
} }