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

Jump to bottom

SOPS: add support for Azure Key Vault credentials using SecretRef #495

Merged
merged 7 commits into from
Mar 14, 2022
Merged

SOPS: add support for Azure Key Vault credentials using SecretRef #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
343f937
sops/azkv: support for credentials via SecretRef
dquagebeur Nov 19, 2021
a72e687
sops/azkv: refactor initial Azure Keyvault impl
hiddeco Dec 7, 2021
f67efe0
sops/azkv: configure retry and throttle on client
hiddeco Jan 12, 2022
369193e
sops/azkv: update to SDK including azidentity
hiddeco Mar 3, 2022
02343b0
sops/azkv: support fields from `az` generated SP
hiddeco Mar 4, 2022
6876a1e
sops/azkv: support YAML Azure authentication files
hiddeco Mar 9, 2022
9f76861
Document SOPS Azure Key Vault in spec
hiddeco Mar 11, 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
23 changes: 18 additions & 5 deletions controllers/kustomization_decryptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
"sigs.k8s.io/yaml"

kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
"github.com/fluxcd/kustomize-controller/internal/sops/azkv"
intkeyservice "github.com/fluxcd/kustomize-controller/internal/sops/keyservice"
)

Expand All @@ -50,14 +51,18 @@ const (
DecryptionProviderSOPS = "sops"
// DecryptionVaultTokenFileName is the name of the file containing the Vault token
DecryptionVaultTokenFileName = "sops.vault-token"
// DecryptionAzureAuthFile is the Azure authentication file
DecryptionAzureAuthFile = "sops.azure-kv"
)

type KustomizeDecryptor struct {
client.Client
kustomization kustomizev1.Kustomization
homeDir string
ageIdentities []string
vaultToken string

kustomization kustomizev1.Kustomization
homeDir string
ageIdentities []string
vaultToken string
azureAADConfig *azkv.AADConfig
}

func NewDecryptor(kubeClient client.Client,
Expand Down Expand Up @@ -155,6 +160,14 @@ func (kd *KustomizeDecryptor) ImportKeys(ctx context.Context) error {
var ageIdentities []string
var vaultToken string
for name, value := range secret.Data {
if name == DecryptionAzureAuthFile {
azureConf := azkv.AADConfig{}
if err = azkv.LoadAADConfigFromBytes(value, &azureConf); err != nil {
return err
}
kd.azureAADConfig = &azureConf
continue
}
switch filepath.Ext(name) {
case ".asc":
keyPath, err := securejoin.SecureJoin(tmpDir, name)
Expand Down Expand Up @@ -272,7 +285,7 @@ func (kd KustomizeDecryptor) DataWithFormat(data []byte, inputFormat, outputForm

metadataKey, err := tree.Metadata.GetDataKeyWithKeyServices(
[]keyservice.KeyServiceClient{
intkeyservice.NewLocalClient(intkeyservice.NewServer(false, kd.homeDir, kd.vaultToken, kd.ageIdentities)),
intkeyservice.NewLocalClient(intkeyservice.NewServer(false, kd.homeDir, kd.vaultToken, kd.ageIdentities, kd.azureAADConfig)),
},
)
if err != nil {
Expand Down
Loading