Skip to content

Commit 4f56704

Browse files
authored
Merge pull request #19 from Electronic-Waste/feat/tenant-controller-user
feat(tenant): finish verify built-in users.
2 parents 6b23d0e + 70f00b3 commit 4f56704

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

pkg/controller/tenant/tenant_controller.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ func (r *TenantReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
9090
if metaErr != nil {
9191
err = errors.Join(err, metaErr)
9292
}
93+
log.V(5).Info("Succeeded to verify meta configurations")
9394
setCondition(&tenant, opState)
9495

9596
// Verify built-in users configuration
@@ -98,6 +99,7 @@ func (r *TenantReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
9899
if userErr != nil {
99100
err = errors.Join(err, userErr)
100101
}
102+
log.V(5).Info("Succeeded to verify built-in users configurations")
101103
setCondition(&tenant, opState)
102104

103105
if !equality.Semantic.DeepEqual(&tenant.Status, originStatus) {
@@ -187,6 +189,27 @@ func (r *TenantReconciler) verifyMeta(ctx context.Context, tenant *databendv1alp
187189
}
188190

189191
func (r *TenantReconciler) verifyBuiltinUsers(ctx context.Context, tenant *databendv1alpha1.Tenant) (opState, error) {
192+
log := ctrl.LoggerFrom(ctx)
193+
194+
if len(tenant.Spec.BuiltinUsers) == 0 {
195+
log.V(5).Info("Use default user")
196+
return creationSucceeded, nil
197+
}
198+
199+
// Check secrets
200+
for _, user := range tenant.Spec.BuiltinUsers {
201+
if user.AuthStringSecretRef != nil {
202+
var secret corev1.Secret
203+
nn := types.NamespacedName{
204+
Namespace: user.AuthStringSecretRef.Namespace,
205+
Name: user.AuthStringSecretRef.Name,
206+
}
207+
if err := r.Get(ctx, nn, &secret, &client.GetOptions{}); err != nil {
208+
return storageError, fmt.Errorf("failed to get secret %v", nn)
209+
}
210+
}
211+
}
212+
190213
return creationSucceeded, nil
191214
}
192215

0 commit comments

Comments
 (0)