Skip to content

Commit fc222e4

Browse files
authored
fix: Revert default cluster domain to 'cluster.local' (#947)
* fix: Revert default cluster domain to 'cluster.local' * fix: remove recommendations for trailing dot in Kubernetes cluster domain
1 parent e2e857b commit fc222e4

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

crates/stackable-operator/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ All notable changes to this project will be documented in this file.
77
### Fixed
88

99
- Remove `Merge` trait bound from `erase` and make `product_specific_common_config` public ([#946]).
10+
- BREAKING: Revert the change of appending a dot to the default cluster domain to make it a FQDN, it is now `cluster.local` again. Users can instead explicitly opt-in to FQDNs via the ENV variable `KUBERNETES_CLUSTER_DOMAIN`. ([#947]).
1011

1112
[#946]: https://github.com/stackabletech/operator-rs/pull/946
13+
[#947]: https://github.com/stackabletech/operator-rs/pull/947
1214

1315
## [0.84.0] - 2025-01-16
1416

crates/stackable-operator/src/utils/cluster_info.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@ use std::str::FromStr;
22

33
use crate::commons::networking::DomainName;
44

5-
const KUBERNETES_CLUSTER_DOMAIN_DEFAULT: &str = "cluster.local.";
5+
const KUBERNETES_CLUSTER_DOMAIN_DEFAULT: &str = "cluster.local";
66

77
/// Some information that we know about the Kubernetes cluster.
88
#[derive(Debug, Clone)]
99
pub struct KubernetesClusterInfo {
10-
/// The Kubernetes cluster domain, typically `cluster.local.`.
10+
/// The Kubernetes cluster domain, typically `cluster.local`.
1111
pub cluster_domain: DomainName,
1212
}
1313

1414
#[derive(clap::Parser, Debug, Default, PartialEq, Eq)]
1515
pub struct KubernetesClusterInfoOpts {
16-
/// Kubernetes cluster domain, usually this is `cluster.local.`.
17-
///
18-
/// Please note that we recommend adding a trailing dot (".") to reduce DNS requests, see
19-
/// <https://github.com/stackabletech/issues/issues/656> for details.
20-
//
16+
/// Kubernetes cluster domain, usually this is `cluster.local`.
2117
// We are not using a default value here, as operators will probably do an more advanced
2218
// auto-detection of the cluster domain in case it is not specified in the future.
2319
#[arg(long, env)]
@@ -29,9 +25,6 @@ impl KubernetesClusterInfo {
2925
let cluster_domain = match &cluster_info_opts.kubernetes_cluster_domain {
3026
Some(cluster_domain) => {
3127
tracing::info!(%cluster_domain, "Using configured Kubernetes cluster domain");
32-
if !cluster_domain.ends_with('.') {
33-
tracing::warn!(%cluster_domain, "Your configured Kubernetes cluster domain is not fully qualified (it does not end with a dot (\".\")). We recommend adding a trailing dot to reduce DNS requests, see https://github.com/stackabletech/issues/issues/656 for details");
34-
}
3528

3629
cluster_domain.clone()
3730
}

0 commit comments

Comments
 (0)