diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index a47360c886..2146d578ce 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -5,7 +5,7 @@ "kubeStateMetrics": "2.9.2", "nodeExporter": "1.7.0", "prometheus": "2.47.2", - "prometheusAdapter": "0.11.1", + "prometheusAdapter": "0.11.2", "prometheusOperator": "0.69.1", "kubeRbacProxy": "0.15.0", "configmapReload": "0.5.0", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 9307742c02..5c725200c1 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "4d8eefb7e96bf2b33ec9c6d3017ad24f9ffbb82a", + "version": "b343231b1294789499f2038a5e706ad9da41457c", "sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU=" }, { @@ -128,7 +128,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "79502954f995929c8b3511d533a2e34bb3ee40ca", + "version": "b836d964459d31881f4332f6ac90f8bf77e66550", "sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=", "name": "prometheus-operator-mixin" }, @@ -139,8 +139,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "79502954f995929c8b3511d533a2e34bb3ee40ca", - "sum": "K0lvxR49VZN9odlPo+12XBjzPqeQgN/imkJq5GqexaI=" + "version": "b836d964459d31881f4332f6ac90f8bf77e66550", + "sum": "vP6gWEmg5GLbC5IpH7ErcTx1spHgQ8Vlc2A9Zc7spP0=" }, { "source": { @@ -149,8 +149,8 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "ce6efba023b0397cb522d64e910684e48d12455f", - "sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=", + "version": "716830a56fe4f72b4c50d9b4918243235ea2b7f1", + "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=", "name": "alertmanager" }, { @@ -160,7 +160,7 @@ "subdir": "docs/node-mixin" } }, - "version": "81fc05c45f4e63d4fb8cb1acda016493b003b9f3", + "version": "78af952e638b5e0d00640fbdeefd096df4a51dc2", "sum": "QZwFBpulndqo799gkR5rP2/WdcQKQkNnaBwhaOI8Jeg=" }, { @@ -170,7 +170,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "acc114fe553b660cefc71a0311792ef8be4a186a", + "version": "1bfb3ed062e99bd3c74e05d9ff9a7fa4e30bbe21", "sum": "rNvddVTMNfaguOGzEGoeKjUsfhlXJBUImC+SIFNNCiM=", "name": "prometheus" }, @@ -192,7 +192,7 @@ "subdir": "mixin" } }, - "version": "c74a050a190486addc1ea1ca4b522462fc7ec680", + "version": "2320e49d8537ff748ed70269e719b0a7399bb515", "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=", "name": "thanos-mixin" }, diff --git a/manifests/alertmanager-prometheusRule.yaml b/manifests/alertmanager-prometheusRule.yaml index feb5d5e918..964f89f52c 100644 --- a/manifests/alertmanager-prometheusRule.yaml +++ b/manifests/alertmanager-prometheusRule.yaml @@ -50,7 +50,7 @@ spec: ( rate(alertmanager_notifications_failed_total{job="alertmanager-main",namespace="monitoring"}[5m]) / - rate(alertmanager_notifications_total{job="alertmanager-main",namespace="monitoring"}[5m]) + ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-main",namespace="monitoring"}[5m]) ) > 0.01 for: 5m @@ -65,7 +65,7 @@ spec: min by (namespace,service, integration) ( rate(alertmanager_notifications_failed_total{job="alertmanager-main",namespace="monitoring", integration=~`.*`}[5m]) / - rate(alertmanager_notifications_total{job="alertmanager-main",namespace="monitoring", integration=~`.*`}[5m]) + ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-main",namespace="monitoring", integration=~`.*`}[5m]) ) > 0.01 for: 5m @@ -80,7 +80,7 @@ spec: min by (namespace,service, integration) ( rate(alertmanager_notifications_failed_total{job="alertmanager-main",namespace="monitoring", integration!~`.*`}[5m]) / - rate(alertmanager_notifications_total{job="alertmanager-main",namespace="monitoring", integration!~`.*`}[5m]) + ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-main",namespace="monitoring", integration!~`.*`}[5m]) ) > 0.01 for: 5m diff --git a/manifests/prometheusAdapter-apiService.yaml b/manifests/prometheusAdapter-apiService.yaml index 68088ad4de..034d28e848 100644 --- a/manifests/prometheusAdapter-apiService.yaml +++ b/manifests/prometheusAdapter-apiService.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: v1beta1.metrics.k8s.io spec: group: metrics.k8s.io diff --git a/manifests/prometheusAdapter-clusterRole.yaml b/manifests/prometheusAdapter-clusterRole.yaml index c0b84f755e..47ea9a2877 100644 --- a/manifests/prometheusAdapter-clusterRole.yaml +++ b/manifests/prometheusAdapter-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: prometheus-adapter rules: - apiGroups: diff --git a/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml b/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml index ce43bf7e9f..f5c4cdbae6 100644 --- a/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml +++ b/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" rbac.authorization.k8s.io/aggregate-to-view: "true" diff --git a/manifests/prometheusAdapter-clusterRoleBinding.yaml b/manifests/prometheusAdapter-clusterRoleBinding.yaml index b9f88c72d6..41ce79544f 100644 --- a/manifests/prometheusAdapter-clusterRoleBinding.yaml +++ b/manifests/prometheusAdapter-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: prometheus-adapter roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml b/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml index a5cfaeb99b..3cf636ed39 100644 --- a/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml +++ b/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: resource-metrics:system:auth-delegator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheusAdapter-clusterRoleServerResources.yaml b/manifests/prometheusAdapter-clusterRoleServerResources.yaml index 53f9c2baf9..4d55aeb6b9 100644 --- a/manifests/prometheusAdapter-clusterRoleServerResources.yaml +++ b/manifests/prometheusAdapter-clusterRoleServerResources.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: resource-metrics-server-resources rules: - apiGroups: diff --git a/manifests/prometheusAdapter-configMap.yaml b/manifests/prometheusAdapter-configMap.yaml index 33e07847b8..9e38cc81c5 100644 --- a/manifests/prometheusAdapter-configMap.yaml +++ b/manifests/prometheusAdapter-configMap.yaml @@ -64,6 +64,6 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: adapter-config namespace: monitoring diff --git a/manifests/prometheusAdapter-deployment.yaml b/manifests/prometheusAdapter-deployment.yaml index 7c852d529b..d60fcc3391 100644 --- a/manifests/prometheusAdapter-deployment.yaml +++ b/manifests/prometheusAdapter-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: prometheus-adapter namespace: monitoring spec: @@ -27,7 +27,7 @@ spec: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 spec: automountServiceAccountToken: true containers: @@ -38,7 +38,7 @@ spec: - --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/ - --secure-port=6443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA - image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.1 + image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.2 livenessProbe: failureThreshold: 5 httpGet: diff --git a/manifests/prometheusAdapter-networkPolicy.yaml b/manifests/prometheusAdapter-networkPolicy.yaml index 69998e880a..77589c5320 100644 --- a/manifests/prometheusAdapter-networkPolicy.yaml +++ b/manifests/prometheusAdapter-networkPolicy.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheusAdapter-podDisruptionBudget.yaml b/manifests/prometheusAdapter-podDisruptionBudget.yaml index 46a2728cbe..6998768aac 100644 --- a/manifests/prometheusAdapter-podDisruptionBudget.yaml +++ b/manifests/prometheusAdapter-podDisruptionBudget.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheusAdapter-roleBindingAuthReader.yaml b/manifests/prometheusAdapter-roleBindingAuthReader.yaml index 1ee3cf4979..91bc3b127b 100644 --- a/manifests/prometheusAdapter-roleBindingAuthReader.yaml +++ b/manifests/prometheusAdapter-roleBindingAuthReader.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: resource-metrics-auth-reader namespace: kube-system roleRef: diff --git a/manifests/prometheusAdapter-service.yaml b/manifests/prometheusAdapter-service.yaml index 250aafe7a5..11c42df5eb 100644 --- a/manifests/prometheusAdapter-service.yaml +++ b/manifests/prometheusAdapter-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheusAdapter-serviceAccount.yaml b/manifests/prometheusAdapter-serviceAccount.yaml index 24d8474e48..f7601e8984 100644 --- a/manifests/prometheusAdapter-serviceAccount.yaml +++ b/manifests/prometheusAdapter-serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: prometheus-adapter namespace: monitoring diff --git a/manifests/prometheusAdapter-serviceMonitor.yaml b/manifests/prometheusAdapter-serviceMonitor.yaml index a6e3e03595..1038954e72 100644 --- a/manifests/prometheusAdapter-serviceMonitor.yaml +++ b/manifests/prometheusAdapter-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.11.1 + app.kubernetes.io/version: 0.11.2 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml index 1aac07fb64..ce898762dc 100644 --- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -196,6 +195,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic httpConfig: description: HTTP client configuration. properties: @@ -273,6 +273,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -488,6 +489,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic authSecret: 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: @@ -503,6 +505,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic authUsername: description: The username to use for authentication. type: string @@ -729,6 +732,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -932,6 +936,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic required: - webhookUrl type: object @@ -963,6 +968,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic apiURL: description: The URL to send OpsGenie API requests to. type: string @@ -1066,6 +1072,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -1413,6 +1420,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -1636,6 +1644,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic sendResolved: description: Whether or not to notify about resolved alerts. type: boolean @@ -1654,6 +1663,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic severity: description: Severity of the incident. type: string @@ -1751,6 +1761,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -1964,6 +1975,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic tokenFile: description: The token file that contains the registered application's API token, see https://pushover.net/apps. Either `token` or `tokenFile` is required. It requires Alertmanager >= v0.26.0. type: string @@ -1988,6 +2000,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic userKeyFile: description: The user key file that contains the recipient user's user key. Either `userKey` or `userKeyFile` is required. It requires Alertmanager >= v0.26.0. type: string @@ -2052,6 +2065,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic callbackId: type: string channel: @@ -2158,6 +2172,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -2458,6 +2473,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -2725,6 +2741,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic botTokenFile: description: "File to read the Telegram bot token from. It is mutually exclusive with `botToken`. Either `botToken` or `botTokenFile` is required. \n It requires Alertmanager >= v0.26.0." type: string @@ -2812,6 +2829,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -3026,6 +3044,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic apiUrl: description: The VictorOps API URL. type: string @@ -3126,6 +3145,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -3408,6 +3428,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -3683,6 +3704,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean @@ -3888,6 +3910,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object type: array wechatConfigs: @@ -3912,6 +3935,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic apiURL: description: The WeChat API URL. type: string @@ -3995,6 +4019,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic followRedirects: description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects. type: boolean diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml index 6059419a75..2c9bd2b2c3 100644 --- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml index 669affa523..2fb6f00888 100644 --- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml index c8e4e6c889..15babeaaef 100644 --- a/manifests/setup/0probeCustomResourceDefinition.yaml +++ b/manifests/setup/0probeCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index 7625864002..4d8ceac815 100644 --- a/manifests/setup/0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -2904,6 +2903,16 @@ spec: paused: description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects. type: boolean + persistentVolumeClaimRetentionPolicy: + description: The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet. The default behavior is all PVCs are retained. This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26. It requires enabling the StatefulSetAutoDeletePVC feature gate. + properties: + whenDeleted: + description: WhenDeleted specifies what happens to PVCs created from StatefulSet VolumeClaimTemplates when the StatefulSet is deleted. The default policy of `Retain` causes PVCs to not be affected by StatefulSet deletion. The `Delete` policy causes those PVCs to be deleted. + type: string + whenScaled: + description: WhenScaled specifies what happens to PVCs created from StatefulSet VolumeClaimTemplates when the StatefulSet is scaled down. The default policy of `Retain` causes PVCs to not be affected by a scaledown. The `Delete` policy causes the associated PVCs for any excess pods above the replica count to be deleted. + type: string + type: object podMetadata: description: "PodMetadata configures labels and annotations which are propagated to the Prometheus pods. \n The following items are reserved and cannot be overridden: * \"prometheus\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/instance\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/name\" label, set to \"prometheus\". * \"app.kubernetes.io/version\" label, set to the Prometheus version. * \"operator.prometheus.io/name\" label, set to the name of the Prometheus object. * \"operator.prometheus.io/shard\" label, set to the shard number of the Prometheus object. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"prometheus\"." properties: diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml index 2a36e23850..8d328cbf26 100644 --- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -2588,6 +2587,16 @@ spec: paused: description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects. type: boolean + persistentVolumeClaimRetentionPolicy: + description: The field controls if and how PVCs are deleted during the lifecycle of a StatefulSet. The default behavior is all PVCs are retained. This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26. It requires enabling the StatefulSetAutoDeletePVC feature gate. + properties: + whenDeleted: + description: WhenDeleted specifies what happens to PVCs created from StatefulSet VolumeClaimTemplates when the StatefulSet is deleted. The default policy of `Retain` causes PVCs to not be affected by StatefulSet deletion. The `Delete` policy causes those PVCs to be deleted. + type: string + whenScaled: + description: WhenScaled specifies what happens to PVCs created from StatefulSet VolumeClaimTemplates when the StatefulSet is scaled down. The default policy of `Retain` causes PVCs to not be affected by a scaledown. The `Delete` policy causes the associated PVCs for any excess pods above the replica count to be deleted. + type: string + type: object podMetadata: description: "PodMetadata configures labels and annotations which are propagated to the Prometheus pods. \n The following items are reserved and cannot be overridden: * \"prometheus\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/instance\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/name\" label, set to \"prometheus\". * \"app.kubernetes.io/version\" label, set to the Prometheus version. * \"operator.prometheus.io/name\" label, set to the name of the Prometheus object. * \"operator.prometheus.io/shard\" label, set to the shard number of the Prometheus object. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"prometheus\"." properties: diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml index 85f828b7a5..cc046f4350 100644 --- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml index 5d15216702..118f11e577 100644 --- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml +++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -275,6 +274,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic description: Specifies headers to send to proxies during CONNECT requests. type: object x-kubernetes-map-type: atomic @@ -426,6 +426,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic required: - server type: object @@ -480,6 +481,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic filters: description: 'Filters can be used optionally to filter the instance list by other criteria. Available filter criteria can be found here: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html Filter API documentation: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Filter.html' items: @@ -524,6 +526,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object type: array fileSDConfigs: diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml index 14ce5115ab..9865220c97 100644 --- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml index 2f3cbc1496..be79d38b87 100644 --- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml +++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml @@ -2,9 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.13.0 operator.prometheus.io/version: 0.69.1 - creationTimestamp: null name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com