feat: fix vtop example (vitessio#11546) (vitessio#11547)

Signed-off-by: Manan Gupta <[email protected]> Signed-off-by: Manan Gupta <[email protected]> Signed-off-by: Manan Gupta <[email protected]>
Verolop · Oct 20, 2022 · d7ddfbe · d7ddfbe
1 parent 7c76d10
commit d7ddfbe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 60 deletions.
diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml
@@ -72,15 +72,14 @@ spec:
     durabilityPolicy: none
     turndownPolicy: Immediate
     vitessOrchestrator:
-      configSecret:
-        name: example-cluster-config
-        key: orc_config.json
       resources:
         limits:
           memory: 128Mi
         requests:
           cpu: 100m
           memory: 128Mi
+      extraFlags:
+        recovery-period-block-duration: 5s
     partitionings:
     - equal:
         parts: 1
@@ -242,12 +241,3 @@ stringData:
       subjects: ["*"]
       clusters:
         - "local"
-  orc_config.json: |
-    {
-      "Debug": true,
-      "MySQLTopologyUser": "orc_client_user",
-      "MySQLTopologyPassword": "orc_client_user_password",
-      "MySQLReplicaUser": "vt_repl",
-      "MySQLReplicaPassword": "",
-      "RecoveryPeriodBlockSeconds": 5
-    }
diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml
@@ -68,15 +68,14 @@ spec:
     durabilityPolicy: none
     turndownPolicy: Immediate
     vitessOrchestrator:
-      configSecret:
-        name: example-cluster-config
-        key: orc_config.json
       resources:
         limits:
           memory: 128Mi
         requests:
           cpu: 100m
           memory: 128Mi
+      extraFlags:
+        recovery-period-block-duration: 5s
     partitionings:
     - equal:
         parts: 1

diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml
@@ -68,15 +68,14 @@ spec:
     durabilityPolicy: none
     turndownPolicy: Immediate
     vitessOrchestrator:
-      configSecret:
-        name: example-cluster-config
-        key: orc_config.json
       resources:
         limits:
           memory: 128Mi
         requests:
           cpu: 100m
           memory: 128Mi
+      extraFlags:
+        recovery-period-block-duration: 5s
     partitionings:
     - equal:
         parts: 1

diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml
@@ -68,15 +68,14 @@ spec:
     durabilityPolicy: none
     turndownPolicy: Immediate
     vitessOrchestrator:
-      configSecret:
-        name: example-cluster-config
-        key: orc_config.json
       resources:
         limits:
           memory: 128Mi
         requests:
           cpu: 100m
           memory: 128Mi
+      extraFlags:
+        recovery-period-block-duration: 5s
     partitionings:
     - equal:
         parts: 1

diff --git a/examples/operator/operator.yaml b/examples/operator/operator.yaml
@@ -2450,6 +2450,7 @@ spec:
                               properties:
                                 parts:
                                   format: int32
+                                  maximum: 65536
                                   minimum: 1
                                   type: integer
                                 shardTemplate:
@@ -2801,17 +2802,6 @@ spec:
                             additionalProperties:
                               type: string
                             type: object
-                          configSecret:
-                            properties:
-                              key:
-                                type: string
-                              name:
-                                type: string
-                              volumeName:
-                                type: string
-                            required:
-                              - key
-                            type: object
                           extraEnv:
                             items:
                               properties:
@@ -2936,8 +2926,6 @@ spec:
                             x-kubernetes-preserve-unknown-fields: true
                           tolerations:
                             x-kubernetes-preserve-unknown-fields: true
-                        required:
-                          - configSecret
                         type: object
                     required:
                       - name
@@ -4002,6 +3990,7 @@ spec:
                         properties:
                           parts:
                             format: int32
+                            maximum: 65536
                             minimum: 1
                             type: integer
                           shardTemplate:
@@ -4387,17 +4376,6 @@ spec:
                       additionalProperties:
                         type: string
                       type: object
-                    configSecret:
-                      properties:
-                        key:
-                          type: string
-                        name:
-                          type: string
-                        volumeName:
-                          type: string
-                      required:
-                        - key
-                      type: object
                     extraEnv:
                       items:
                         properties:
@@ -4522,8 +4500,6 @@ spec:
                       x-kubernetes-preserve-unknown-fields: true
                     tolerations:
                       x-kubernetes-preserve-unknown-fields: true
-                  required:
-                    - configSecret
                   type: object
                 zoneMap:
                   additionalProperties:
@@ -5258,17 +5234,6 @@ spec:
                       additionalProperties:
                         type: string
                       type: object
-                    configSecret:
-                      properties:
-                        key:
-                          type: string
-                        name:
-                          type: string
-                        volumeName:
-                          type: string
-                      required:
-                        - key
-                      type: object
                     extraEnv:
                       items:
                         properties:
@@ -5393,8 +5358,6 @@ spec:
                       x-kubernetes-preserve-unknown-fields: true
                     tolerations:
                       x-kubernetes-preserve-unknown-fields: true
-                  required:
-                    - configSecret
                   type: object
                 zoneMap:
                   additionalProperties: