From 8a4a1821f019742d88a28f6a47852ae2916424ed Mon Sep 17 00:00:00 2001 From: Roboquat Date: Mon, 23 Sep 2024 00:17:03 +0000 Subject: [PATCH] [bot] [main] Automated dependencies update --- jsonnetfile.lock.json | 20 +- ...managerConfigCustomResourceDefinition.yaml | 4 +- ...0alertmanagerCustomResourceDefinition.yaml | 22 ++- ...r-0podmonitorCustomResourceDefinition.yaml | 4 +- ...erator-0probeCustomResourceDefinition.yaml | 4 +- ...r-0prometheusCustomResourceDefinition.yaml | 22 ++- ...ometheusagentCustomResourceDefinition.yaml | 22 ++- ...rometheusruleCustomResourceDefinition.yaml | 4 +- ...0scrapeconfigCustomResourceDefinition.yaml | 4 +- ...ervicemonitorCustomResourceDefinition.yaml | 4 +- ...-0thanosrulerCustomResourceDefinition.yaml | 22 ++- .../alertmanagerconfigs-crd.json | 4 +- .../alertmanagers-crd.json | 20 +- .../prometheus-operator/podmonitors-crd.json | 4 +- .../prometheus-operator/probes-crd.json | 4 +- .../prometheus-operator.libsonnet | 181 ++++++++++-------- .../prometheusagents-crd.json | 20 +- .../prometheus-operator/prometheuses-crd.json | 20 +- .../prometheusrules-crd.json | 4 +- .../scrapeconfigs-crd.json | 4 +- .../servicemonitors-crd.json | 4 +- .../prometheus-operator/thanosrulers-crd.json | 20 +- 22 files changed, 264 insertions(+), 153 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 7faf6b70..3ddac9d3 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "6c1fe4a92a00854fc54828e257708f9e7f5b4f28", + "version": "112e6a32ef99a79724a48aafb91f93d51a357948", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -28,7 +28,7 @@ "subdir": "operations/observability/mixins" } }, - "version": "4b05e71e106e1964392fcba48d4a0b74273587e2", + "version": "21b7230ecd5ed7cf307a518598ed2e2637a762c3", "sum": "HlC/z0aF8fbN+5y7AP0NNsvg9n3hFvoLr5w/8tUEn98=", "name": "gitpod" }, @@ -99,7 +99,7 @@ "subdir": "grafana-builder" } }, - "version": "c0b39ad68a99c7791a19b14da92c7f886d8c55da", + "version": "4ad199dab450b829274234b1014ca577649b4557", "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo=" }, { @@ -159,7 +159,7 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "bc0f49d6f8d05bdd56dd274d3f4b40151b38d6ca", + "version": "b20433ed1054945f30485b8699c35a825547c905", "sum": "TC6SwJoJMI7RKFuqdsX5p7n05bkJu0H7XSUubDCggTo=" }, { @@ -169,7 +169,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "1f36a6778f8e4b08799c43f3e2f9ba624feac416", + "version": "23cbc111619cbe089a04ae81463584e88a183af9", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -180,8 +180,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "1f36a6778f8e4b08799c43f3e2f9ba624feac416", - "sum": "IYa+0bUT25fTKjjDyZw9gV8DAi1BgfmLE1ucouoxKCs=" + "version": "23cbc111619cbe089a04ae81463584e88a183af9", + "sum": "/bnXn93GATeKKUfv5o3BoURZ/f/uOx6IqPqiUjSM4Z4=" }, { "source": { @@ -201,7 +201,7 @@ "subdir": "docs/node-mixin" } }, - "version": "7a97429e57d8aba827755a5cc4b5a84cec775d2c", + "version": "a37174eccfa67882184acc7f44e338aa5f5163b8", "sum": "rhUvbqviGjQ2mwsRhHKMN0TiS3YvnYpUXHew3XlQ+Wg=" }, { @@ -211,7 +211,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "e8fa1312a7a8934fd2928fab1bb8d7e5f2ea0a1a", + "version": "31c57605518d880c51328bc4ce419063a9341685", "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=", "name": "prometheus" }, @@ -233,7 +233,7 @@ "subdir": "mixin" } }, - "version": "883fade9bd75fe595b6e947a33c59e27fca1abda", + "version": "e69bf72337b1824f3f1eb4574bdc58028b54b9ec", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=", "name": "thanos-mixin" }, diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml index b7bcb531..c5955ab2 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml @@ -3,8 +3,8 @@ kind: CustomResourceDefinition metadata: annotations: argocd.argoproj.io/sync-options: Replace=true - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml index 3c563f85..291df472 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml @@ -3,8 +3,8 @@ kind: CustomResourceDefinition metadata: annotations: argocd.argoproj.io/sync-options: Replace=true - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -7911,6 +7911,11 @@ spec: type: object x-kubernetes-map-type: atomic type: object + certFile: + description: |- + Path to the TLS certificate file in the Prometheus container for the server. + Mutually exclusive with `cert`. + type: string cipherSuites: description: |- List of supported cipher suites for TLS versions up to TLS 1.2. If empty, @@ -7973,6 +7978,11 @@ spec: For more detail on clientAuth options: https://golang.org/pkg/crypto/tls/#ClientAuthType type: string + clientCAFile: + description: |- + Path to the CA certificate file for client certificate authentication to the server. + Mutually exclusive with `client_ca`. + type: string curvePreferences: description: |- Elliptic curves that will be used in an ECDHE handshake, in preference @@ -7981,6 +7991,11 @@ spec: items: type: string type: array + keyFile: + description: |- + Path to the TLS key file in the Prometheus container for the server. + Mutually exclusive with `keySecret`. + type: string keySecret: description: Secret containing the TLS key for the server. properties: @@ -8016,9 +8031,6 @@ spec: cipher suite. If true then the server's preference, as expressed in the order of elements in cipherSuites, is used. type: boolean - required: - - cert - - keySecret type: object type: object type: object diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml index 3d724d1d..1b03a2b9 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml @@ -3,8 +3,8 @@ kind: CustomResourceDefinition metadata: annotations: argocd.argoproj.io/sync-options: Replace=true - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml index 630a3ac4..3ca0282d 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml @@ -3,8 +3,8 @@ kind: CustomResourceDefinition metadata: annotations: argocd.argoproj.io/sync-options: Replace=true - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml index c1836fef..9b4799fe 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml @@ -3,8 +3,8 @@ kind: CustomResourceDefinition metadata: annotations: argocd.argoproj.io/sync-options: Replace=true - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -11758,6 +11758,11 @@ spec: type: object x-kubernetes-map-type: atomic type: object + certFile: + description: |- + Path to the TLS certificate file in the Prometheus container for the server. + Mutually exclusive with `cert`. + type: string cipherSuites: description: |- List of supported cipher suites for TLS versions up to TLS 1.2. If empty, @@ -11820,6 +11825,11 @@ spec: For more detail on clientAuth options: https://golang.org/pkg/crypto/tls/#ClientAuthType type: string + clientCAFile: + description: |- + Path to the CA certificate file for client certificate authentication to the server. + Mutually exclusive with `client_ca`. + type: string curvePreferences: description: |- Elliptic curves that will be used in an ECDHE handshake, in preference @@ -11828,6 +11838,11 @@ spec: items: type: string type: array + keyFile: + description: |- + Path to the TLS key file in the Prometheus container for the server. + Mutually exclusive with `keySecret`. + type: string keySecret: description: Secret containing the TLS key for the server. properties: @@ -11863,9 +11878,6 @@ spec: cipher suite. If true then the server's preference, as expressed in the order of elements in cipherSuites, is used. type: boolean - required: - - cert - - keySecret type: object type: object type: object diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml index c5dff6ec..a988db91 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml @@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -9723,6 +9723,11 @@ spec: type: object x-kubernetes-map-type: atomic type: object + certFile: + description: |- + Path to the TLS certificate file in the Prometheus container for the server. + Mutually exclusive with `cert`. + type: string cipherSuites: description: |- List of supported cipher suites for TLS versions up to TLS 1.2. If empty, @@ -9785,6 +9790,11 @@ spec: For more detail on clientAuth options: https://golang.org/pkg/crypto/tls/#ClientAuthType type: string + clientCAFile: + description: |- + Path to the CA certificate file for client certificate authentication to the server. + Mutually exclusive with `client_ca`. + type: string curvePreferences: description: |- Elliptic curves that will be used in an ECDHE handshake, in preference @@ -9793,6 +9803,11 @@ spec: items: type: string type: array + keyFile: + description: |- + Path to the TLS key file in the Prometheus container for the server. + Mutually exclusive with `keySecret`. + type: string keySecret: description: Secret containing the TLS key for the server. properties: @@ -9828,9 +9843,6 @@ spec: cipher suite. If true then the server's preference, as expressed in the order of elements in cipherSuites, is used. type: boolean - required: - - cert - - keySecret type: object type: object type: object diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml index fe2c1f5d..a865d308 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml @@ -3,8 +3,8 @@ kind: CustomResourceDefinition metadata: annotations: argocd.argoproj.io/sync-options: Replace=true - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml index 131395b6..756bf0b0 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml @@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml index ebad7991..afa60150 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml @@ -3,8 +3,8 @@ kind: CustomResourceDefinition metadata: annotations: argocd.argoproj.io/sync-options: Replace=true - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml index f09d987f..6aaccb06 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml @@ -3,8 +3,8 @@ kind: CustomResourceDefinition metadata: annotations: argocd.argoproj.io/sync-options: Replace=true - controller-gen.kubebuilder.io/version: v0.16.1 - operator.prometheus.io/version: 0.76.2 + controller-gen.kubebuilder.io/version: v0.16.3 + operator.prometheus.io/version: 0.77.0 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -7356,6 +7356,11 @@ spec: type: object x-kubernetes-map-type: atomic type: object + certFile: + description: |- + Path to the TLS certificate file in the Prometheus container for the server. + Mutually exclusive with `cert`. + type: string cipherSuites: description: |- List of supported cipher suites for TLS versions up to TLS 1.2. If empty, @@ -7418,6 +7423,11 @@ spec: For more detail on clientAuth options: https://golang.org/pkg/crypto/tls/#ClientAuthType type: string + clientCAFile: + description: |- + Path to the CA certificate file for client certificate authentication to the server. + Mutually exclusive with `client_ca`. + type: string curvePreferences: description: |- Elliptic curves that will be used in an ECDHE handshake, in preference @@ -7426,6 +7436,11 @@ spec: items: type: string type: array + keyFile: + description: |- + Path to the TLS key file in the Prometheus container for the server. + Mutually exclusive with `keySecret`. + type: string keySecret: description: Secret containing the TLS key for the server. properties: @@ -7461,9 +7476,6 @@ spec: cipher suite. If true then the server's preference, as expressed in the order of elements in cipherSuites, is used. type: boolean - required: - - cert - - keySecret type: object type: object type: object diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index 651c59c9..11b42be5 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json index a4f4b15d..d934d7e3 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "alertmanagers.monitoring.coreos.com" }, @@ -7037,6 +7037,10 @@ }, "type": "object" }, + "certFile": { + "description": "Path to the TLS certificate file in the Prometheus container for the server.\nMutually exclusive with `cert`.", + "type": "string" + }, "cipherSuites": { "description": "List of supported cipher suites for TLS versions up to TLS 1.2. If empty,\nGo default cipher suites are used. Available cipher suites are documented\nin the go documentation: https://golang.org/pkg/crypto/tls/#pkg-constants", "items": { @@ -7048,6 +7052,10 @@ "description": "Server policy for client authentication. Maps to ClientAuth Policies.\nFor more detail on clientAuth options:\nhttps://golang.org/pkg/crypto/tls/#ClientAuthType", "type": "string" }, + "clientCAFile": { + "description": "Path to the CA certificate file for client certificate authentication to the server.\nMutually exclusive with `client_ca`.", + "type": "string" + }, "client_ca": { "description": "Contains the CA certificate for client certificate authentication to the server.", "properties": { @@ -7107,6 +7115,10 @@ }, "type": "array" }, + "keyFile": { + "description": "Path to the TLS key file in the Prometheus container for the server.\nMutually exclusive with `keySecret`.", + "type": "string" + }, "keySecret": { "description": "Secret containing the TLS key for the server.", "properties": { @@ -7143,10 +7155,6 @@ "type": "boolean" } }, - "required": [ - "cert", - "keySecret" - ], "type": "object" } }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json index 1e1118e6..e99ad411 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "podmonitors.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json index f2c1798c..8746ce23 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "probes.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet index d342d9c1..c2b36332 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet @@ -27,6 +27,9 @@ local defaults = { if !std.setMember(labelName, ['app.kubernetes.io/version']) }, enableAlertmanagerConfigV1beta1: false, + kubeletService: 'kube-system/kubelet', + kubeletEndpointsEnabled: true, + kubeletEndpointSliceEnabled: false, }; function(params) { @@ -75,80 +78,106 @@ function(params) { labels: po.config.commonLabels, }, rules: [ - { - apiGroups: ['monitoring.coreos.com'], - resources: [ - 'alertmanagers', - 'alertmanagers/finalizers', - 'alertmanagers/status', - 'alertmanagerconfigs', - 'prometheuses', - 'prometheuses/finalizers', - 'prometheuses/status', - 'prometheusagents', - 'prometheusagents/finalizers', - 'prometheusagents/status', - 'thanosrulers', - 'thanosrulers/finalizers', - 'thanosrulers/status', - 'scrapeconfigs', - 'servicemonitors', - 'podmonitors', - 'probes', - 'prometheusrules', - ], - verbs: ['*'], - }, - { - apiGroups: ['apps'], - resources: ['statefulsets'], - verbs: ['*'], - }, - { - apiGroups: [''], - resources: ['configmaps', 'secrets'], - verbs: ['*'], - }, - { - apiGroups: [''], - resources: ['pods'], - verbs: ['list', 'delete'], - }, - { - apiGroups: [''], - resources: [ - 'services', - 'services/finalizers', - 'endpoints', - ], - verbs: ['get', 'create', 'update', 'delete'], - }, - { - apiGroups: [''], - resources: ['nodes'], - verbs: ['list', 'watch'], - }, - { - apiGroups: [''], - resources: ['namespaces'], - verbs: ['get', 'list', 'watch'], - }, - { - apiGroups: [''], - resources: ['events'], - verbs: ['patch', 'create'], - }, - { - apiGroups: ['networking.k8s.io'], - resources: ['ingresses'], - verbs: ['get', 'list', 'watch'], - }, - { - apiGroups: ['storage.k8s.io'], - resources: ['storageclasses'], - verbs: ['get'], - }, - ], + { + apiGroups: ['monitoring.coreos.com'], + resources: [ + 'alertmanagers', + 'alertmanagers/finalizers', + 'alertmanagers/status', + 'alertmanagerconfigs', + 'prometheuses', + 'prometheuses/finalizers', + 'prometheuses/status', + 'prometheusagents', + 'prometheusagents/finalizers', + 'prometheusagents/status', + 'thanosrulers', + 'thanosrulers/finalizers', + 'thanosrulers/status', + 'scrapeconfigs', + 'servicemonitors', + 'podmonitors', + 'probes', + 'prometheusrules', + ], + verbs: ['*'], + }, + { + apiGroups: ['apps'], + resources: ['statefulsets'], + verbs: ['*'], + }, + { + apiGroups: [''], + resources: ['configmaps', 'secrets'], + verbs: ['*'], + }, + { + apiGroups: [''], + resources: ['pods'], + verbs: ['list', 'delete'], + }, + { + apiGroups: [''], + resources: [ + 'services', + 'services/finalizers', + ], + verbs: ['get', 'create', 'update', 'delete'], + }, + { + apiGroups: [''], + resources: ['nodes'], + verbs: ['list', 'watch'], + }, + { + apiGroups: [''], + resources: ['namespaces'], + verbs: ['get', 'list', 'watch'], + }, + { + apiGroups: [''], + resources: ['events'], + verbs: ['patch', 'create'], + }, + { + apiGroups: ['networking.k8s.io'], + resources: ['ingresses'], + verbs: ['get', 'list', 'watch'], + }, + { + apiGroups: ['storage.k8s.io'], + resources: ['storageclasses'], + verbs: ['get'], + }, + ] + ( + if po.config.kubeletEndpointsEnabled then + [ + { + apiGroups: [''], + resources: [ + 'endpoints', + ], + verbs: ['get', 'create', 'update', 'delete'], + }, + ] + else + [] + ) + + ( + if po.config.kubeletEndpointSliceEnabled then + [ + { + apiGroups: ['discovery.k8s.io'], + resources: [ + 'endpointslices', + ], + verbs: ['get', 'create', 'list', 'update', 'delete'], + }, + ] + else + [] + ), }, deployment: @@ -161,9 +190,11 @@ function(params) { name: po.config.name, image: po.config.image, args: [ - '--kubelet-service=kube-system/kubelet', + '--kubelet-service=' + po.config.kubeletService, '--prometheus-config-reloader=' + po.config.configReloaderImage, ] + + [std.format('--kubelet-endpoints=%s', po.config.kubeletEndpointsEnabled)] + + [std.format('--kubelet-endpointslice=%s', po.config.kubeletEndpointSliceEnabled)] + reloaderResourceArg('--config-reloader-cpu-limit', po.config.configReloaderResources.limits.cpu) + reloaderResourceArg('--config-reloader-memory-limit', po.config.configReloaderResources.limits.memory) + reloaderResourceArg('--config-reloader-cpu-request', po.config.configReloaderResources.requests.cpu) + diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json index c2fe65bd..d5de638d 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "prometheusagents.monitoring.coreos.com" }, @@ -8503,6 +8503,10 @@ }, "type": "object" }, + "certFile": { + "description": "Path to the TLS certificate file in the Prometheus container for the server.\nMutually exclusive with `cert`.", + "type": "string" + }, "cipherSuites": { "description": "List of supported cipher suites for TLS versions up to TLS 1.2. If empty,\nGo default cipher suites are used. Available cipher suites are documented\nin the go documentation: https://golang.org/pkg/crypto/tls/#pkg-constants", "items": { @@ -8514,6 +8518,10 @@ "description": "Server policy for client authentication. Maps to ClientAuth Policies.\nFor more detail on clientAuth options:\nhttps://golang.org/pkg/crypto/tls/#ClientAuthType", "type": "string" }, + "clientCAFile": { + "description": "Path to the CA certificate file for client certificate authentication to the server.\nMutually exclusive with `client_ca`.", + "type": "string" + }, "client_ca": { "description": "Contains the CA certificate for client certificate authentication to the server.", "properties": { @@ -8573,6 +8581,10 @@ }, "type": "array" }, + "keyFile": { + "description": "Path to the TLS key file in the Prometheus container for the server.\nMutually exclusive with `keySecret`.", + "type": "string" + }, "keySecret": { "description": "Secret containing the TLS key for the server.", "properties": { @@ -8609,10 +8621,6 @@ "type": "boolean" } }, - "required": [ - "cert", - "keySecret" - ], "type": "object" } }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json index 327327fa..4fe72252 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "prometheuses.monitoring.coreos.com" }, @@ -10401,6 +10401,10 @@ }, "type": "object" }, + "certFile": { + "description": "Path to the TLS certificate file in the Prometheus container for the server.\nMutually exclusive with `cert`.", + "type": "string" + }, "cipherSuites": { "description": "List of supported cipher suites for TLS versions up to TLS 1.2. If empty,\nGo default cipher suites are used. Available cipher suites are documented\nin the go documentation: https://golang.org/pkg/crypto/tls/#pkg-constants", "items": { @@ -10412,6 +10416,10 @@ "description": "Server policy for client authentication. Maps to ClientAuth Policies.\nFor more detail on clientAuth options:\nhttps://golang.org/pkg/crypto/tls/#ClientAuthType", "type": "string" }, + "clientCAFile": { + "description": "Path to the CA certificate file for client certificate authentication to the server.\nMutually exclusive with `client_ca`.", + "type": "string" + }, "client_ca": { "description": "Contains the CA certificate for client certificate authentication to the server.", "properties": { @@ -10471,6 +10479,10 @@ }, "type": "array" }, + "keyFile": { + "description": "Path to the TLS key file in the Prometheus container for the server.\nMutually exclusive with `keySecret`.", + "type": "string" + }, "keySecret": { "description": "Secret containing the TLS key for the server.", "properties": { @@ -10507,10 +10519,6 @@ "type": "boolean" } }, - "required": [ - "cert", - "keySecret" - ], "type": "object" } }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json index 912284cb..4e7058f2 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "prometheusrules.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json index 575a3d8c..b42033a5 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "scrapeconfigs.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json index 8defac30..7429fc85 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "servicemonitors.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json index d2990f35..9609886f 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json @@ -3,8 +3,8 @@ "kind": "CustomResourceDefinition", "metadata": { "annotations": { - "controller-gen.kubebuilder.io/version": "v0.16.1", - "operator.prometheus.io/version": "0.76.2" + "controller-gen.kubebuilder.io/version": "v0.16.3", + "operator.prometheus.io/version": "0.77.0" }, "name": "thanosrulers.monitoring.coreos.com" }, @@ -6489,6 +6489,10 @@ }, "type": "object" }, + "certFile": { + "description": "Path to the TLS certificate file in the Prometheus container for the server.\nMutually exclusive with `cert`.", + "type": "string" + }, "cipherSuites": { "description": "List of supported cipher suites for TLS versions up to TLS 1.2. If empty,\nGo default cipher suites are used. Available cipher suites are documented\nin the go documentation: https://golang.org/pkg/crypto/tls/#pkg-constants", "items": { @@ -6500,6 +6504,10 @@ "description": "Server policy for client authentication. Maps to ClientAuth Policies.\nFor more detail on clientAuth options:\nhttps://golang.org/pkg/crypto/tls/#ClientAuthType", "type": "string" }, + "clientCAFile": { + "description": "Path to the CA certificate file for client certificate authentication to the server.\nMutually exclusive with `client_ca`.", + "type": "string" + }, "client_ca": { "description": "Contains the CA certificate for client certificate authentication to the server.", "properties": { @@ -6559,6 +6567,10 @@ }, "type": "array" }, + "keyFile": { + "description": "Path to the TLS key file in the Prometheus container for the server.\nMutually exclusive with `keySecret`.", + "type": "string" + }, "keySecret": { "description": "Secret containing the TLS key for the server.", "properties": { @@ -6595,10 +6607,6 @@ "type": "boolean" } }, - "required": [ - "cert", - "keySecret" - ], "type": "object" } },