Merge pull request #7357 from planetscale/ss-oc6-ksorc

examples/operator: fix tags and add vtorc example
vitessio · Jan 23, 2021 · 31fd140 · 31fd140
2 parents 0c75403 + 877ce96
commit 31fd140
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 41 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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: vitess/lite:latest
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git 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
@@ -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/orc_cluster.yaml → examples/operator/vtorc_example.yaml b/examples/operator/orc_cluster.yaml → 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