mirrors/external-secrets
1
0
Fork 0
mirror of https://github.com/external-secrets/external-secrets.git synced 2024-12-15 17:51:01 +00:00
Code Activity

Solved merge conflict

Browse source
This commit is contained in:
Sebastian Gomez 2022-01-27 16:51:10 -05:00
parent 43e4eb320a
commit 0ef6d147d6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/controllers/externalsecret/externalsecret_controller_test.go
View file

@ -666,9 +666,11 @@ var _ = Describe("ExternalSecret controller", func() {
"bar": []byte("2222"),
}, nil)
tc.externalSecret.Spec.Data = []esv1alpha1.ExternalSecretData{}
tc.externalSecret.Spec.DataFrom = []esv1alpha1.ExternalSecretDataRemoteRef{
tc.externalSecret.Spec.DataFrom = []esv1alpha1.ExternalSecretDataFromRemoteRef{
{
Key: remoteKey,
Extract: esv1alpha1.ExternalSecretExtract{
Key: remoteKey,
},
},
}
tc.externalSecret.Spec.RefreshInterval = &metav1.Duration{Duration: time.Second}
@ -706,9 +708,11 @@ var _ = Describe("ExternalSecret controller", func() {
}, nil)
tc.externalSecret.Spec.Target.Template = &esv1alpha1.ExternalSecretTemplate{}
tc.externalSecret.Spec.Data = []esv1alpha1.ExternalSecretData{}
tc.externalSecret.Spec.DataFrom = []esv1alpha1.ExternalSecretDataRemoteRef{
tc.externalSecret.Spec.DataFrom = []esv1alpha1.ExternalSecretDataFromRemoteRef{
{
Key: remoteKey,
Extract: esv1alpha1.ExternalSecretExtract{
Key: remoteKey,
},
},
}
tc.externalSecret.Spec.RefreshInterval = &metav1.Duration{Duration: time.Second}