From 255cd9a1c53898f2005f95199b73a878361e88e1 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Wed, 13 Jan 2021 16:59:48 +0100
Subject: [PATCH] manifests: regenerate
---
.../prometheus-operator-serviceMonitor.yaml | 6 ++-
...managerConfigCustomResourceDefinition.yaml | 43 ++++++++++++-------
...r-0prometheusCustomResourceDefinition.yaml | 9 ++--
.../prometheus-operator-clusterRole.yaml | 3 +-
...rometheus-operator-clusterRoleBinding.yaml | 3 +-
.../setup/prometheus-operator-deployment.yaml | 20 ++++++---
.../setup/prometheus-operator-service.yaml | 4 +-
.../prometheus-operator-serviceAccount.yaml | 3 +-
8 files changed, 62 insertions(+), 29 deletions(-)
diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml
index 4412f1ac..8cf19eec 100644
--- a/manifests/prometheus-operator-serviceMonitor.yaml
+++ b/manifests/prometheus-operator-serviceMonitor.yaml
@@ -4,7 +4,8 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.44.1
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 0.45.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -19,4 +20,5 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.44.1
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 0.45.0
diff --git a/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml
index 312288f4..faa6e92e 100644
--- a/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml
@@ -47,6 +47,7 @@ spec:
properties:
name:
description: Label to match.
+ minLength: 1
type: string
regex:
description: Whether to match on equality (false) or regular-expression (true).
@@ -56,7 +57,6 @@ spec:
type: string
required:
- name
- - value
type: object
type: array
targetMatch:
@@ -66,6 +66,7 @@ spec:
properties:
name:
description: Label to match.
+ minLength: 1
type: string
regex:
description: Whether to match on equality (false) or regular-expression (true).
@@ -75,7 +76,6 @@ spec:
type: string
required:
- name
- - value
type: object
type: array
type: object
@@ -91,9 +91,10 @@ spec:
description: EmailConfig configures notifications via Email.
properties:
authIdentity:
+ description: The identity to use for authentication.
type: string
authPassword:
- description: SecretKeySelector selects a key of a Secret.
+ description: The secret's key that contains the password to use for authentication. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -108,7 +109,7 @@ spec:
- key
type: object
authSecret:
- description: SecretKeySelector selects a key of a Secret.
+ description: The secret's key that contains the CRAM-MD5 secret. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -123,7 +124,7 @@ spec:
- key
type: object
authUsername:
- description: SMTP authentication information.
+ description: The username to use for authentication.
type: string
from:
description: The sender address.
@@ -135,6 +136,7 @@ spec:
properties:
key:
description: Key of the tuple.
+ minLength: 1
type: string
value:
description: Value of the tuple.
@@ -262,6 +264,7 @@ spec:
type: array
name:
description: Name of the receiver. Must be unique across all items from the list.
+ minLength: 1
type: string
opsgenieConfigs:
description: List of OpsGenie configurations.
@@ -296,6 +299,7 @@ spec:
properties:
key:
description: Key of the tuple.
+ minLength: 1
type: string
value:
description: Value of the tuple.
@@ -466,7 +470,7 @@ spec:
responders:
description: List of responders responsible for notifications.
items:
- description: OpsGenieConfigResponder defines a responder to an incident. One of id, name or username has to be defined.
+ description: OpsGenieConfigResponder defines a responder to an incident. One of `id`, `name` or `username` has to be defined.
properties:
id:
description: ID of the responder.
@@ -476,10 +480,13 @@ spec:
type: string
type:
description: Type of responder.
+ minLength: 1
type: string
username:
description: Username of the responder.
type: string
+ required:
+ - type
type: object
type: array
sendResolved:
@@ -520,6 +527,7 @@ spec:
properties:
key:
description: Key of the tuple.
+ minLength: 1
type: string
value:
description: Value of the tuple.
@@ -901,7 +909,7 @@ spec:
description: Notification title.
type: string
token:
- description: Your registered application’s API token, see https://pushover.net/apps
+ description: The secret's key that contains the registered application’s API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -922,7 +930,7 @@ spec:
description: A title for supplementary URL, otherwise just the URL is shown
type: string
userKey:
- description: The recipient user’s user key.
+ description: The secret's key that contains the recipient user’s user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -956,6 +964,7 @@ spec:
okText:
type: string
text:
+ minLength: 1
type: string
title:
type: string
@@ -967,8 +976,10 @@ spec:
style:
type: string
text:
+ minLength: 1
type: string
type:
+ minLength: 1
type: string
url:
type: string
@@ -1011,8 +1022,10 @@ spec:
short:
type: boolean
title:
+ minLength: 1
type: string
value:
+ minLength: 1
type: string
required:
- title
@@ -1207,7 +1220,7 @@ spec:
description: VictorOpsConfig configures notifications via VictorOps. See https://prometheus.io/docs/alerting/latest/configuration/#victorops_config
properties:
apiKey:
- description: The API key to use when talking to the VictorOps API.
+ description: The secret's key that contains the API key to use when talking to the VictorOps API. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1231,6 +1244,7 @@ spec:
properties:
key:
description: Key of the tuple.
+ minLength: 1
type: string
value:
description: Value of the tuple.
@@ -1407,8 +1421,6 @@ spec:
stateMessage:
description: Contains long explanation of the alerted problem.
type: string
- required:
- - routingKey
type: object
type: array
webhookConfigs:
@@ -1566,8 +1578,9 @@ spec:
type: object
type: object
maxAlerts:
- description: Maximum number of alerts to be sent per webhook message.
+ description: Maximum number of alerts to be sent per webhook message. When 0, all alerts are included.
format: int32
+ minimum: 0
type: integer
sendResolved:
description: Whether or not to notify about resolved alerts.
@@ -1790,7 +1803,7 @@ spec:
type: object
type: array
route:
- description: The Alertmanager route definition for alerts matching the resource’s namespace. It will be added to the generated Alertmanager configuration as a first-level route.
+ description: The Alertmanager route definition for alerts matching the resource’s namespace. If present, it will be added to the generated Alertmanager configuration as a first-level route.
properties:
continue:
description: Boolean indicating whether an alert should continue matching subsequent sibling nodes. It will always be overridden to true for the first-level route by the Prometheus operator.
@@ -1813,6 +1826,7 @@ spec:
properties:
name:
description: Label to match.
+ minLength: 1
type: string
regex:
description: Whether to match on equality (false) or regular-expression (true).
@@ -1822,11 +1836,10 @@ spec:
type: string
required:
- name
- - value
type: object
type: array
receiver:
- description: Name of the receiver for this route. If present, it should be listed in the `receivers` field. The field can be omitted only for nested routes otherwise it is mandatory.
+ description: Name of the receiver for this route. If not empty, it should be listed in the `receivers` field.
type: string
repeatInterval:
description: How long to wait before repeating the last notification. Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds seconds minutes hours).
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
index 3cfc36ab..694f6bfd 100644
--- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -2255,7 +2255,7 @@ spec:
type: string
type: object
podMonitorNamespaceSelector:
- description: Namespaces to be selected for PodMonitor discovery. If nil, only check own namespace.
+ description: Namespace's labels to match for PodMonitor discovery. If nil, only check own namespace.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -2846,7 +2846,7 @@ spec:
description: Time duration Prometheus shall retain data for. Default is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)` (milliseconds seconds minutes hours days weeks years).
type: string
retentionSize:
- description: Maximum amount of disk space used by blocks.
+ description: 'Maximum amount of disk space used by blocks. Supported units: B, KB, MB, GB, TB, PB, EB. Ex: `512MB`.'
type: string
routePrefix:
description: The route prefix Prometheus registers HTTP handlers for. This is useful, if using ExternalURL and a proxy is rewriting HTTP routes of a request, and the actual ExternalURL is still true, but the server serves requests under a different route prefix. For example for use with `kubectl proxy`.
@@ -3016,7 +3016,7 @@ spec:
description: ServiceAccountName is the name of the ServiceAccount to use to run the Prometheus Pods.
type: string
serviceMonitorNamespaceSelector:
- description: Namespaces to be selected for ServiceMonitor discovery. If nil, only check own namespace.
+ description: Namespace's labels to match for ServiceMonitor discovery. If nil, only check own namespace.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -3453,6 +3453,9 @@ spec:
required:
- key
type: object
+ tracingConfigFile:
+ description: TracingConfig specifies the path of the tracing configuration file. When used alongside with TracingConfig, TracingConfigFile takes precedence.
+ type: string
version:
description: Version describes the version of Thanos to use.
type: string
diff --git a/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml
index 5d13eb90..2821c35d 100644
--- a/manifests/setup/prometheus-operator-clusterRole.yaml
+++ b/manifests/setup/prometheus-operator-clusterRole.yaml
@@ -4,7 +4,8 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.44.1
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 0.45.0
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
index c2e44128..9c5b8dfa 100644
--- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
+++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
@@ -4,7 +4,8 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.44.1
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 0.45.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml
index 2361874a..c423a57a 100644
--- a/manifests/setup/prometheus-operator-deployment.yaml
+++ b/manifests/setup/prometheus-operator-deployment.yaml
@@ -4,7 +4,8 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.44.1
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 0.45.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -13,18 +14,20 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/part-of: kube-prometheus
template:
metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.44.1
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 0.45.0
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.44.1
- image: quay.io/prometheus-operator/prometheus-operator:v0.44.1
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.45.0
+ image: quay.io/prometheus-operator/prometheus-operator:v0.45.0
name: prometheus-operator
ports:
- containerPort: 8080
@@ -48,12 +51,19 @@ spec:
ports:
- containerPort: 8443
name: https
+ resources:
+ limits:
+ cpu: 20m
+ memory: 40Mi
+ requests:
+ cpu: 10m
+ memory: 20Mi
securityContext:
runAsGroup: 65532
runAsNonRoot: true
runAsUser: 65532
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
securityContext:
runAsNonRoot: true
runAsUser: 65534
diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml
index ebfd02b6..0a667c83 100644
--- a/manifests/setup/prometheus-operator-service.yaml
+++ b/manifests/setup/prometheus-operator-service.yaml
@@ -4,7 +4,8 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.44.1
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 0.45.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -16,3 +17,4 @@ spec:
selector:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml
index 7799e114..7b8cd289 100644
--- a/manifests/setup/prometheus-operator-serviceAccount.yaml
+++ b/manifests/setup/prometheus-operator-serviceAccount.yaml
@@ -4,6 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.44.1
+ app.kubernetes.io/part-of: kube-prometheus
+ app.kubernetes.io/version: 0.45.0
name: prometheus-operator
namespace: monitoring
--
GitLab