diff --git a/Cargo.lock b/Cargo.lock index da90664931a93..cac84f6e86324 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5463,7 +5463,7 @@ dependencies = [ [[package]] name = "mz-balancerd" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" dependencies = [ "anyhow", "async-trait", @@ -5604,7 +5604,7 @@ dependencies = [ [[package]] name = "mz-catalog-debug" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" dependencies = [ "anyhow", "clap", @@ -5766,7 +5766,7 @@ dependencies = [ [[package]] name = "mz-clusterd" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" dependencies = [ "anyhow", "axum", @@ -6067,7 +6067,7 @@ dependencies = [ [[package]] name = "mz-environmentd" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" dependencies = [ "anyhow", "askama", @@ -6577,7 +6577,7 @@ dependencies = [ [[package]] name = "mz-materialized" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" dependencies = [ "mz-clusterd", "mz-environmentd", @@ -6774,7 +6774,7 @@ dependencies = [ [[package]] name = "mz-orchestratord" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" dependencies = [ "anyhow", "async-trait", @@ -6960,7 +6960,7 @@ dependencies = [ [[package]] name = "mz-persist-client" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" dependencies = [ "anyhow", "arrayvec 0.7.6", @@ -8066,7 +8066,7 @@ dependencies = [ [[package]] name = "mz-testdrive" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" dependencies = [ "anyhow", "arrow", diff --git a/bin/bump-version b/bin/bump-version index 2096e6ebbd875..34a76eba7e9dd 100755 --- a/bin/bump-version +++ b/bin/bump-version @@ -69,7 +69,7 @@ rm -f src/{clusterd,environmentd,materialized,persist-client,testdrive,catalog-d cargo update --workspace -bin/helm-chart-version-bump --bump-weekly-version --bump-orchestratord-version "v$version" +bin/helm-chart-version-bump --bump-orchestratord-version "v$version" helm_docs_version=1.14.2 if ! helm-docs --help > /dev/null; then diff --git a/doc/user/content/releases/v0.165.md b/doc/user/content/releases/v26.0.md similarity index 69% rename from doc/user/content/releases/v0.165.md rename to doc/user/content/releases/v26.0.md index 08b1b262a7f65..82813f22c2984 100644 --- a/doc/user/content/releases/v0.165.md +++ b/doc/user/content/releases/v26.0.md @@ -1,5 +1,5 @@ --- -title: "Materialize v0.165" +title: "Materialize v26.0" date: 2025-11-19 released: false _build: diff --git a/misc/helm-charts/operator/Chart.yaml b/misc/helm-charts/operator/Chart.yaml index 54abbef790f65..a35a5368d7e5d 100644 --- a/misc/helm-charts/operator/Chart.yaml +++ b/misc/helm-charts/operator/Chart.yaml @@ -11,7 +11,7 @@ apiVersion: v2 name: materialize-operator description: Materialize Kubernetes Operator Helm Chart type: application -version: v25.3.0-beta.1 -appVersion: v0.165.0-dev.0 +version: v26.0.0-beta.1 +appVersion: v26.0.0-dev.0 icon: https://materialize.com/favicon.ico home: https://materialize.com diff --git a/misc/helm-charts/operator/README.md b/misc/helm-charts/operator/README.md index 6a0d8ac0028f0..c4ed3391cf963 100644 --- a/misc/helm-charts/operator/README.md +++ b/misc/helm-charts/operator/README.md @@ -1,6 +1,6 @@ # Materialize Kubernetes Operator Helm Chart -![Version: v25.3.0-beta.1](https://img.shields.io/badge/Version-v25.3.0--beta.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.165.0-dev.0](https://img.shields.io/badge/AppVersion-v0.165.0--dev.0-informational?style=flat-square) +![Version: v26.0.0-beta.1](https://img.shields.io/badge/Version-v26.0.0--beta.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v26.0.0-dev.0](https://img.shields.io/badge/AppVersion-v26.0.0--dev.0-informational?style=flat-square) Materialize Kubernetes Operator Helm Chart @@ -159,7 +159,7 @@ The following table lists the configurable parameters of the Materialize operato | `operator.clusters.swap_enabled` | | ``true`` | | `operator.image.pullPolicy` | Policy for pulling the image: "IfNotPresent" avoids unnecessary re-pulling of images | ``"IfNotPresent"`` | | `operator.image.repository` | The Docker repository for the operator image | ``"materialize/orchestratord"`` | -| `operator.image.tag` | The tag/version of the operator image to be used | ``"v0.164.0"`` | +| `operator.image.tag` | The tag/version of the operator image to be used | ``"v26.0.0-dev.0--pr.gfa8ba620176a7d0f9abcc64f89f5d21db80c6d94"`` | | `operator.nodeSelector` | Node selector to use for the operator pod | ``nil`` | | `operator.resources.limits` | Resource limits for the operator's CPU and memory | ``{"memory":"512Mi"}`` | | `operator.resources.requests` | Resources requested by the operator for CPU and memory | ``{"cpu":"100m","memory":"512Mi"}`` | @@ -185,7 +185,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm ```shell helm install my-materialize-operator \ - --set operator.image.tag=v0.165.0-dev.0 \ + --set operator.image.tag=v26.0.0-dev.0 \ materialize/materialize-operator ``` @@ -220,7 +220,7 @@ metadata: name: 12345678-1234-1234-1234-123456789012 namespace: materialize-environment spec: - environmentdImageRef: materialize/environmentd:v0.165.0-dev.0 + environmentdImageRef: materialize/environmentd:v26.0.0-dev.0 backendSecretName: materialize-backend environmentdResourceRequirements: limits: @@ -305,7 +305,7 @@ Or check the `Chart.yaml` file in the `misc/helm-charts/operator` directory: apiVersion: v2 name: materialize-operator # ... -version: v25.3.0-beta-1 +version: v26.0.0-dev.0 appVersion: v0.147.0 # Use this version for your Materialize instances ``` diff --git a/misc/helm-charts/operator/README.md.gotmpl b/misc/helm-charts/operator/README.md.gotmpl index 3c9343e94c891..a69d25b3ab480 100644 --- a/misc/helm-charts/operator/README.md.gotmpl +++ b/misc/helm-charts/operator/README.md.gotmpl @@ -246,7 +246,7 @@ Or check the `Chart.yaml` file in the `misc/helm-charts/operator` directory: apiVersion: v2 name: materialize-operator # ... -version: v25.3.0-beta-1 +version: v26.0.0-dev.0 appVersion: v0.147.0 # Use this version for your Materialize instances ``` diff --git a/misc/helm-charts/operator/tests/deployment_test.yaml b/misc/helm-charts/operator/tests/deployment_test.yaml index d91a34e5d4ffc..dcec3cfa7478f 100644 --- a/misc/helm-charts/operator/tests/deployment_test.yaml +++ b/misc/helm-charts/operator/tests/deployment_test.yaml @@ -17,7 +17,7 @@ tests: of: Deployment - equal: path: spec.template.spec.containers[0].image - value: materialize/orchestratord:v0.164.0 + value: materialize/orchestratord:v26.0.0-dev.0--pr.gfa8ba620176a7d0f9abcc64f89f5d21db80c6d94 - equal: path: spec.template.spec.containers[0].imagePullPolicy value: IfNotPresent diff --git a/misc/helm-charts/operator/values.yaml b/misc/helm-charts/operator/values.yaml index d4e1c705a0d94..710d4e84c88d7 100644 --- a/misc/helm-charts/operator/values.yaml +++ b/misc/helm-charts/operator/values.yaml @@ -13,7 +13,7 @@ operator: # -- The Docker repository for the operator image repository: materialize/orchestratord # -- The tag/version of the operator image to be used - tag: v0.164.0 + tag: v26.0.0-dev.0--pr.gfa8ba620176a7d0f9abcc64f89f5d21db80c6d94 # -- Policy for pulling the image: "IfNotPresent" avoids unnecessary re-pulling of images pullPolicy: IfNotPresent diff --git a/misc/helm-charts/testing/materialize.yaml b/misc/helm-charts/testing/materialize.yaml index f097101ccdc3b..e983f2f9d5e9f 100644 --- a/misc/helm-charts/testing/materialize.yaml +++ b/misc/helm-charts/testing/materialize.yaml @@ -28,7 +28,7 @@ metadata: name: 12345678-1234-1234-1234-123456789012 namespace: materialize-environment spec: - environmentdImageRef: materialize/environmentd:v0.165.0-dev.0 + environmentdImageRef: materialize/environmentd:v26.0.0-dev.0 backendSecretName: materialize-backend authenticatorKind: None #balancerdExternalCertificateSpec: diff --git a/misc/python/materialize/cli/helm_chart_version_bump.py b/misc/python/materialize/cli/helm_chart_version_bump.py index daecbf2b9bb22..29be34945d5ad 100644 --- a/misc/python/materialize/cli/helm_chart_version_bump.py +++ b/misc/python/materialize/cli/helm_chart_version_bump.py @@ -22,11 +22,6 @@ def main() -> int: prog="helm-chart-version-bump", description="Bump environmentd (appVersion), orchestratord and helm-chart versions in helm chart.", ) - parser.add_argument( - "--bump-weekly-version", - action="store_true", - help="Also bump the weekly Materialize operator release instead of the bi-yearly one", - ) parser.add_argument( "--helm-chart-version", type=str, @@ -49,7 +44,12 @@ def main() -> int: mods = [ ( MZ_ROOT / "misc" / "helm-charts" / "operator" / "Chart.yaml", - lambda docs: docs[0].update({"appVersion": args.environmentd_version}), + lambda docs: docs[0].update( + { + "version": args.environmentd_version, + "appVersion": args.environmentd_version, + } + ), ), ( MZ_ROOT / "misc" / "helm-charts" / "testing" / "materialize.yaml", @@ -61,19 +61,6 @@ def main() -> int: ), ] - if args.bump_weekly_version: - mods += [ - ( - MZ_ROOT / "misc" / "helm-charts" / "operator-weekly" / "Chart.yaml", - lambda docs: docs[0].update( - { - "version": args.environmentd_version, - "appVersion": args.environmentd_version, - } - ), - ), - ] - if args.bump_orchestratord_version: # There are two cases that bump the version: # 1. Bump to new unreleased dev version: Use the latest released orchestratord version diff --git a/src/balancerd/Cargo.toml b/src/balancerd/Cargo.toml index 7d29622c13f16..67309bda2c496 100644 --- a/src/balancerd/Cargo.toml +++ b/src/balancerd/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mz-balancerd" description = "Balancer service." -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" edition.workspace = true rust-version.workspace = true publish = false diff --git a/src/catalog-debug/Cargo.toml b/src/catalog-debug/Cargo.toml index 3f3d9a5f8fa9a..44a1374c84509 100644 --- a/src/catalog-debug/Cargo.toml +++ b/src/catalog-debug/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mz-catalog-debug" description = "Durable metadata storage debug tool." -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" edition.workspace = true rust-version.workspace = true publish = false diff --git a/src/clusterd/Cargo.toml b/src/clusterd/Cargo.toml index 7179f2e571a8d..6bf5b60d330bb 100644 --- a/src/clusterd/Cargo.toml +++ b/src/clusterd/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mz-clusterd" description = "Materialize's cluster server." -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" edition.workspace = true rust-version.workspace = true publish = false diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 8c7ab51694d85..b63118c410b4f 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mz-environmentd" description = "Manages a single Materialize environment." -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" authors = ["Materialize, Inc."] license = "proprietary" edition.workspace = true diff --git a/src/materialized/Cargo.toml b/src/materialized/Cargo.toml index 7442f2bfb26fc..a4a2546c289e1 100644 --- a/src/materialized/Cargo.toml +++ b/src/materialized/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mz-materialized" description = "Materialize's unified binary." -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" edition.workspace = true rust-version.workspace = true publish = false diff --git a/src/orchestratord/Cargo.toml b/src/orchestratord/Cargo.toml index db0f87ebde25f..fbe01cf17217d 100644 --- a/src/orchestratord/Cargo.toml +++ b/src/orchestratord/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mz-orchestratord" description = "Kubernetes operator for Materialize regions" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" edition.workspace = true rust-version.workspace = true publish = false diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index 9b602e3c3b2bf..a078ccb340d0c 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mz-persist-client" description = "Client for Materialize pTVC durability system" -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" edition.workspace = true rust-version.workspace = true publish = false diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index 3b66899b4e35d..bb292af7e59d7 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mz-testdrive" description = "Integration test driver for Materialize." -version = "0.165.0-dev.0" +version = "26.0.0-dev.0" edition.workspace = true rust-version.workspace = true publish = false diff --git a/test/legacy-upgrade/mzcompose.py b/test/legacy-upgrade/mzcompose.py index 403c6414bca50..da65187627d2d 100644 --- a/test/legacy-upgrade/mzcompose.py +++ b/test/legacy-upgrade/mzcompose.py @@ -96,9 +96,12 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None: ) current_version = MzVersion.parse_cargo() - min_upgradable_version = MzVersion.create( - current_version.major, current_version.minor - 1, 0 - ) + if current_version.major == 26 and current_version.minor == 0: + min_upgradable_version = MzVersion.create(0, 164, 0) + else: + min_upgradable_version = MzVersion.create( + current_version.major, current_version.minor - 1, 0 + ) for version in tested_versions: # Building the latest release might have failed, don't block PRs on diff --git a/test/terraform/aws-persistent/main.tf b/test/terraform/aws-persistent/main.tf index c8e41632afc28..e63b78555ff72 100644 --- a/test/terraform/aws-persistent/main.tf +++ b/test/terraform/aws-persistent/main.tf @@ -18,7 +18,7 @@ resource "random_password" "db_password" { variable "operator_version" { type = string - default = "v25.3.0-beta.1.tgz" + default = "v26.0.0-beta.1.tgz" } variable "orchestratord_version" { @@ -34,7 +34,7 @@ module "materialize_infrastructure" { environment = "dev" install_materialize_operator = true use_local_chart = true - helm_chart = "materialize-operator-v25.3.0-beta.1.tgz" + helm_chart = "materialize-operator-v26.0.0-beta.1.tgz" operator_version = var.operator_version orchestratord_version = var.orchestratord_version diff --git a/test/terraform/aws-temporary/main.tf b/test/terraform/aws-temporary/main.tf index 63d256f074605..1b914d585a218 100644 --- a/test/terraform/aws-temporary/main.tf +++ b/test/terraform/aws-temporary/main.tf @@ -42,7 +42,7 @@ resource "random_password" "db_password" { variable "operator_version" { type = string - default = "v25.3.0-beta.1.tgz" + default = "v26.0.0-beta.1.tgz" } variable "orchestratord_version" { @@ -67,7 +67,7 @@ module "materialize_infrastructure" { install_materialize_operator = true use_local_chart = true - helm_chart = "materialize-operator-v25.3.0-beta.1.tgz" + helm_chart = "materialize-operator-v26.0.0-beta.1.tgz" operator_version = var.operator_version orchestratord_version = var.orchestratord_version diff --git a/test/terraform/aws-upgrade/main.tf b/test/terraform/aws-upgrade/main.tf index f2edc48b5b086..76e23a7aa5f4b 100644 --- a/test/terraform/aws-upgrade/main.tf +++ b/test/terraform/aws-upgrade/main.tf @@ -42,7 +42,7 @@ resource "random_password" "db_password" { variable "operator_version" { type = string - default = "v25.3.0-beta.1.tgz" + default = "v26.0.0-beta.1.tgz" } variable "orchestratord_version" { @@ -67,7 +67,7 @@ module "materialize_infrastructure" { install_materialize_operator = true use_local_chart = true - helm_chart = "materialize-operator-v25.3.0-beta.1.tgz" + helm_chart = "materialize-operator-v26.0.0-beta.1.tgz" operator_version = var.operator_version orchestratord_version = var.orchestratord_version diff --git a/test/terraform/azure-temporary/main.tf b/test/terraform/azure-temporary/main.tf index 30529d05bc198..deaabf8f4ad10 100644 --- a/test/terraform/azure-temporary/main.tf +++ b/test/terraform/azure-temporary/main.tf @@ -45,7 +45,7 @@ resource "random_password" "pass" { variable "operator_version" { type = string - default = "v25.3.0-beta.1.tgz" + default = "v26.0.0-beta.1.tgz" } variable "orchestratord_version" { @@ -67,7 +67,7 @@ module "materialize" { install_materialize_operator = true use_local_chart = true - helm_chart = "materialize-operator-v25.3.0-beta.1.tgz" + helm_chart = "materialize-operator-v26.0.0-beta.1.tgz" operator_version = var.operator_version orchestratord_version = var.orchestratord_version diff --git a/test/terraform/gcp-temporary/main.tf b/test/terraform/gcp-temporary/main.tf index d27c5817fa24e..a65bf1823ac39 100644 --- a/test/terraform/gcp-temporary/main.tf +++ b/test/terraform/gcp-temporary/main.tf @@ -54,7 +54,7 @@ module "materialize" { install_materialize_operator = true use_local_chart = true - helm_chart = "materialize-operator-v25.3.0-beta.1.tgz" + helm_chart = "materialize-operator-v26.0.0-beta.1.tgz" operator_version = var.operator_version orchestratord_version = var.orchestratord_version @@ -97,7 +97,7 @@ variable "database_password" { variable "operator_version" { type = string - default = "v25.3.0-beta.1.tgz" + default = "v26.0.0-beta.1.tgz" } variable "orchestratord_version" { diff --git a/test/terraform/mzcompose.py b/test/terraform/mzcompose.py index ecff7ff0f2c76..1ac25307c90b6 100644 --- a/test/terraform/mzcompose.py +++ b/test/terraform/mzcompose.py @@ -678,7 +678,7 @@ def setup( vars = [ "-var", - "operator_version=v25.3.0-beta.1", + "operator_version=v26.0.0-beta.1", ] vars += [ "-var", @@ -1149,7 +1149,7 @@ def workflow_gcp_temporary(c: Composition, parser: WorkflowArgumentParser) -> No vars = [ "-var", - "operator_version=v25.3.0-beta.1", + "operator_version=v26.0.0-beta.1", ] vars += [ "-var", @@ -1260,7 +1260,7 @@ def workflow_azure_temporary(c: Composition, parser: WorkflowArgumentParser) -> vars = [ "-var", - "operator_version=v25.3.0-beta.1", + "operator_version=v26.0.0-beta.1", ] vars += [ "-var",