Skip to content

Commit

Permalink
Merge pull request #509 from kubedb/mysql-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
tamalsaha committed May 19, 2020
2 parents 4096642 + 2c9ae14 commit bc1e13f
Show file tree
Hide file tree
Showing 34 changed files with 3,673 additions and 860 deletions.
2 changes: 2 additions & 0 deletions api/api-rules/violation_exceptions.list
Expand Up @@ -207,6 +207,7 @@ API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/dba/v1alpha1,
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/dba/v1alpha1,ProxySQLModificationRequestStatus,Conditions
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/dba/v1alpha1,RedisModificationRequestList,Items
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/dba/v1alpha1,RedisModificationRequestStatus,Conditions
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/dba/v1alpha1,VerticalScale,Containers
API rule violation: names_match,k8s.io/api/core/v1,AzureDiskVolumeSource,DataDiskURI
API rule violation: names_match,k8s.io/api/core/v1,ContainerStatus,LastTerminationState
API rule violation: names_match,k8s.io/api/core/v1,DaemonEndpoint,Port
Expand Down Expand Up @@ -253,3 +254,4 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,
API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,StrVal
API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,Type
API rule violation: names_match,kmodules.xyz/offshoot-api/api/v1,ContainerRuntimeSettings,IONice
API rule violation: names_match,kubedb.dev/apimachinery/apis/dba/v1alpha1,MySQLUpdateSpec,CurrentStatefulSetOrdinal
32 changes: 16 additions & 16 deletions api/crds/bindata.go

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions api/crds/catalog.kubedb.com_mysqlversions.yaml
Expand Up @@ -104,6 +104,42 @@ spec:
required:
- image
type: object
upgradeConstraints:
description: upgrade constraints
properties:
blacklist:
description: List of all rejected version for modification request
properties:
groupReplication:
description: List of all rejected version for groupReplication
modification request
items:
type: string
type: array
standalone:
description: List of all rejected version for standalone modification
request
items:
type: string
type: array
type: object
whitelist:
description: List of all accepted version for modification request
properties:
groupReplication:
description: List of all accepted version for groupReplication
modification request. empty indicates all accepted
items:
type: string
type: array
standalone:
description: List of all accepted version for standalone modification
request. empty indicates all accepted
items:
type: string
type: array
type: object
type: object
version:
description: Version
type: string
Expand All @@ -114,6 +150,7 @@ spec:
- podSecurityPolicies
- replicationModeDetector
- tools
- upgradeConstraints
- version
type: object
type: object
Expand Down
3 changes: 0 additions & 3 deletions api/crds/dba.kubedb.com_etcdmodificationrequests.yaml
Expand Up @@ -60,9 +60,6 @@ spec:
type: string
type:
description: request approval state, currently Approved or Denied.
enum:
- Approved
- Denied
type: string
required:
- type
Expand Down
3 changes: 0 additions & 3 deletions api/crds/dba.kubedb.com_memcachedmodificationrequests.yaml
Expand Up @@ -61,9 +61,6 @@ spec:
type: string
type:
description: request approval state, currently Approved or Denied.
enum:
- Approved
- Denied
type: string
required:
- type
Expand Down
153 changes: 141 additions & 12 deletions api/crds/dba.kubedb.com_mysqlmodificationrequests.yaml
Expand Up @@ -6,6 +6,16 @@ metadata:
app.kubernetes.io/name: kubedb
name: mysqlmodificationrequests.dba.kubedb.com
spec:
additionalPrinterColumns:
- JSONPath: .spec.type
name: Type
type: string
- JSONPath: .status.phase
name: Status
type: string
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: dba.kubedb.com
names:
categories:
Expand All @@ -20,6 +30,8 @@ spec:
singular: mysqlmodificationrequest
preserveUnknownFields: false
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
properties:
Expand All @@ -36,39 +48,156 @@ spec:
metadata:
type: object
spec:
description: MySQLModificationRequestSpec is the spec for elasticsearch
description: MySQLModificationRequestSpec is the spec for MySQLModificationRequest
version
properties:
databaseRef:
description: Specifies the database reference
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
scale:
description: Specifies the scaling info of database
properties:
horizontal:
description: Horizontal specifies the horizontal scaling.
properties:
member:
description: Number of nodes/members of the group
format: int32
type: integer
type: object
memberWeight:
description: specifies the weight of the current member/Node
format: int32
type: integer
vertical:
description: Vertical specifies the vertical scaling.
properties:
containers:
description: Containers represents the containers specification
for scaling the requested resources.
items:
description: Resources requested by a single application container
properties:
name:
description: Name of the container specified as a DNS_LABEL.
Each container in a pod must have a unique name (DNS_LABEL).
Cannot be updated.
type: string
resources:
description: 'Compute Resources required by this container.
Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
properties:
limits:
additionalProperties:
type: string
description: 'Limits describes the maximum amount
of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
requests:
additionalProperties:
type: string
description: 'Requests describes the minimum amount
of compute resources required. If Requests is omitted
for a container, it defaults to Limits if that is
explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
required:
- name
type: object
type: array
type: object
type: object
type:
description: Specifies the modification request type; ScaleUp, ScaleDown,
Upgrade etc.
enum:
- Upgrade
- HorizontalScaling
- VerticalScaling
- VolumeExpansion
- Restart
type: string
update:
description: Specifies the field information that needed to be updated
properties:
CurrentStatefulSetOrdinal:
description: Specifies the current ordinal of the StatefulSet
format: int32
type: integer
targetVersion:
description: Specifies the MySQLVersion object name
type: string
type: object
required:
- databaseRef
- type
type: object
status:
description: MySQLModificationRequestStatus is the status for elasticsearch
version
description: MySQLModificationRequestStatus is the status for MySQLModificationRequest
object
properties:
conditions:
description: Conditions applied to the request, such as approval or
denial.
items:
properties:
lastUpdateTime:
description: timestamp for the last update to this condition
lastTransitionTime:
description: Last time the condition transitioned from one status
to another. This should be when the underlying condition changed. If
that is not known, then using the time when the API field changed
is acceptable.
format: date-time
type: string
message:
description: human readable message with details about the request
state
description: A human readable message indicating details about
the transition. This field may be empty.
type: string
observedGeneration:
description: If set, this represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.condition[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
type: integer
reason:
description: brief reason for the request state
description: The reason for the condition's last transition in
CamelCase. The specific API may choose whether or not this field
is considered a guaranteed API. This field may not be empty.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: request approval state, currently Approved or Denied.
enum:
- Approved
- Denied
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important.
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
observedGeneration:
description: observedGeneration is the most recent generation observed
for this resource. It corresponds to the resource's generation, which
is updated on mutation by the API Server.
format: int64
type: integer
phase:
type: string
type: object
type: object
version: v1alpha1
Expand Down
Expand Up @@ -61,9 +61,6 @@ spec:
type: string
type:
description: request approval state, currently Approved or Denied.
enum:
- Approved
- Denied
type: string
required:
- type
Expand Down
3 changes: 0 additions & 3 deletions api/crds/dba.kubedb.com_pgbouncermodificationrequests.yaml
Expand Up @@ -61,9 +61,6 @@ spec:
type: string
type:
description: request approval state, currently Approved or Denied.
enum:
- Approved
- Denied
type: string
required:
- type
Expand Down
3 changes: 0 additions & 3 deletions api/crds/dba.kubedb.com_postgresmodificationrequests.yaml
Expand Up @@ -61,9 +61,6 @@ spec:
type: string
type:
description: request approval state, currently Approved or Denied.
enum:
- Approved
- Denied
type: string
required:
- type
Expand Down
3 changes: 0 additions & 3 deletions api/crds/dba.kubedb.com_proxysqlmodificationrequests.yaml
Expand Up @@ -59,9 +59,6 @@ spec:
type: string
type:
description: request approval state, currently Approved or Denied.
enum:
- Approved
- Denied
type: string
required:
- type
Expand Down

0 comments on commit bc1e13f

Please sign in to comment.