mirrors/external-secrets
1
0
Fork 0
mirror of https://github.com/external-secrets/external-secrets.git synced 2024-12-14 11:57:59 +00:00
Code Activity

fixing label limits (#2645)

Browse source 
Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>
This commit is contained in:
Gustavo Fernandes de Carvalho 2023-08-23 13:16:16 -03:00 committed by GitHub
parent 0334c2801c
commit 77a70d08fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/controllers/externalsecret/externalsecret_controller.go
View file

@ -276,7 +276,8 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
return fmt.Errorf(errApplyTemplate, err)
}
if externalSecret.Spec.Target.CreationPolicy == esv1beta1.CreatePolicyOwner {
secret.Labels[esv1beta1.LabelOwner] = fmt.Sprintf("%v_%v", externalSecret.Namespace, externalSecret.Name)
lblValue := utils.ObjectHash(fmt.Sprintf("%v/%v", externalSecret.Namespace, externalSecret.Name))
secret.Labels[esv1beta1.LabelOwner] = lblValue
}
return nil
@ -339,10 +340,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
func deleteOrphanedSecrets(ctx context.Context, cl client.Client, externalSecret *esv1beta1.ExternalSecret) error {
secretList := v1.SecretList{}
label := fmt.Sprintf("%v_%v", externalSecret.ObjectMeta.Namespace, externalSecret.ObjectMeta.Name)
lblValue := utils.ObjectHash(fmt.Sprintf("%v/%v", externalSecret.Namespace, externalSecret.Name))
ls := &metav1.LabelSelector{
MatchLabels: map[string]string{
esv1beta1.LabelOwner: label,
esv1beta1.LabelOwner: lblValue,
},
}
labelSelector, err := metav1.LabelSelectorAsSelector(ls)

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

@ -58,8 +58,9 @@ var (
)
type testCase struct {
secretStore esv1beta1.GenericStore
externalSecret *esv1beta1.ExternalSecret
secretStore esv1beta1.GenericStore
externalSecret *esv1beta1.ExternalSecret
targetSecretName string
// checkCondition should return true if the externalSecret
// has the expected condition
@ -217,6 +218,7 @@ var _ = Describe("ExternalSecret controller", Serial, func() {
makeDefaultTestcase := func() *testCase {
return &testCase{
// default condition: es should be ready
targetSecretName: ExternalSecretTargetSecretName,
checkCondition: func(es *esv1beta1.ExternalSecret) bool {
cond := GetExternalSecretCondition(es.Status, esv1beta1.ExternalSecretReady)
if cond == nil || cond.Status != v1.ConditionTrue {
@ -277,7 +279,15 @@ var _ = Describe("ExternalSecret controller", Serial, func() {
Expect(es.Status.Binding.Name).To(Equal(secret.ObjectMeta.Name))
}
}
// if target Secret name is not specified it should use the ExternalSecret name.
syncBigNames := func(tc *testCase) {
tc.targetSecretName = "this-is-a-very-big-secret-name-that-wouldnt-be-generated-due-to-label-limits"
tc.externalSecret.Spec.Target.Name = "this-is-a-very-big-secret-name-that-wouldnt-be-generated-due-to-label-limits"
tc.checkSecret = func(es *esv1beta1.ExternalSecret, secret *v1.Secret) {
// check binding secret on external secret
Expect(es.Status.Binding.Name).To(Equal(tc.externalSecret.Spec.Target.Name))
}
}
// the secret name is reflected on the external secret's status as the binding secret
syncBindingSecret := func(tc *testCase) {
tc.checkSecret = func(es *esv1beta1.ExternalSecret, secret *v1.Secret) {
@ -2041,7 +2051,7 @@ var _ = Describe("ExternalSecret controller", Serial, func() {
if tc.checkSecret != nil {
syncedSecret := &v1.Secret{}
secretLookupKey := types.NamespacedName{
Name: ExternalSecretTargetSecretName,
Name: tc.targetSecretName,
Namespace: ExternalSecretNamespace,
}
if createdES.Spec.Target.Name == "" {
@ -2062,6 +2072,7 @@ var _ = Describe("ExternalSecret controller", Serial, func() {
Entry("es deletes orphaned secrets", deleteOrphanedSecrets),
Entry("should refresh when the hash annotation doesn't correspond to secret data", checkSecretDataHashAnnotationChange),
Entry("should use external secret name if target secret name isn't defined", syncWithoutTargetName),
Entry("should sync to target secrets with naming bigger than 63 characters", syncBigNames),
Entry("should expose the secret as a provisioned service binding secret", syncBindingSecret),
Entry("should not expose a provisioned service when no secret is synced", skipBindingSecret),
Entry("should set the condition eventually", syncLabelsAnnotations),