Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

helm: multiple schema and vschema jobs #4388

Merged
merged 1 commit into from
Nov 27, 2018
Merged

helm: multiple schema and vschema jobs #4388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 28 additions & 26 deletions helm/vitess/examples/minikube.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,40 @@ topology:
authType: "none"
keyspaces:
- name: "messagedb"
schema: |-
CREATE TABLE messages (
page BIGINT(20) UNSIGNED,
time_created_ns BIGINT(20) UNSIGNED,
message VARCHAR(10000),
PRIMARY KEY (page, time_created_ns)
) ENGINE=InnoDB
vschema: |-
{
"sharded": true,
"vindexes": {
"hash": {
"type": "hash"
}
},
"tables": {
"messages": {
"column_vindexes": [
{
"column": "page",
"name": "hash"
}
]
}
}
}
shards:
- name: "0"
tablets:
- type: "replica"
vttablet:
replicas: 2
schema:
phase1: |-
CREATE TABLE messages (
page BIGINT(20) UNSIGNED,
time_created_ns BIGINT(20) UNSIGNED,
message VARCHAR(10000),
PRIMARY KEY (page, time_created_ns)
) ENGINE=InnoDB
vschema:
phase1: |-
{
"sharded": true,
"vindexes": {
"hash": {
"type": "hash"
}
},
"tables": {
"messages": {
"column_vindexes": [
{
"column": "page",
"name": "hash"
}
]
}
}
}

etcd:
replicas: 1
Expand Down
17 changes: 9 additions & 8 deletions helm/vitess/templates/_keyspace.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@

# define image to use
{{- $vitessTag := .vitessTag | default $defaultVtctlclient.vitessTag -}}
{{- $secrets := .secrets | default $defaultVtctlclient.secrets }}

{{- if $keyspace.schema }}
{{- range $name, $schema := $keyspace.schema }}
---
###################################
# ApplySchema Job
###################################
apiVersion: batch/v1
kind: Job
metadata:
name: {{ $keyspaceClean }}-apply-schema
name: {{ $keyspaceClean }}-apply-schema-{{ $name }}
spec:
backoffLimit: 1
template:
Expand Down Expand Up @@ -76,22 +77,22 @@ spec:
done

vtctlclient ${VTCTL_EXTRA_FLAGS[@]} -server $VTCTLD_SVC ApplySchema -sql "$(cat <<END_OF_COMMAND
{{ $keyspace.schema | indent 14}}
{{ $schema | indent 14}}
END_OF_COMMAND
)" {{ $keyspace.name }}
volumes:
{{ include "user-secret-volumes" (.secrets | default $defaultVtctlclient.secrets) | indent 8 }}
{{ include "user-secret-volumes" $secrets | indent 8 }}
{{ end }}

{{- if $keyspace.vschema }}
{{- range $name, $vschema := $keyspace.vschema }}
---
###################################
# ApplyVSchema job
###################################
apiVersion: batch/v1
kind: Job
metadata:
name: {{ $keyspaceClean }}-apply-vschema
name: {{ $keyspaceClean }}-apply-vschema-{{ $name }}
spec:
backoffLimit: 1
template:
Expand Down Expand Up @@ -124,11 +125,11 @@ spec:
done

vtctlclient ${VTCTL_EXTRA_FLAGS[@]} -server $VTCTLD_SVC ApplyVSchema -vschema "$(cat <<END_OF_COMMAND
{{ $keyspace.vschema | indent 14 }}
{{ $vschema | indent 14 }}
END_OF_COMMAND
)" {{ $keyspace.name }}
volumes:
{{ include "user-secret-volumes" (.secrets | default $defaultVtctlclient.secrets) | indent 8 }}
{{ include "user-secret-volumes" $secrets | indent 8 }}

{{- end -}}
{{- end -}}
Expand Down