Skip to content

refactor(operator): drop dead ClusterName defaulting fallback #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fcanovai merged 3 commits into from
Aug 13, 2026
+7 −10
Merged

refactor(operator): drop dead ClusterName defaulting fallback #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe366cd
refactor(operator): drop dead ClusterName defaulting fallback
armru Aug 11, 2026
43af344
docs: clarify the clusterName constraint
armru Aug 12, 2026
baebd42
docs: correct clusterName certificate-CN mismatch behavior
gabriele-wolfox Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion documentation/web/docs/user/backup_and_restore.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ spec:
clientSecretName: my-client-credentials
serverSecretName: klio-server-tls

# Optional: specify the original cluster name if different
# Required: the name of the original cluster that was backed up
clusterName: my-cluster
```

Expand Down
6 changes: 6 additions & 0 deletions documentation/web/docs/user/plugin_configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,12 @@ server hits the same error, since the original cluster backups and
WALs will still exist on the Klio server.
:::

Whichever value you use, it must match the host name in the Common Name of the
client certificate (`userName@hostName`). For tier 1 base backups, a mismatch
is rejected at connection time; for WAL streaming, a mismatch is not currently
detected and can lead to WALs being stored or retrieved under the wrong
cluster path.

### Tier 2 configuration

Tier 2 provides secondary storage (typically object storage like S3) for
Expand Down
9 changes: 0 additions & 9 deletions operator/internal/klioconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ const ConfigDataKey = "config.yaml"

// GenerateConfig builds a config.Data from a PluginConfigurationSpec.
// configKey is the configuration key (e.g. "klio-archive").
// clusterName is the default cluster name when the PC doesn't set one.
func GenerateConfig(
spec kliov1alpha1.PluginConfigurationSpec,
configKey string,
Expand Down Expand Up @@ -252,9 +251,6 @@ func addExternalClusterConfiguration(
return fmt.Errorf("failed to get '%s' configuration, error: %w", ref, err)
}

if klioPluginConfiguration.Spec.ClusterName == "" {
klioPluginConfiguration.Spec.ClusterName = serverName
}
configurations[serverName].klioPluginConfiguration = klioPluginConfiguration

return nil
Expand Down Expand Up @@ -312,11 +308,6 @@ func getArchivePluginConfigurations(

return configurations, fmt.Errorf("failed to get '%s' configuration, error: %w", ref, err)
}
if klioPluginConfiguration.Spec.ClusterName == "" {
// if the host name is not set, use the cluster name as the host name
klioPluginConfiguration.Spec.ClusterName = cluster.Name
}

configurations[ArchiveConfigKey].klioPluginConfiguration = klioPluginConfiguration.DeepCopy()

return configurations, nil
Expand Down
Loading