Skip to content

Commit 49eea20

Browse files
authored
Revert "Error on missing tenant secrets (#34)" (#35)
This reverts commit 1e92eb5.
1 parent 1e92eb5 commit 49eea20

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

pkg/syncer/obsctlsyncer.go

+1-11
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ func AutoDetectTenantSecrets(
126126

127127
// Filter secrets for configured tenants.
128128
configuredTenants := strings.Split(managedTenants, ",")
129-
missingSecretTenants := strings.Split(managedTenants, ",")
130129
for i := range secret.Items {
131130
lbls := secret.Items[i].Labels
132131

@@ -137,9 +136,6 @@ func AutoDetectTenantSecrets(
137136
// If tenant is not configured, skip.
138137
if !slices.Contains(configuredTenants, lbls["tenant"]) {
139138
continue
140-
} else {
141-
s, _ := slices.BinarySearch(missingSecretTenants, lbls["tenant"])
142-
missingSecretTenants = slices.Delete(missingSecretTenants, s, s+1)
143139
}
144140

145141
if secret.Items[i].Data == nil {
@@ -175,10 +171,6 @@ func AutoDetectTenantSecrets(
175171
tenantSecret[lbls["tenant"]] = tOIDC
176172
}
177173

178-
if len(missingSecretTenants) != 0 {
179-
return tenantSecret, errors.Newf("missing secrets for tenants: %v", missingSecretTenants)
180-
}
181-
182174
return tenantSecret, nil
183175
}
184176

@@ -209,9 +201,7 @@ func (o *ObsctlRulesSyncer) InitOrReloadObsctlConfig() error {
209201
tenantSecrets, err := o.autoDetectSecretsFn(o.ctx, o.k8s, o.namespace, o.audience, o.issuerURL, o.managedTenants)
210202
if err != nil {
211203
level.Error(o.logger).Log("msg", "auto detecting tenant secrets", "error", err)
212-
if len(tenantSecrets) == 0 {
213-
return errors.Wrap(err, "no tenant secrets auto-detected")
214-
}
204+
return errors.Wrap(err, "auto detecting tenant secrets")
215205
}
216206

217207
// Add all managed tenants under the API.

0 commit comments

Comments
 (0)