Skip to content

Commit 5aaef15

Browse files
mikkeloscarmikkeloscar
authored
Merge pull request #9214 from zalando-incubator/update-schedules-crd
Update the CRD for (cluster)scalingschedules
2 parents c1b2aa7 + e7a188b commit 5aaef15

File tree

2 files changed

+81
-58
lines changed

2 files changed

+81
-58
lines changed

‎cluster/manifests/kube-metrics-adapter/cluster_scaling_schedules_crd.yaml

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,20 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.16.5
87
name: clusterscalingschedules.zalando.org
98
spec:
109
group: zalando.org
1110
names:
11+
categories:
12+
- all
1213
kind: ClusterScalingSchedule
1314
listKind: ClusterScalingScheduleList
1415
plural: clusterscalingschedules
16+
shortNames:
17+
- css
18+
- clustersched
19+
- clusterschedule
1520
singular: clusterscalingschedule
1621
scope: Cluster
1722
versions:
@@ -23,18 +28,24 @@ spec:
2328
name: v1
2429
schema:
2530
openAPIV3Schema:
26-
description: ClusterScalingSchedule describes a cluster scoped time based
27-
metric to be used in autoscaling operations.
31+
description: |-
32+
ClusterScalingSchedule describes a cluster scoped time based metric
33+
to be used in autoscaling operations.
2834
properties:
2935
apiVersion:
30-
description: 'APIVersion defines the versioned schema of this representation
31-
of an object. Servers should convert recognized schemas to the latest
32-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
36+
description: |-
37+
APIVersion defines the versioned schema of this representation of an object.
38+
Servers should convert recognized schemas to the latest internal value, and
39+
may reject unrecognized values.
40+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3341
type: string
3442
kind:
35-
description: 'Kind is a string value representing the REST resource this
36-
object represents. Servers may infer this from the endpoint the client
37-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
43+
description: |-
44+
Kind is a string value representing the REST resource this object represents.
45+
Servers may infer this from the endpoint the client submits requests to.
46+
Cannot be updated.
47+
In CamelCase.
48+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3849
type: string
3950
metadata:
4051
type: object
@@ -47,25 +58,30 @@ spec:
4758
format: int64
4859
type: integer
4960
schedules:
50-
description: Schedules is the list of schedules for this ScalingSchedule
61+
description: |-
62+
Schedules is the list of schedules for this ScalingSchedule
5163
resource. All the schedules defined here will result on the value
52-
to the same metric. New metrics require a new ScalingSchedule resource.
64+
to the same metric. New metrics require a new ScalingSchedule
65+
resource.
5366
items:
5467
description: Schedule is the schedule details to be used inside
5568
a ScalingSchedule.
5669
properties:
5770
date:
58-
description: Defines the starting date of a OneTime schedule.
59-
It has to be a RFC3339 formatted date.
71+
description: |-
72+
Defines the starting date of a OneTime schedule. It has to
73+
be a RFC3339 formatted date.
6074
format: date-time
6175
type: string
6276
durationMinutes:
63-
description: The duration in minutes (default 0) that the configured
64-
value will be returned for the defined schedule.
77+
description: |-
78+
The duration in minutes (default 0) that the configured value will be
79+
returned for the defined schedule.
6580
type: integer
6681
endDate:
67-
description: Defines the ending date of a OneTime schedule.
68-
It must be a RFC3339 formatted date.
82+
description: |-
83+
Defines the ending date of a OneTime schedule. It must be
84+
a RFC3339 formatted date.
6985
format: date-time
7086
type: string
7187
period:
@@ -95,16 +111,18 @@ spec:
95111
pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9])
96112
type: string
97113
timezone:
98-
description: The location name corresponding to a file in
99-
the IANA Time Zone database, like Europe/Berlin.
114+
description: |-
115+
The location name corresponding to a file in the IANA
116+
Time Zone database, like Europe/Berlin.
100117
type: string
101118
required:
102119
- days
103120
- startTime
104121
- timezone
105122
type: object
106123
type:
107-
description: Defines if the schedule is a OneTime schedule or
124+
description: |-
125+
Defines if the schedule is a OneTime schedule or
108126
Repeating one. If OneTime, date has to be defined. If Repeating,
109127
Period has to be defined.
110128
enum:
@@ -129,8 +147,9 @@ spec:
129147
properties:
130148
active:
131149
default: false
132-
description: Active is true if at least one of the schedules defined
133-
in the scaling schedule is currently active.
150+
description: |-
151+
Active is true if at least one of the schedules defined in the
152+
scaling schedule is currently active.
134153
type: boolean
135154
type: object
136155
required:
@@ -140,9 +159,3 @@ spec:
140159
storage: true
141160
subresources:
142161
status: {}
143-
status:
144-
acceptedNames:
145-
kind: ""
146-
plural: ""
147-
conditions: []
148-
storedVersions: []

