diff --git a/misc/helm-charts/operator/templates/deployment.yaml b/misc/helm-charts/operator/templates/deployment.yaml index 1cf4050946fca..a078810834896 100644 --- a/misc/helm-charts/operator/templates/deployment.yaml +++ b/misc/helm-charts/operator/templates/deployment.yaml @@ -40,6 +40,9 @@ spec: - "--cloud-provider={{ .Values.operator.cloudProvider.type }}" - "--region={{ .Values.operator.cloudProvider.region }}" - "--secrets-controller={{ .Values.operator.secretsController }}" + # (SangJunBak) For self-managed, we disable statement logging due to performance issues + # https://github.com/MaterializeInc/cloud/issues/10755 + - "--disable-statement-logging" {{- range $key, $value := include "materialize-operator.selectorLabels" . | fromYaml }} - "--orchestratord-pod-selector-labels={{ $key }}={{ $value }}" {{- end }} @@ -69,7 +72,7 @@ spec: {{- if .Values.operator.features.createConsole }} - "--create-console" {{- end }} - - "--console-image-tag-default=25.1.0-beta.3" + - "--console-image-tag-default=25.1.1" {{- range $key, $value := .Values.operator.features.consoleImageTagMapOverride }} - "--console-image-tag-map={{ $key }}={{ $value }}" {{- end }} diff --git a/misc/helm-charts/operator/tests/deployment_test.yaml b/misc/helm-charts/operator/tests/deployment_test.yaml index 4f50ece408edc..86d3a7f7ad9a2 100644 --- a/misc/helm-charts/operator/tests/deployment_test.yaml +++ b/misc/helm-charts/operator/tests/deployment_test.yaml @@ -64,10 +64,10 @@ tests: storage.storageClass.name: "" asserts: - matchRegex: - path: spec.template.spec.containers[0].args[12] # Index of the environmentd-cluster-replica-sizes argument + path: spec.template.spec.containers[0].args[13] # Index of the environmentd-cluster-replica-sizes argument pattern: disk_limit":"0" - matchRegex: - path: spec.template.spec.containers[0].args[12] + path: spec.template.spec.containers[0].args[13] pattern: is_cc":true - it: should have a cluster with disk limit to 1552MiB when storage class is configured @@ -75,10 +75,10 @@ tests: storage.storageClass.name: "my-storage-class" asserts: - matchRegex: - path: spec.template.spec.containers[0].args[12] + path: spec.template.spec.containers[0].args[13] pattern: disk_limit":"1552MiB" - matchRegex: - path: spec.template.spec.containers[0].args[12] + path: spec.template.spec.containers[0].args[13] pattern: is_cc":true - it: should configure for AWS provider correctly diff --git a/misc/images/materialized-base/Dockerfile b/misc/images/materialized-base/Dockerfile index 7d5acd724849a..d00ba70f71ab0 100644 --- a/misc/images/materialized-base/Dockerfile +++ b/misc/images/materialized-base/Dockerfile @@ -15,7 +15,7 @@ # deployed to production, but the version needs to be bumped whenever features # that the console depends upon are removed (to a version of the console that # doesn't depend on those features). -FROM materialize/console:25.1.0-beta.3 AS console +FROM materialize/console:25.1.1 AS console MZFROM ubuntu-base diff --git a/src/orchestratord/src/controller/materialize.rs b/src/orchestratord/src/controller/materialize.rs index 762a6ea90c7b2..742662577c977 100644 --- a/src/orchestratord/src/controller/materialize.rs +++ b/src/orchestratord/src/controller/materialize.rs @@ -76,6 +76,8 @@ pub struct MaterializeControllerArgs { enable_security_context: bool, #[clap(long)] enable_internal_statement_logging: bool, + #[clap(long, default_value = "false")] + disable_statement_logging: bool, #[clap(long)] orchestratord_pod_selector_labels: Vec>, diff --git a/src/orchestratord/src/controller/materialize/environmentd.rs b/src/orchestratord/src/controller/materialize/environmentd.rs index 91faa079aeb6e..ca6c0ea6575e4 100644 --- a/src/orchestratord/src/controller/materialize/environmentd.rs +++ b/src/orchestratord/src/controller/materialize/environmentd.rs @@ -893,6 +893,11 @@ fn create_environmentd_statefulset_object( if config.enable_internal_statement_logging { args.push("--system-parameter-default=enable_internal_statement_logging=true".into()); } + + if config.disable_statement_logging { + args.push("--system-parameter-default=statement_logging_max_sample_rate=0".into()); + } + if config.disable_authentication { args.push("--system-parameter-default=enable_rbac_checks=false".into()); }