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

Backport and fix tags for examples/operator #7358

Merged
merged 3 commits into from
Jan 23, 2021
Merged

Backport and fix tags for examples/operator #7358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b780fe
examples/operator: fix tags
sougou Jan 23, 2021
1bb983d
examples/operator: add vtorc support
sougou Oct 7, 2020
91fa15f
examples/operator: fix tags
sougou Jan 23, 2021
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
10 changes: 5 additions & 5 deletions examples/operator/101_initial_cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ metadata:
name: example
spec:
images:
vtctld: vitess/lite:v8.0.0
vtgate: vitess/lite:v8.0.0
vttablet: vitess/lite:v8.0.0
vtbackup: vitess/lite:v8.0.0
vtctld: vitess/lite:v9.0.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you did here. Given how close we are to the release I think this is fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea. Otherwise, we'd have to wait to merge the other PR.

vtgate: vitess/lite:v9.0.0
vttablet: vitess/lite:v9.0.0
vtbackup: vitess/lite:v9.0.0
mysqld:
mysql56Compatible: vitess/lite:v6.0.20-20200429
mysql56Compatible: vitess/lite:v9.0.0
mysqldExporter: prom/mysqld-exporter:v0.11.0
cells:
- name: zone1
Expand Down
10 changes: 5 additions & 5 deletions examples/operator/201_customer_tablets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ metadata:
name: example
spec:
images:
vtctld: vitess/lite:v8.0.0
vtgate: vitess/lite:v8.0.0
vttablet: vitess/lite:v8.0.0
vtbackup: vitess/lite:v8.0.0
vtctld: vitess/lite:v9.0.0
vtgate: vitess/lite:v9.0.0
vttablet: vitess/lite:v9.0.0
vtbackup: vitess/lite:v9.0.0
mysqld:
mysql56Compatible: vitess/lite:v6.0.20-20200429
mysql56Compatible: vitess/lite:v9.0.0
mysqldExporter: prom/mysqld-exporter:v0.11.0
cells:
- name: zone1
Expand Down
10 changes: 5 additions & 5 deletions examples/operator/302_new_shards.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ metadata:
name: example
spec:
images:
vtctld: vitess/lite:v8.0.0
vtgate: vitess/lite:v8.0.0
vttablet: vitess/lite:v8.0.0
vtbackup: vitess/lite:v8.0.0
vtctld: vitess/lite:v9.0.0
vtgate: vitess/lite:v9.0.0
vttablet: vitess/lite:v9.0.0
vtbackup: vitess/lite:v9.0.0
mysqld:
mysql56Compatible: vitess/lite:v8.0.0
mysql56Compatible: vitess/lite:v9.0.0
mysqldExporter: prom/mysqld-exporter:v0.11.0
cells:
- name: zone1
Expand Down
10 changes: 5 additions & 5 deletions examples/operator/306_down_shard_0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ metadata:
name: example
spec:
images:
vtctld: vitess/lite:v8.0.0
vtgate: vitess/lite:v8.0.0
vttablet: vitess/lite:v8.0.0
vtbackup: vitess/lite:v8.0.0
vtctld: vitess/lite:v9.0.0
vtgate: vitess/lite:v9.0.0
vttablet: vitess/lite:v9.0.0
vtbackup: vitess/lite:v9.0.0
mysqld:
mysql56Compatible: us.gcr.io/planetscale-vitess/lite:2020-04-24.228e6fe
mysql56Compatible: vitess/lite:v9.0.0
mysqldExporter: prom/mysqld-exporter:v0.11.0
cells:
- name: zone1
Expand Down
2 changes: 1 addition & 1 deletion examples/operator/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5773,7 +5773,7 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: vitess-operator
image: planetscale/vitess-operator:v2.2.0
image: planetscale/vitess-operator:v2.3.0
imagePullPolicy: IfNotPresent
name: vitess-operator
resources:
Expand Down
2 changes: 1 addition & 1 deletion examples/operator/orcpf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kubectl port-forward --address localhost "$(kubectl get service --selector="plan
process_id1=$!
kubectl port-forward --address localhost "$(kubectl get service --selector="planetscale.com/component=vtgate,!planetscale.com/cell" -o name | head -n1)" 15306:3306 &
process_id2=$!
kubectl port-forward --address localhost "$(kubectl get service --selector="planetscale.com/component=orchestrator" -o name | head -n1)" 3000 &
kubectl port-forward --address localhost "$(kubectl get pod --selector="planetscale.com/component=vtorc" -o name | head -n1)" 3000 &
process_id3=$!
sleep 2
echo "You may point your browser to http://localhost:15000 for vtctld, http://localhost:3000 for orchestrator, and use the following aliases as shortcuts:"
Expand Down
36 changes: 17 additions & 19 deletions examples/operator/orc_cluster.yaml → examples/operator/vtorc_example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ metadata:
name: example
spec:
images:
vtctld: vitess/orctest:v1
orchestrator: vitess/orctest:v1
vtgate: vitess/orctest:v1
vttablet: vitess/orctest:v1
vtbackup: vitess/orctest:v1
vtctld: vitess/lite:v9.0.0
vtorc: vitess/lite:v9.0.0
vtgate: vitess/lite:v9.0.0
vttablet: vitess/lite:v9.0.0
vtbackup: vitess/lite:v9.0.0
mysqld:
mysql56Compatible: vitess/lite:v6.0.20-20200429
mysql56Compatible: vitess/lite:v9.0.0
mysqldExporter: prom/mysqld-exporter:v0.11.0
cells:
- name: zone1
Expand Down Expand Up @@ -43,23 +43,20 @@ spec:
requests:
cpu: 100m
memory: 128Mi
vitessOrchestrator:
cells:
- zone1
configSecret:
name: example-cluster-config
key: orc_config.json
replicas: 1
resources:
limits:
memory: 128Mi
requests:
cpu: 100m
memory: 128Mi

keyspaces:
- name: commerce
turndownPolicy: Immediate
vitessOrchestrator:
configSecret:
name: example-cluster-config
key: orc_config.json
resources:
limits:
memory: 128Mi
requests:
cpu: 100m
memory: 128Mi
partitionings:
- equal:
parts: 1
Expand All @@ -77,6 +74,7 @@ spec:
extraFlags:
db_charset: utf8mb4
disable_active_reparents: "true"
enable_semi_sync: "false"
resources:
requests:
cpu: 100m
Expand Down