Skip to content

Commit

Permalink
Change []ContainerResources to core.ResourceRequirements
Browse files Browse the repository at this point in the history 
Signed-off-by: Fahim Abrar <fahimabrar02@gmail.com>
  • Loading branch information
@faem
faem committed May 22, 2020
1 parent e3058f8 commit f38a109
Show file tree
Hide file tree
Showing 9 changed files with 377 additions and 420 deletions.
4 changes: 0 additions & 4 deletions api/api-rules/violation_exceptions.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,6 @@ API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MemcachedOpsRequestStatus,Conditions
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MongoDBOpsRequestList,Items
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MongoDBOpsRequestStatus,Conditions
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MongoDBVerticalScalingSpec,ConfigServer
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MongoDBVerticalScalingSpec,Containers
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MongoDBVerticalScalingSpec,Mongos
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MongoDBVerticalScalingSpec,Shard
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MySQLOpsRequestList,Items
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MySQLOpsRequestStatus,Conditions
API rule violation: list_type_missing,kubedb.dev/apimachinery/apis/ops/v1alpha1,MySQLVerticalScalingSpec,Containers
Expand Down
4 changes: 2 additions & 2 deletions api/crds/bindata.go
View file

Large diffs are not rendered by default.

213 changes: 88 additions & 125 deletions api/crds/ops.kubedb.com_mongodbopsrequests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,137 +111,100 @@ spec:
description: Specifies information necessary for vertical scaling
properties:
configServer:
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.
description: ResourceRequirements describes the compute resource
requirements.
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
exporter:
description: ResourceRequirements describes the compute resource
requirements.
properties:
limits:
additionalProperties:
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
containers:
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.
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
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
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
mongos:
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.
description: ResourceRequirements describes the compute resource
requirements.
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
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
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
shard:
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.
description: ResourceRequirements describes the compute resource
requirements.
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
standalone:
description: ResourceRequirements describes the compute resource
requirements.
properties:
limits:
additionalProperties:
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
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
type: object
required:
- databaseRef
Expand Down
25 changes: 8 additions & 17 deletions api/openapi-spec/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31033,28 +31033,19 @@
"type": "object",
"properties": {
"configServer": {
"type": "array",
"items": {
"$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.ContainerResources"
}
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements"
},
"containers": {
"type": "array",
"items": {
"$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.ContainerResources"
}
"exporter": {
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements"
},
"mongos": {
"type": "array",
"items": {
"$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.ContainerResources"
}
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements"
},
"shard": {
"type": "array",
"items": {
"$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.ContainerResources"
}
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements"
},
"standalone": {
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements"
}
}
},
Expand Down
Loading

0 comments on commit f38a109

Please sign in to comment.