Skip to content

Commit

Permalink
update yamls
Browse files Browse the repository at this point in the history 
Signed-off-by: Tsuyoshi Ushio <[email protected]>
  • Loading branch information
@TsuyoshiUshio
TsuyoshiUshio committed Oct 3, 2020
1 parent ceea0f7 commit 6b5c0a4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 224 deletions.
51 changes: 0 additions & 51 deletions config/crd/bases/keda.sh_scaledjobs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6365,7 +6365,6 @@ spec:
type: object
name:
type: string
<<<<<<< HEAD
type:
type: string
required:
Expand Down Expand Up @@ -6409,56 +6408,6 @@ spec:
type: string
type: object
type: object
=======
type: object
name:
type: string
type:
type: string
required:
- metadata
- type
type: object
type: array
required:
- jobTargetRef
- triggers
type: object
status:
description: ScaledJobStatus defines the observed state of ScaledJob
properties:
conditions:
description: Conditions an array representation to store multiple Conditions
items:
description: Condition to store the condition state
properties:
message:
description: A human readable message indicating details about
the transition.
type: string
reason:
description: The reason for the condition's last transition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type of condition
type: string
required:
- status
- type
type: object
type: array
lastActiveTime:
format: date-time
type: string
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
>>>>>>> Introduce new scaling logic with fix orphan pod issue
served: true
storage: true
subresources:
Expand Down
173 changes: 0 additions & 173 deletions config/crd/bases/keda.sh_scaledobjects.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
- so
singular: scaledobject
scope: Namespaced
<<<<<<< HEAD
versions:
- additionalPrinterColumns:
- jsonPath: .status.scaleTargetKind
Expand Down Expand Up @@ -72,163 +71,6 @@ spec:
description: HorizontalPodAutoscalerBehavior configures the
scaling behavior of the target in both Up and Down directions
(scaleUp and scaleDown fields respectively).
=======
subresources:
status: {}
validation:
openAPIV3Schema:
description: ScaledObject is a specification for a ScaledObject resource
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: ScaledObjectSpec is the spec for a ScaledObject resource
properties:
advanced:
description: AdvancedConfig specifies advance scaling options
properties:
horizontalPodAutoscalerConfig:
description: HorizontalPodAutoscalerConfig specifies horizontal
scale config
properties:
behavior:
description: HorizontalPodAutoscalerBehavior configures the
scaling behavior of the target in both Up and Down directions
(scaleUp and scaleDown fields respectively).
properties:
scaleDown:
description: scaleDown is scaling policy for scaling Down.
If not set, the default value is to allow to scale down
to minReplicas pods, with a 300 second stabilization window
(i.e., the highest recommendation for the last 300sec
is used).
properties:
policies:
description: policies is a list of potential scaling
polices which can be used during scaling. At least
one policy must be specified, otherwise the HPAScalingRules
will be discarded as invalid
items:
description: HPAScalingPolicy is a single policy which
must hold true for a specified past interval.
properties:
periodSeconds:
description: PeriodSeconds specifies the window
of time for which the policy should hold true.
PeriodSeconds must be greater than zero and
less than or equal to 1800 (30 min).
format: int32
type: integer
type:
description: Type is used to specify the scaling
policy.
type: string
value:
description: Value contains the amount of change
which is permitted by the policy. It must be
greater than zero
format: int32
type: integer
required:
- periodSeconds
- type
- value
type: object
type: array
selectPolicy:
description: selectPolicy is used to specify which policy
should be used. If not set, the default value MaxPolicySelect
is used.
type: string
stabilizationWindowSeconds:
description: 'StabilizationWindowSeconds is the number
of seconds for which past recommendations should be
considered while scaling up or scaling down. StabilizationWindowSeconds
must be greater than or equal to zero and less than
or equal to 3600 (one hour). If not set, use the default
values: - For scale up: 0 (i.e. no stabilization is
done). - For scale down: 300 (i.e. the stabilization
window is 300 seconds long).'
format: int32
type: integer
type: object
scaleUp:
description: 'scaleUp is scaling policy for scaling Up.
If not set, the default value is the higher of: * increase
no more than 4 pods per 60 seconds * double the number
of pods per 60 seconds No stabilization is used.'
properties:
policies:
description: policies is a list of potential scaling
polices which can be used during scaling. At least
one policy must be specified, otherwise the HPAScalingRules
will be discarded as invalid
items:
description: HPAScalingPolicy is a single policy which
must hold true for a specified past interval.
properties:
periodSeconds:
description: PeriodSeconds specifies the window
of time for which the policy should hold true.
PeriodSeconds must be greater than zero and
less than or equal to 1800 (30 min).
format: int32
type: integer
type:
description: Type is used to specify the scaling
policy.
type: string
value:
description: Value contains the amount of change
which is permitted by the policy. It must be
greater than zero
format: int32
type: integer
required:
- periodSeconds
- type
- value
type: object
type: array
selectPolicy:
description: selectPolicy is used to specify which policy
should be used. If not set, the default value MaxPolicySelect
is used.
type: string
stabilizationWindowSeconds:
description: 'StabilizationWindowSeconds is the number
of seconds for which past recommendations should be
considered while scaling up or scaling down. StabilizationWindowSeconds
must be greater than or equal to zero and less than
or equal to 3600 (one hour). If not set, use the default
values: - For scale up: 0 (i.e. no stabilization is
done). - For scale down: 300 (i.e. the stabilization
window is 300 seconds long).'
format: int32
type: integer
type: object
type: object
resourceMetrics:
items:
description: ResourceMetricSource indicates how to scale on
a resource metric known to Kubernetes, as specified in requests
and limits, describing each pod in the current scale target
(e.g. CPU or memory). The values will be averaged together
before being compared to the target. Such metrics are built
in to Kubernetes, and have special scaling options on top
of those available to normal per-pod metrics using the "pods"
source. Only one "target" type should be set.
>>>>>>> Introduce new scaling logic with fix orphan pod issue
properties:
scaleDown:
description: scaleDown is scaling policy for scaling Down.
Expand Down Expand Up @@ -433,7 +275,6 @@ spec:
required:
- name
type: object
<<<<<<< HEAD
triggers:
items:
description: ScaleTriggers reference the scaler that will be used
Expand Down Expand Up @@ -504,20 +345,6 @@ spec:
scaleTargetGVKR:
description: GroupVersionKindResource provides unified structure for
schema.GroupVersionKind and Resource
=======
type: array
required:
- scaleTargetRef
- triggers
type: object
status:
description: ScaledObjectStatus is the status for a ScaledObject resource
properties:
conditions:
description: Conditions an array representation to store multiple Conditions
items:
description: Condition to store the condition state
>>>>>>> Introduce new scaling logic with fix orphan pod issue
properties:
group:
type: string
Expand Down

0 comments on commit 6b5c0a4

Please sign in to comment.