Skip to content

Commit

Permalink
Merge pull request #502 from planetscale/r2.11-main-update
Browse files Browse the repository at this point in the history 
update v18 vitess version to vtop main
  • Loading branch information
@GuptaManan100
GuptaManan100 authored Jan 4, 2024
2 parents 95fcf6a + c69a243 commit de214a8
Show file tree
Hide file tree
Showing 4 changed files with 224 additions and 9 deletions.
12 changes: 6 additions & 6 deletions test/endtoend/operator/101_initial_cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ metadata:
name: example
spec:
images:
vtctld: vitess/lite:v18.0.0-rc1
vtgate: vitess/lite:v18.0.0-rc1
vttablet: vitess/lite:v18.0.0-rc1
vtorc: vitess/lite:v18.0.0-rc1
vtbackup: vitess/lite:v18.0.0-rc1
vtctld: vitess/lite:v18.0.0
vtgate: vitess/lite:v18.0.0
vttablet: vitess/lite:v18.0.0
vtorc: vitess/lite:v18.0.0
vtbackup: vitess/lite:v18.0.0
mysqld:
mysql80Compatible: vitess/lite:v18.0.0-rc1
mysql80Compatible: vitess/lite:v18.0.0
mysqldExporter: prom/mysqld-exporter:v0.11.0
cells:
- name: zone1
Expand Down
215 changes: 215 additions & 0 deletions test/endtoend/operator/operator-latest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2819,6 +2819,45 @@ spec:
required:
- resources
type: object
mysqldExporter:
properties:
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object
required:
- resources
type: object
name:
default: ""
type: string
replicas:
format: int32
minimum: 0
Expand Down Expand Up @@ -2876,6 +2915,9 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
terminationGracePeriodSeconds:
format: int64
type: integer
required:
- resources
type: object
Expand All @@ -2889,6 +2931,7 @@ spec:
x-kubernetes-list-map-keys:
- type
- cell
- name
x-kubernetes-list-type: map
required:
- databaseInitScriptSecret
Expand Down Expand Up @@ -3214,6 +3257,45 @@ spec:
required:
- resources
type: object
mysqldExporter:
properties:
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object
required:
- resources
type: object
name:
default: ""
type: string
replicas:
format: int32
minimum: 0
Expand Down Expand Up @@ -3271,6 +3353,9 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
terminationGracePeriodSeconds:
format: int64
type: integer
required:
- resources
type: object
Expand All @@ -3284,6 +3369,7 @@ spec:
x-kubernetes-list-map-keys:
- type
- cell
- name
x-kubernetes-list-type: map
required:
- databaseInitScriptSecret
Expand Down Expand Up @@ -4521,6 +4607,45 @@ spec:
required:
- resources
type: object
mysqldExporter:
properties:
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object
required:
- resources
type: object
name:
default: ""
type: string
replicas:
format: int32
minimum: 0
Expand Down Expand Up @@ -4578,6 +4703,9 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
terminationGracePeriodSeconds:
format: int64
type: integer
required:
- resources
type: object
Expand All @@ -4591,6 +4719,7 @@ spec:
x-kubernetes-list-map-keys:
- type
- cell
- name
x-kubernetes-list-type: map
required:
- databaseInitScriptSecret
Expand Down Expand Up @@ -4916,6 +5045,45 @@ spec:
required:
- resources
type: object
mysqldExporter:
properties:
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object
required:
- resources
type: object
name:
default: ""
type: string
replicas:
format: int32
minimum: 0
Expand Down Expand Up @@ -4973,6 +5141,9 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
terminationGracePeriodSeconds:
format: int64
type: integer
required:
- resources
type: object
Expand All @@ -4986,6 +5157,7 @@ spec:
x-kubernetes-list-map-keys:
- type
- cell
- name
x-kubernetes-list-type: map
required:
- databaseInitScriptSecret
Expand Down Expand Up @@ -5853,6 +6025,45 @@ spec:
required:
- resources
type: object
mysqldExporter:
properties:
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object
required:
- resources
type: object
name:
default: ""
type: string
replicas:
format: int32
minimum: 0
Expand Down Expand Up @@ -5910,6 +6121,9 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
terminationGracePeriodSeconds:
format: int64
type: integer
required:
- resources
type: object
Expand All @@ -5923,6 +6137,7 @@ spec:
x-kubernetes-list-map-keys:
- type
- cell
- name
x-kubernetes-list-type: map
topologyReconciliation:
properties:
Expand Down
4 changes: 2 additions & 2 deletions test/endtoend/operator/operator.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6357,7 +6357,7 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: vitess-operator
image: planetscale/vitess-operator:v2.11.0-rc1
image: planetscale/vitess-operator:v2.11.0
name: vitess-operator
resources:
limits:
Expand All @@ -6382,4 +6382,4 @@ globalDefault: false
kind: PriorityClass
metadata:
name: vitess
value: 1000
value: 1000
Loading

0 comments on commit de214a8

Please sign in to comment.