Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/bump-version
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Materialize v0.165"
title: "Materialize v26.0"
date: 2025-11-19
released: false
_build:
Expand Down
4 changes: 2 additions & 2 deletions misc/helm-charts/operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions misc/helm-charts/operator/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"}`` |
Expand All @@ -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
```

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion misc/helm-charts/operator/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion misc/helm-charts/operator/tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion misc/helm-charts/operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion misc/helm-charts/testing/materialize.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
25 changes: 6 additions & 19 deletions misc/python/materialize/cli/helm_chart_version_bump.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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",
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/balancerd/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/catalog-debug/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/clusterd/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/environmentd/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/materialized/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/orchestratord/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/persist-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/testdrive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 6 additions & 3 deletions test/legacy-upgrade/mzcompose.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/terraform/aws-persistent/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions test/terraform/aws-temporary/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions test/terraform/aws-upgrade/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions test/terraform/azure-temporary/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -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

Expand Down
Loading