Skip to content

Commit 20751fa

Browse files
authored
fix(apps): allow unpinned referenced account secrets (#10810)
1 parent 4180a61 commit 20751fa

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

controllers/apps/component/transformer_component_account.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ func (t *componentAccountTransformer) getPasswordFromSecret(transCtx *componentT
200200
if err := transCtx.GetClient().Get(transCtx.GetContext(), secretKey, secret); err != nil {
201201
return nil, err
202202
}
203-
if revision, ok := secret.Annotations[constant.SecretRevisionAnnotationKey]; ok && revision != account.SecretRefRevision {
203+
if revision, ok := secret.Annotations[constant.SecretRevisionAnnotationKey]; ok &&
204+
account.SecretRefRevision != "" && revision != account.SecretRefRevision {
204205
return nil, ctrlutil.NewRequeueError(time.Second,
205206
fmt.Sprintf("wait for referenced account secret %s/%s revision %s",
206207
secret.Namespace, secret.Name, account.SecretRefRevision))

controllers/apps/component/transformer_component_account_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,12 @@ func TestBuildAccountSecretRevisionContract(t *testing.T) {
186186
if err = fakeClient.Update(context.Background(), referenced); err != nil {
187187
t.Fatalf("update referenced Secret revision: %v", err)
188188
}
189+
unversionedAccount := account
190+
unversionedAccount.SecretRefRevision = ""
191+
if _, err = (&componentAccountTransformer{}).buildAccountSecret(transCtx, unversionedAccount); err != nil {
192+
t.Fatalf("a managed Secret should be read when no revision is requested: %v", err)
193+
}
194+
189195
if _, err = (&componentAccountTransformer{}).buildAccountSecret(transCtx, account); !intctrlutil.IsRequeueError(err) || intctrlutil.IsDelayedRequeueError(err) {
190196
t.Fatalf("a managed Secret with a mismatched revision should stop and requeue, got %v", err)
191197
}

0 commit comments

Comments
 (0)