‎cluster/manifests/kube-metrics-adapter/scaling_schedules_crd.yaml

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.16.5
87
name: scalingschedules.zalando.org
98
spec:
109
group: zalando.org
@@ -14,6 +13,9 @@ spec:
1413
kind: ScalingSchedule
1514
listKind: ScalingScheduleList
1615
plural: scalingschedules
16+
shortNames:
17+
- sched
18+
- schedule
1719
singular: scalingschedule
1820
scope: Namespaced
1921
versions:
@@ -25,18 +27,24 @@ spec:
2527
name: v1
2628
schema:
2729
openAPIV3Schema:
28-
description: ScalingSchedule describes a namespaced time based metric to be
29-
used in autoscaling operations.
30+
description: |-
31+
ScalingSchedule describes a namespaced time based metric to be used
32+
in autoscaling operations.
3033
properties:
3134
apiVersion:
32-
description: 'APIVersion defines the versioned schema of this representation
33-
of an object. Servers should convert recognized schemas to the latest
34-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
35+
description: |-
36+
APIVersion defines the versioned schema of this representation of an object.
37+
Servers should convert recognized schemas to the latest internal value, and
38+
may reject unrecognized values.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3540
type: string
3641
kind:
37-
description: 'Kind is a string value representing the REST resource this
38-
object represents. Servers may infer this from the endpoint the client
39-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
42+
description: |-
43+
Kind is a string value representing the REST resource this object represents.
44+
Servers may infer this from the endpoint the client submits requests to.
45+
Cannot be updated.
46+
In CamelCase.
47+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4048
type: string
4149
metadata:
4250
type: object
@@ -49,25 +57,30 @@ spec:
4957
format: int64
5058
type: integer
5159
schedules:
52-
description: Schedules is the list of schedules for this ScalingSchedule
60+
description: |-
61+
Schedules is the list of schedules for this ScalingSchedule
5362
resource. All the schedules defined here will result on the value
54-
to the same metric. New metrics require a new ScalingSchedule resource.
63+
to the same metric. New metrics require a new ScalingSchedule
64+
resource.
5565
items:
5666
description: Schedule is the schedule details to be used inside
5767
a ScalingSchedule.
5868
properties:
5969
date:
60-
description: Defines the starting date of a OneTime schedule.
61-
It has to be a RFC3339 formatted date.
70+
description: |-
71+
Defines the starting date of a OneTime schedule. It has to
72+
be a RFC3339 formatted date.
6273
format: date-time
6374
type: string
6475
durationMinutes:
65-
description: The duration in minutes (default 0) that the configured
66-
value will be returned for the defined schedule.
76+
description: |-
77+
The duration in minutes (default 0) that the configured value will be
78+
returned for the defined schedule.
6779
type: integer
6880
endDate:
69-
description: Defines the ending date of a OneTime schedule.
70-
It must be a RFC3339 formatted date.
81+
description: |-
82+
Defines the ending date of a OneTime schedule. It must be
83+
a RFC3339 formatted date.
7184
format: date-time
7285
type: string
7386
period:
@@ -97,16 +110,18 @@ spec:
97110
pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9])
98111
type: string
99112
timezone:
100-
description: The location name corresponding to a file in
101-
the IANA Time Zone database, like Europe/Berlin.
113+
description: |-
114+
The location name corresponding to a file in the IANA
115+
Time Zone database, like Europe/Berlin.
102116
type: string
103117
required:
104118
- days
105119
- startTime
106120
- timezone
107121
type: object
108122
type:
109-
description: Defines if the schedule is a OneTime schedule or
123+
description: |-
124+
Defines if the schedule is a OneTime schedule or
110125
Repeating one. If OneTime, date has to be defined. If Repeating,
111126
Period has to be defined.
112127
enum:
@@ -131,8 +146,9 @@ spec:
131146
properties:
132147
active:
133148
default: false
134-
description: Active is true if at least one of the schedules defined
135-
in the scaling schedule is currently active.
149+
description: |-
150+
Active is true if at least one of the schedules defined in the
151+
scaling schedule is currently active.
136152
type: boolean
137153
type: object
138154
required:
@@ -142,9 +158,3 @@ spec:
142158
storage: true
143159
subresources:
144160
status: {}
145-
status:
146-
acceptedNames:
147-
kind: ""
148-
plural: ""
149-
conditions: []
150-
storedVersions: []

0 commit comments

Comments
 (0)