Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 2 additions & 0 deletions NEXT_RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ The release notes should contain at least the following sections:
* [terraform/tanka] The `injectLabels` option is now added to generated Tanka files by Terraform to allow the usage of Tanka's prune command. This will add new labels to resources the next time you apply Tanka files.
* [tanka] The monitoring stack (Prometheus and Grafana) can now be disabled with `enableMonitoring: false` (default `true`).
* [tanka] On minikube, the core-service is now exposed by the `gateway` LoadBalancer Service on port 80.
* [helm] The schema manager jobs can now be disabled with `dss.schemaManager.enabled: false` (default `true`).
* [terraform] New variable `schema_manager_enabled` (default `true`), passed to Helm and Tanka.

## Minimal database schema version

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ resource "local_file" "helm_chart_values" {
}

schemaManager = {
enabled = var.schema_manager_enabled
desiredRidDbVersion = local.rid_db_schema
desiredScdDbVersion = local.scd_db_schema
desiredAuxDbVersion = local.aux_db_schema
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ resource "local_file" "tanka_config_main" {
VAR_DESIRED_RID_DB_VERSION = local.rid_db_schema
VAR_DESIRED_SCD_DB_VERSION = local.scd_db_schema
VAR_DESIRED_AUX_DB_VERSION = local.aux_db_schema
VAR_SCHEMA_MANAGER_ENABLED = var.schema_manager_enabled
VAR_SHOULD_INIT = var.should_init
VAR_DOCKER_IMAGE_PULL_SECRET = var.image_pull_secret != null ? var.image_pull_secret : ""
VAR_CLOUD_PROVIDER = var.kubernetes_cloud_provider_name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ local metadata = metadataBase {
},
},
schema_manager+: {
enable: true,
enable: ${VAR_SCHEMA_MANAGER_ENABLED},
image: '${VAR_DOCKER_IMAGE_NAME}',
desired_rid_db_version: '${VAR_DESIRED_RID_DB_VERSION}',
desired_scd_db_version: '${VAR_DESIRED_SCD_DB_VERSION}',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,18 @@ variable "desired_aux_db_version" {
}


variable "schema_manager_enabled" {
type = bool
default = true
description = <<-EOT
Set to false to not deploy the schema manager jobs.
With Tanka, the schema manager jobs are always deployed when `should_init` is true.

Example: `true`
EOT
}


variable "crdb_image_tag" {
type = string
description = <<-EOT
Expand Down
6 changes: 6 additions & 0 deletions deploy/infrastructure/modules/terraform-aws-dss/TFVARS.gen.md
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,12 @@ Currently, only single node or three nodes deployments are supported.</p>
<p>Leave empty to disable exposition of prometheus publicly.</p>
<p>Example: <code>prometheus.dss.example.com</code></p>
<br/>Default value: <code>""</code></td>
</tr><tr>
<td>schema_manager_enabled (<code>bool</code>)</td>
<td><p>Set to false to not deploy the schema manager jobs.
With Tanka, the schema manager jobs are always deployed when <code>should_init</code> is true.</p>
<p>Example: <code>true</code></p>
<br/>Default value: <code>true</code></td>
</tr><tr>
<td>should_init (<code>bool</code>)</td>
<td><p>Set to false if joining an existing pool, true if creating the first DSS instance
Expand Down
1 change: 1 addition & 0 deletions deploy/infrastructure/modules/terraform-aws-dss/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ module "terraform-commons-dss" {
desired_rid_db_version = var.desired_rid_db_version
desired_scd_db_version = var.desired_scd_db_version
desired_aux_db_version = var.desired_aux_db_version
schema_manager_enabled = var.schema_manager_enabled
authorization = var.authorization
locality = var.locality
crdb_external_nodes = var.crdb_external_nodes
Expand Down
12 changes: 12 additions & 0 deletions deploy/infrastructure/modules/terraform-aws-dss/variables.gen.tf
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,18 @@ variable "desired_aux_db_version" {
}


variable "schema_manager_enabled" {
type = bool
default = true
description = <<-EOT
Set to false to not deploy the schema manager jobs.
With Tanka, the schema manager jobs are always deployed when `should_init` is true.

Example: `true`
EOT
}


variable "crdb_image_tag" {
type = string
description = <<-EOT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,12 @@ Currently, only single node or three nodes deployments are supported.</p>
<p>Leave empty to disable exposition of prometheus publicly.</p>
<p>Example: <code>prometheus.dss.example.com</code></p>
<br/>Default value: <code>""</code></td>
</tr><tr>
<td>schema_manager_enabled (<code>bool</code>)</td>
<td><p>Set to false to not deploy the schema manager jobs.
With Tanka, the schema manager jobs are always deployed when <code>should_init</code> is true.</p>
<p>Example: <code>true</code></p>
<br/>Default value: <code>true</code></td>
</tr><tr>
<td>should_init (<code>bool</code>)</td>
<td><p>Set to false if joining an existing pool, true if creating the first DSS instance
Expand Down
1 change: 1 addition & 0 deletions deploy/infrastructure/modules/terraform-google-dss/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ module "terraform-commons-dss" {
desired_rid_db_version = var.desired_rid_db_version
desired_scd_db_version = var.desired_scd_db_version
desired_aux_db_version = var.desired_aux_db_version
schema_manager_enabled = var.schema_manager_enabled
authorization = var.authorization
locality = var.locality
image_pull_secret = var.image_pull_secret
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,18 @@ variable "desired_aux_db_version" {
}


variable "schema_manager_enabled" {
type = bool
default = true
description = <<-EOT
Set to false to not deploy the schema manager jobs.
With Tanka, the schema manager jobs are always deployed when `should_init` is true.

Example: `true`
EOT
}


variable "crdb_image_tag" {
type = string
description = <<-EOT
Expand Down
10 changes: 10 additions & 0 deletions deploy/infrastructure/utils/definitions/schema_manager_enabled.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
variable "schema_manager_enabled" {
type = bool
default = true
description = <<-EOT
Set to false to not deploy the schema manager jobs.
With Tanka, the schema manager jobs are always deployed when `should_init` is true.

Example: `true`
EOT
}
1 change: 1 addition & 0 deletions deploy/infrastructure/utils/variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"desired_rid_db_version",
"desired_scd_db_version",
"desired_aux_db_version",
"schema_manager_enabled",
"crdb_image_tag",
"crdb_cluster_name",
"crdb_cache",
Expand Down
12 changes: 12 additions & 0 deletions deploy/operations/ci/aws-1/variables.gen.tf
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,18 @@ variable "desired_aux_db_version" {
}


variable "schema_manager_enabled" {
type = bool
default = true
description = <<-EOT
Set to false to not deploy the schema manager jobs.
With Tanka, the schema manager jobs are always deployed when `should_init` is true.

Example: `true`
EOT
}


variable "crdb_image_tag" {
type = string
description = <<-EOT
Expand Down
4 changes: 4 additions & 0 deletions deploy/services/helm-charts/dss/templates/schema-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
{{- $schemas = omit $schemas "scd" }}
{{- end }}

{{- if not .Values.dss.schemaManager.enabled }}
{{- $schemas = omit $schemas "rid" "scd" "aux_" }}
{{- end }}

{{- range $service, $schemaVersion := $schemas }}
{{- $serviceClean := $service | replace "_" "" }}
---
Expand Down
4 changes: 4 additions & 0 deletions deploy/services/helm-charts/dss/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,10 @@
"description": "Schema manager jobs configuration",
"type": "object",
"properties": {
"enabled": {
"type": "boolean",
"description": "Deploy the schema manager jobs."
},
"desiredRidDbVersion": {
"type": "string",
"description": "Desired RID DB schema version. When empty, the latest version for the datastore is used. Example: `4.1.0`"
Expand Down
1 change: 1 addition & 0 deletions deploy/services/helm-charts/dss/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dss:
ISAs: true
subscriptions: true
schemaManager:
enabled: true
desiredRidDbVersion: ""
desiredScdDbVersion: ""
desiredAuxDbVersion: ""
Expand Down
Loading