Skip to content

Commit 8858f4d

Browse files
authored
Merge pull request #34209 from def-/pr-25.1-references
self-managed v26.0 docs and helm-chart version fixes
2 parents e7e9d96 + 2c0a682 commit 8858f4d

File tree

10 files changed

+20
-41
lines changed

10 files changed

+20
-41
lines changed

doc/developer/emulator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The emulator is a version of materialize used primarily for local testing. User
44

55
## How to profile the emulator
66

7-
Run the emulator using the following command to allow for local access to the heap dump endpoints for usage with the [debug tool](https://materialize.com/docs/self-managed/v25.1/integrations/mz-debug/).
7+
Run the emulator using the following command to allow for local access to the heap dump endpoints for usage with the [debug tool](https://materialize.com/docs/integrations/mz-debug/).
88

99
```bash
1010
docker run -d \

doc/user/content/get-started/install-materialize-emulator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ not suitable for full feature set evaluations or production workloads.
101101
The full experience of Materialize is also available as a self-managed
102102
offering. See [Self-managed Materialize].
103103

104-
[Self-managed Materialize]: https://materialize.com/docs/self-managed/v25.2/
104+
[Self-managed Materialize]: https://materialize.com/docs/installation/
105105

106106
### Technical Support
107107

doc/user/content/get-started/quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Emulator does not provide the full experience of using Materialize.
5555

5656
- You can run against your [Self-managed Materialize].
5757

58-
[Self-managed Materialize]: https://materialize.com/docs/self-managed/v25.2/
58+
[Self-managed Materialize]: https://materialize.com/docs/installation/
5959

6060
## Step 0. Open the SQL Shell
6161

doc/user/content/integrations/api/versions.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

doc/user/content/versions.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/build-info/src/lib.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,16 @@ impl BuildInfo {
3737
/// Constructs a human-readable version string.
3838
pub fn human_version(&self, helm_chart_version: Option<String>) -> String {
3939
if let Some(ref helm_chart_version) = helm_chart_version {
40-
format!(
41-
"v{} ({}, helm chart: {})",
42-
self.version,
43-
&self.sha[..9],
44-
helm_chart_version
45-
)
46-
} else {
47-
format!("v{} ({})", self.version, &self.sha[..9])
40+
if helm_chart_version != &self.version {
41+
return format!(
42+
"v{} ({}, helm chart: {})",
43+
self.version,
44+
&self.sha[..9],
45+
helm_chart_version
46+
);
47+
}
4848
}
49+
format!("v{} ({})", self.version, &self.sha[..9])
4950
}
5051

5152
/// Returns the version as a rich [semantic version][semver].

src/environmentd/src/environmentd/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,10 @@ pub struct Args {
350350
)]
351351
metadata_backend_url: Option<SensitiveUrl>,
352352

353-
/// Helm chart version for self-hosted Materialize. This version does not correspond to the
354-
/// Materialize (core) version (v0.125.0), but is time-based for our twice-a-year helm chart
355-
/// releases: v25.1.Z, v25.2.Z in 2025, then v26.1.Z, v26.2.Z in 2026, and so on. This version
356-
/// is displayed in addition in `SELECT mz_version()` if set.
353+
/// Helm chart version for self-hosted Materialize. This version is supposed to correspond to
354+
/// the Materialize (core) version. This version is displayed in addition in `SELECT
355+
/// mz_version()` if set and if it differs from the Materialize (core) version (which it should
356+
/// not!).
357357
#[clap(long, env = "HELM_CHART_VERSION")]
358358
helm_chart_version: Option<String>,
359359

src/mz-debug/src/system_catalog_dumper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ impl SystemCatalogDumper {
901901
let docs_link = if replica.is_none()
902902
|| replica.map_or(false, |r| r.cluster_name == "mz_catalog_server")
903903
{
904-
"https://materialize.com/docs/self-managed/v25.1/installation/troubleshooting/#troubleshooting-console-unresponsiveness"
904+
"https://materialize.com/docs/installation/troubleshooting/#troubleshooting-console-unresponsiveness"
905905
} else {
906906
"https://materialize.com/docs/sql/alter-cluster/#resizing-1"
907907
};

test/orchestratord/mzcompose.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def retry(fn: Callable, timeout: int) -> None:
133133

134134

135135
# TODO: Cover src/cloud-resources/src/crd/materialize.rs
136-
# TODO: Cover https://materialize.com/docs/self-managed/v25.2/installation/configuration/
136+
# TODO: Cover https://materialize.com/docs/installation/configuration/
137137

138138

139139
class Modification:
@@ -1218,7 +1218,7 @@ def workflow_defaults(c: Composition, parser: WorkflowArgumentParser) -> None:
12181218

12191219
current_version = get_tag(args.tag)
12201220

1221-
# Following https://materialize.com/docs/self-managed/v25.2/installation/install-on-local-kind/
1221+
# Following https://materialize.com/docs/installation/install-on-local-kind/
12221222
for version in reversed(get_self_managed_versions() + [current_version]):
12231223
dir = "my-local-mz"
12241224
if os.path.exists(dir):

test/terraform/mzcompose.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ def setup(
731731

732732
def upgrade(self, tag: str) -> None:
733733
print(f"--- Upgrading to {tag}")
734-
# Following https://materialize.com/docs/self-managed/v25.1/installation/install-on-aws/upgrade-on-aws/
734+
# Following https://materialize.com/docs/installation/install-on-aws/upgrade-on-aws/
735735
self.materialize_environment = {
736736
"apiVersion": "materialize.cloud/v1alpha1",
737737
"kind": "Materialize",

0 commit comments

Comments
 (0)