From f63915f7ff8bb943deecf7f6b3d437fed23c8ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Desch=C3=AAnes?= Date: Fri, 12 May 2023 10:08:58 -0400 Subject: [PATCH] helm: bump app version to v0.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antoine Deschênes --- docs/helm/Chart.yaml | 2 +- .../cluster_scaling_schedules_crd.yaml | 40 +++++++++++++++--- docs/helm/templates/deployment.yaml | 3 ++ docs/helm/templates/rbac.yaml | 17 ++++++++ .../helm/templates/scaling_schedules_crd.yaml | 42 ++++++++++++++++--- docs/helm/values.yaml | 3 +- 6 files changed, 95 insertions(+), 12 deletions(-) diff --git a/docs/helm/Chart.yaml b/docs/helm/Chart.yaml index 5174e2ff..c3b65c73 100644 --- a/docs/helm/Chart.yaml +++ b/docs/helm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: kube-metrics-adapter -version: 0.1.18 +version: 0.2.0 description: kube-metrics-adapter helm chart home: https://github.com/zalando-incubator/kube-metrics-adapter maintainers: diff --git a/docs/helm/templates/cluster_scaling_schedules_crd.yaml b/docs/helm/templates/cluster_scaling_schedules_crd.yaml index d99438cb..a29a3655 100644 --- a/docs/helm/templates/cluster_scaling_schedules_crd.yaml +++ b/docs/helm/templates/cluster_scaling_schedules_crd.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.0 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: clusterscalingschedules.zalando.org spec: @@ -15,7 +15,12 @@ spec: singular: clusterscalingschedule scope: Cluster versions: - - name: v1 + - additionalPrinterColumns: + - description: Whether one or more schedules are currently active. + jsonPath: .status.active + name: Active + type: boolean + name: v1 schema: openAPIV3Schema: description: ClusterScalingSchedule describes a cluster scoped time based @@ -36,6 +41,11 @@ spec: spec: description: ScalingScheduleSpec is the spec part of the ScalingSchedule. properties: + scalingWindowDurationMinutes: + description: Fade the scheduled values in and out over this many minutes. + If unset, the default per-cluster value will be used. + format: int64 + type: integer schedules: description: Schedules is the list of schedules for this ScalingSchedule resource. All the schedules defined here will result on the value @@ -50,9 +60,14 @@ spec: format: date-time type: string durationMinutes: - description: The duration in minutes that the configured value - will be returned for the defined schedule. + description: The duration in minutes (default 0) that the configured + value will be returned for the defined schedule. type: integer + endDate: + description: Defines the ending date of a OneTime schedule. + It must be a RFC3339 formated date. + format: date-time + type: string period: description: Defines the details of a Repeating schedule. properties: @@ -71,6 +86,10 @@ spec: - Sat type: string type: array + endTime: + description: The endTime has the format HH:MM + pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9]) + type: string startTime: description: The startTime has the format HH:MM pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9]) @@ -95,9 +114,9 @@ spec: value: description: The metric value that will be returned for the defined schedule. + format: int64 type: integer required: - - durationMinutes - type - value type: object @@ -105,11 +124,22 @@ spec: required: - schedules type: object + status: + description: ScalingScheduleStatus is the status section of the ScalingSchedule. + properties: + active: + default: false + description: Active is true if at least one of the schedules defined + in the scaling schedule is currently active. + type: boolean + type: object required: - spec type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" diff --git a/docs/helm/templates/deployment.yaml b/docs/helm/templates/deployment.yaml index 16f14ae7..273ac889 100644 --- a/docs/helm/templates/deployment.yaml +++ b/docs/helm/templates/deployment.yaml @@ -164,6 +164,9 @@ spec: {{- if .Values.skipperIngressMetrics }} - --skipper-ingress-metrics={{ .Values.skipperIngressMetrics }} {{- end}} + {{- if .Values.skipperRouteGroupMetrics }} + - --skipper-routegroup-metrics={{ .Values.skipperRouteGroupMetrics }} + {{- end}} {{- if .Values.log.stderrThreshold }} - --stderrthreshold={{ .Values.log.stderrThreshold }} {{- end}} diff --git a/docs/helm/templates/rbac.yaml b/docs/helm/templates/rbac.yaml index 1f9d2502..2c42f321 100644 --- a/docs/helm/templates/rbac.yaml +++ b/docs/helm/templates/rbac.yaml @@ -59,12 +59,22 @@ rules: - statefulsets verbs: - get +{{- if .Values.skipperRouteGroupMetrics }} - apiGroups: - networking.k8s.io resources: - ingresses verbs: - get +{{- end }} +{{- if .Values.skipperRouteGroupMetrics }} +- apiGroups: + - zalando.org + resources: + - routegroups + verbs: + - get +{{- end }} - apiGroups: - autoscaling resources: @@ -83,6 +93,13 @@ rules: - get - list - watch +- apiGroups: + - zalando.org + resources: + - clusterscalingschedules/status + - scalingschedules/status + verbs: + - update {{- end}} --- apiVersion: rbac.authorization.k8s.io/v1 diff --git a/docs/helm/templates/scaling_schedules_crd.yaml b/docs/helm/templates/scaling_schedules_crd.yaml index 24a6b97d..301cbd5d 100644 --- a/docs/helm/templates/scaling_schedules_crd.yaml +++ b/docs/helm/templates/scaling_schedules_crd.yaml @@ -3,19 +3,26 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.0 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: scalingschedules.zalando.org spec: group: zalando.org names: + categories: + - all kind: ScalingSchedule listKind: ScalingScheduleList plural: scalingschedules singular: scalingschedule scope: Namespaced versions: - - name: v1 + - additionalPrinterColumns: + - description: Whether one or more schedules are currently active. + jsonPath: .status.active + name: Active + type: boolean + name: v1 schema: openAPIV3Schema: description: ScalingSchedule describes a namespaced time based metric to be @@ -36,6 +43,11 @@ spec: spec: description: ScalingScheduleSpec is the spec part of the ScalingSchedule. properties: + scalingWindowDurationMinutes: + description: Fade the scheduled values in and out over this many minutes. + If unset, the default per-cluster value will be used. + format: int64 + type: integer schedules: description: Schedules is the list of schedules for this ScalingSchedule resource. All the schedules defined here will result on the value @@ -50,9 +62,14 @@ spec: format: date-time type: string durationMinutes: - description: The duration in minutes that the configured value - will be returned for the defined schedule. + description: The duration in minutes (default 0) that the configured + value will be returned for the defined schedule. type: integer + endDate: + description: Defines the ending date of a OneTime schedule. + It must be a RFC3339 formated date. + format: date-time + type: string period: description: Defines the details of a Repeating schedule. properties: @@ -71,6 +88,10 @@ spec: - Sat type: string type: array + endTime: + description: The endTime has the format HH:MM + pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9]) + type: string startTime: description: The startTime has the format HH:MM pattern: (([0-1][0-9])|([2][0-3])):([0-5][0-9]) @@ -95,9 +116,9 @@ spec: value: description: The metric value that will be returned for the defined schedule. + format: int64 type: integer required: - - durationMinutes - type - value type: object @@ -105,11 +126,22 @@ spec: required: - schedules type: object + status: + description: ScalingScheduleStatus is the status section of the ScalingSchedule. + properties: + active: + default: false + description: Active is true if at least one of the schedules defined + in the scaling schedule is currently active. + type: boolean + type: object required: - spec type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: "" diff --git a/docs/helm/values.yaml b/docs/helm/values.yaml index 0589bc39..8a8e7d1a 100644 --- a/docs/helm/values.yaml +++ b/docs/helm/values.yaml @@ -4,7 +4,7 @@ replicas: 1 registry: image: registry.opensource.zalan.do/teapot/kube-metrics-adapter - imageTag: v0.1.10 + imageTag: v0.2.0 imagePullPolicy: IfNotPresent service: @@ -22,6 +22,7 @@ http2MaxStreamsPerConnection: listerKubeConfig: skipperBackendsAnnotation: skipperIngressMetrics: +skipperRouteGroupMetrics: token: vmodule: