From 9a83cc3ff85a331e4b1cf05266ddd2eb7ad1a52b Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 25 May 2022 16:33:22 +0200 Subject: [PATCH] *: synchronize with latest main changes Signed-off-by: Simon Pasquier --- example/admission-webhook/pod-disruption-budget.yaml | 2 +- .../monitoring.coreos.com_alertmanagerconfigs.yaml | 12 ++++++++++++ .../monitoring.coreos.com_podmonitors.yaml | 9 +++++++++ .../monitoring.coreos.com_prometheuses.yaml | 6 ++++++ .../alertmanagerconfigs-v1beta1-crd.libsonnet | 7 +++++++ .../monitoring/v1beta1/alertmanager_config_types.go | 1 + 6 files changed, 36 insertions(+), 1 deletion(-) diff --git a/example/admission-webhook/pod-disruption-budget.yaml b/example/admission-webhook/pod-disruption-budget.yaml index 5547fa7c4fb..e58f507e4b0 100644 --- a/example/admission-webhook/pod-disruption-budget.yaml +++ b/example/admission-webhook/pod-disruption-budget.yaml @@ -3,7 +3,7 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.56.2 + app.kubernetes.io/version: 0.56.3 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/example/prometheus-operator-crd-full/monitoring.coreos.com_alertmanagerconfigs.yaml b/example/prometheus-operator-crd-full/monitoring.coreos.com_alertmanagerconfigs.yaml index 3fb6688480f..3d5cc4cf391 100644 --- a/example/prometheus-operator-crd-full/monitoring.coreos.com_alertmanagerconfigs.yaml +++ b/example/prometheus-operator-crd-full/monitoring.coreos.com_alertmanagerconfigs.yaml @@ -860,6 +860,12 @@ spec: type: string type: description: Type of responder. + enum: + - team + - teams + - user + - escalation + - schedule minLength: 1 type: string username: @@ -5102,6 +5108,12 @@ spec: type: string type: description: Type of responder. + enum: + - team + - teams + - user + - escalation + - schedule minLength: 1 type: string username: diff --git a/example/prometheus-operator-crd-full/monitoring.coreos.com_podmonitors.yaml b/example/prometheus-operator-crd-full/monitoring.coreos.com_podmonitors.yaml index bf474676b05..3c16cf96beb 100644 --- a/example/prometheus-operator-crd-full/monitoring.coreos.com_podmonitors.yaml +++ b/example/prometheus-operator-crd-full/monitoring.coreos.com_podmonitors.yaml @@ -40,6 +40,15 @@ spec: description: Specification of desired Pod selection for target discovery by Prometheus. properties: + attachMetadata: + description: 'Attaches node metadata to discovered targets. Only valid + for role: pod. Only valid in Prometheus versions 2.35.0 and newer.' + properties: + node: + description: When set to true, Prometheus must have permissions + to get Nodes. + type: boolean + type: object jobLabel: description: The label to use to retrieve the job name from. type: string diff --git a/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheuses.yaml b/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheuses.yaml index 84cd14a30ab..11b811770f6 100644 --- a/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheuses.yaml +++ b/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheuses.yaml @@ -8392,6 +8392,9 @@ spec: - type type: object type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map paused: description: Represents whether any actions on the underlying managed objects are being performed. Only delete actions will be performed. @@ -8436,6 +8439,9 @@ spec: - updatedReplicas type: object type: array + x-kubernetes-list-map-keys: + - shardID + x-kubernetes-list-type: map unavailableReplicas: description: Total number of unavailable pods targeted by this Prometheus deployment. diff --git a/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet b/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet index 2423c13eb95..24d652875bd 100644 --- a/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet +++ b/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet @@ -788,6 +788,13 @@ }, type: { description: 'Type of responder.', + enum: [ + 'team', + 'teams', + 'user', + 'escalation', + 'schedule', + ], minLength: 1, type: 'string', }, diff --git a/pkg/apis/monitoring/v1beta1/alertmanager_config_types.go b/pkg/apis/monitoring/v1beta1/alertmanager_config_types.go index 70c9fbea62c..7877837b03e 100644 --- a/pkg/apis/monitoring/v1beta1/alertmanager_config_types.go +++ b/pkg/apis/monitoring/v1beta1/alertmanager_config_types.go @@ -517,6 +517,7 @@ type OpsGenieConfigResponder struct { Username string `json:"username,omitempty"` // Type of responder. // +kubebuilder:validation:MinLength=1 + // +kubebuilder:validation:Enum=team;teams;user;escalation;schedule Type string `json:"type"` }