From 5b780feb8e05117766682f6d802ca22e0d842083 Mon Sep 17 00:00:00 2001 From: Sugu Sougoumarane Date: Sat, 23 Jan 2021 13:05:28 -0800 Subject: [PATCH 1/3] examples/operator: fix tags Signed-off-by: Sugu Sougoumarane --- examples/operator/101_initial_cluster.yaml | 10 +++++----- examples/operator/201_customer_tablets.yaml | 10 +++++----- examples/operator/302_new_shards.yaml | 10 +++++----- examples/operator/306_down_shard_0.yaml | 10 +++++----- .../operator/{orc_cluster.yaml => vtorc_example.yaml} | 0 5 files changed, 20 insertions(+), 20 deletions(-) rename examples/operator/{orc_cluster.yaml => vtorc_example.yaml} (100%) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index dd28b66fe3f..8df5c19c8e1 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -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:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest mysqld: - mysql56Compatible: vitess/lite:v6.0.20-20200429 + mysql56Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml index 87aff91e050..44938131139 100644 --- a/examples/operator/201_customer_tablets.yaml +++ b/examples/operator/201_customer_tablets.yaml @@ -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:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest mysqld: - mysql56Compatible: vitess/lite:v6.0.20-20200429 + mysql56Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml index 1647da4a9b2..2ea942bfdb4 100644 --- a/examples/operator/302_new_shards.yaml +++ b/examples/operator/302_new_shards.yaml @@ -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:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest mysqld: - mysql56Compatible: vitess/lite:v8.0.0 + mysql56Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml index 2629b57fa06..4f0fc6dee60 100644 --- a/examples/operator/306_down_shard_0.yaml +++ b/examples/operator/306_down_shard_0.yaml @@ -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:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest mysqld: - mysql56Compatible: us.gcr.io/planetscale-vitess/lite:2020-04-24.228e6fe + mysql56Compatible: us.gcr.io/planetscale-vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/orc_cluster.yaml b/examples/operator/vtorc_example.yaml similarity index 100% rename from examples/operator/orc_cluster.yaml rename to examples/operator/vtorc_example.yaml From 1bb983d11e58cbb120ce881f6627ce65f5cd6786 Mon Sep 17 00:00:00 2001 From: Sugu Sougoumarane Date: Tue, 6 Oct 2020 21:24:08 -0700 Subject: [PATCH 2/3] examples/operator: add vtorc support Signed-off-by: Sugu Sougoumarane --- examples/operator/operator.yaml | 2 +- examples/operator/orcpf.sh | 2 +- examples/operator/vtorc_example.yaml | 36 +++++++++++++--------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/examples/operator/operator.yaml b/examples/operator/operator.yaml index 3bb6f6c4d31..0549856ee01 100644 --- a/examples/operator/operator.yaml +++ b/examples/operator/operator.yaml @@ -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:latest imagePullPolicy: IfNotPresent name: vitess-operator resources: diff --git a/examples/operator/orcpf.sh b/examples/operator/orcpf.sh index 692cab3e74e..dc4438e0137 100755 --- a/examples/operator/orcpf.sh +++ b/examples/operator/orcpf.sh @@ -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:" diff --git a/examples/operator/vtorc_example.yaml b/examples/operator/vtorc_example.yaml index 1cff45c99d2..ccaa74bc295 100644 --- a/examples/operator/vtorc_example.yaml +++ b/examples/operator/vtorc_example.yaml @@ -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:latest + vtorc: vitess/lite:latest + vtgate: vitess/lite:latest + vttablet: vitess/lite:latest + vtbackup: vitess/lite:latest mysqld: - mysql56Compatible: vitess/lite:v6.0.20-20200429 + mysql56Compatible: vitess/lite:latest mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 @@ -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 @@ -77,6 +74,7 @@ spec: extraFlags: db_charset: utf8mb4 disable_active_reparents: "true" + enable_semi_sync: "false" resources: requests: cpu: 100m From 91fa15fbe38c731f5328b0086ac0f32a5ea42e4b Mon Sep 17 00:00:00 2001 From: Sugu Sougoumarane Date: Sat, 23 Jan 2021 13:36:37 -0800 Subject: [PATCH 3/3] examples/operator: fix tags Signed-off-by: Sugu Sougoumarane --- examples/operator/101_initial_cluster.yaml | 10 +++++----- examples/operator/201_customer_tablets.yaml | 10 +++++----- examples/operator/302_new_shards.yaml | 10 +++++----- examples/operator/306_down_shard_0.yaml | 10 +++++----- examples/operator/operator.yaml | 2 +- examples/operator/vtorc_example.yaml | 12 ++++++------ 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 8df5c19c8e1..2fe2b020de9 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,12 +8,12 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest + 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:latest + mysql56Compatible: vitess/lite:v9.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml index 44938131139..81ec63e8e78 100644 --- a/examples/operator/201_customer_tablets.yaml +++ b/examples/operator/201_customer_tablets.yaml @@ -4,12 +4,12 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest + 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:latest + mysql56Compatible: vitess/lite:v9.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml index 2ea942bfdb4..d02c2e41a25 100644 --- a/examples/operator/302_new_shards.yaml +++ b/examples/operator/302_new_shards.yaml @@ -4,12 +4,12 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest + 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:latest + mysql56Compatible: vitess/lite:v9.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml index 4f0fc6dee60..28a4d71d160 100644 --- a/examples/operator/306_down_shard_0.yaml +++ b/examples/operator/306_down_shard_0.yaml @@ -4,12 +4,12 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest + 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:latest + mysql56Compatible: vitess/lite:v9.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/operator.yaml b/examples/operator/operator.yaml index 0549856ee01..916102603c6 100644 --- a/examples/operator/operator.yaml +++ b/examples/operator/operator.yaml @@ -5773,7 +5773,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: vitess-operator - image: planetscale/vitess-operator:latest + image: planetscale/vitess-operator:v2.3.0 imagePullPolicy: IfNotPresent name: vitess-operator resources: diff --git a/examples/operator/vtorc_example.yaml b/examples/operator/vtorc_example.yaml index ccaa74bc295..63d01861267 100644 --- a/examples/operator/vtorc_example.yaml +++ b/examples/operator/vtorc_example.yaml @@ -8,13 +8,13 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtorc: vitess/lite:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest + 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:latest + mysql56Compatible: vitess/lite:v9.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1