diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 1fb7373..eb063dd 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" } }, - "version": "685bc278917085efe30ef6ff7aecc532387da693" + "version": "bd8293a9b448c3bd40d1627d7f43ee66d86ac94b" }, { "name": "ksonnet", @@ -28,7 +28,7 @@ "subdir": "" } }, - "version": "5525c8cc8a4a52d272bdaf481dd77b53a0c0f051" + "version": "ccb787a44f2ebdecbb346d57490fa7e49981b323" }, { "name": "grafonnet", @@ -48,7 +48,7 @@ "subdir": "grafana-builder" } }, - "version": "403b7d0120d2903d21854eae217b4e4863c454d1" + "version": "5d7e5391010c768a6ddd39163c35662f379e20ca" }, { "name": "grafana", @@ -68,7 +68,7 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "338addbabc8a29b46840df0bb0355c12b96a6f21" + "version": "7a25bf6b6bb2347dacb235659b73bc210117acc7" }, { "name": "etcd-mixin", @@ -78,7 +78,7 @@ "subdir": "Documentation/etcd-mixin" } }, - "version": "4cd0bf8ea846a0d158761d55899f631eb2a423cf" + "version": "a7e3bd06b2ef0286e1571836997287a81146c25a" } ] } diff --git a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml index 89748f1..821e313 100644 --- a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml +++ b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml @@ -1315,8 +1315,7 @@ spec: type: boolean volumeDevices: description: volumeDevices is the list of block devices to be - used by the container. This is an alpha feature and may change - in the future. + used by the container. This is a beta feature. items: description: volumeDevice describes a mapping of a raw block device within a container. @@ -1647,8 +1646,9 @@ spec: set to true. There cannot be more than one managing controller. items: description: OwnerReference contains enough information to let - you identify an owning object. Currently, an owning object must - be in the same namespace, so there is no namespace field. + you identify an owning object. An owning object must be in the + same namespace as the dependent, or be cluster-scoped, so there + is no namespace field. properties: apiVersion: description: API version of the referent. @@ -2116,9 +2116,9 @@ spec: There cannot be more than one managing controller. items: description: OwnerReference contains enough information - to let you identify an owning object. Currently, an - owning object must be in the same namespace, so there - is no namespace field. + to let you identify an owning object. An owning object + must be in the same namespace as the dependent, or be + cluster-scoped, so there is no namespace field. properties: apiVersion: description: API version of the referent. @@ -2263,8 +2263,7 @@ spec: volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not - included in claim spec. This is an alpha feature and may - change in the future. + included in claim spec. This is a beta feature. type: string volumeName: description: VolumeName is the binding reference to the diff --git a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml index 158c5cb..a69cf0a 100644 --- a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml +++ b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml @@ -1480,8 +1480,7 @@ spec: type: boolean volumeDevices: description: volumeDevices is the list of block devices to be - used by the container. This is an alpha feature and may change - in the future. + used by the container. This is a beta feature. items: description: volumeDevice describes a mapping of a raw block device within a container. @@ -1829,8 +1828,9 @@ spec: set to true. There cannot be more than one managing controller. items: description: OwnerReference contains enough information to let - you identify an owning object. Currently, an owning object must - be in the same namespace, so there is no namespace field. + you identify an owning object. An owning object must be in the + same namespace as the dependent, or be cluster-scoped, so there + is no namespace field. properties: apiVersion: description: API version of the referent. @@ -2146,6 +2146,10 @@ spec: required: - url type: array + replicaExternalLabelName: + description: Name of Prometheus external label used to denote replica + name. Defaults to the value of `prometheus_replica`. + type: string replicas: description: Number of instances to deploy for a Prometheus deployment. format: int32 @@ -2752,9 +2756,9 @@ spec: There cannot be more than one managing controller. items: description: OwnerReference contains enough information - to let you identify an owning object. Currently, an - owning object must be in the same namespace, so there - is no namespace field. + to let you identify an owning object. An owning object + must be in the same namespace as the dependent, or be + cluster-scoped, so there is no namespace field. properties: apiVersion: description: API version of the referent. @@ -2899,8 +2903,7 @@ spec: volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not - included in claim spec. This is an alpha feature and may - change in the future. + included in claim spec. This is a beta feature. type: string volumeName: description: VolumeName is the binding reference to the @@ -2975,6 +2978,10 @@ spec: baseImage: description: Thanos base image if other than default. type: string + clusterAdvertiseAddress: + description: Explicit (external) ip:port address to advertise for + gossip in gossip cluster. Used internally for membership only. + type: string gcs: description: 'Deprecated: ThanosGCSSpec should be configured with an ObjectStorageConfig secret starting with Thanos v0.2.0. ThanosGCSSpec @@ -3000,6 +3007,11 @@ spec: type: boolean required: - key + grpcAdvertiseAddress: + description: Explicit (external) host:port address to advertise + for gRPC StoreAPI in gossip cluster. If empty, 'grpc-address' + will be used. + type: string image: description: Image if specified has precedence over baseImage, tag and sha combinations. Specifying the version is still necessary diff --git a/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml index 877fada..76a7899 100644 --- a/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml +++ b/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml @@ -253,8 +253,9 @@ spec: There cannot be more than one managing controller. items: description: OwnerReference contains enough information to let you - identify an owning object. Currently, an owning object must be in - the same namespace, so there is no namespace field. + identify an owning object. An owning object must be in the same + namespace as the dependent, or be cluster-scoped, so there is no + namespace field. properties: apiVersion: description: API version of the referent. diff --git a/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml index d2e310f..431bde3 100644 --- a/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml +++ b/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml @@ -138,7 +138,7 @@ spec: type: string relabelings: description: 'RelabelConfigs to apply to samples before ingestion. - More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#' + More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' items: description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines