From d9bb0c2ec4d0e91da73138d80971c5e8d1e602b3 Mon Sep 17 00:00:00 2001
From: Matthias Loibl <mail@matthiasloibl.com>
Date: Wed, 20 Feb 2019 12:46:39 +0100
Subject: [PATCH] Update Prometheus Operator in kube-prometheus to v0.29.0
---
jsonnet/kube-prometheus/jsonnetfile.json | 2 +-
jsonnetfile.lock.json | 2 +-
...0alertmanagerCustomResourceDefinition.yaml | 17 +++++------
...r-0prometheusCustomResourceDefinition.yaml | 30 +++++++++++++------
...rometheusruleCustomResourceDefinition.yaml | 5 ++--
...ervicemonitorCustomResourceDefinition.yaml | 2 +-
.../0prometheus-operator-deployment.yaml | 4 +--
7 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index 7be8827a..5f481c36 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -38,7 +38,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "v0.28.0"
+ "version": "v0.29.0"
},
{
"name": "etcd-mixin",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 88a61ac8..bd343967 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -68,7 +68,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "338addbabc8a29b46840df0bb0355c12b96a6f21"
+ "version": "7a25bf6b6bb2347dacb235659b73bc210117acc7"
},
{
"name": "etcd-mixin",
diff --git a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
index 89748f1a..821e313d 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 158c5cb3..a69cf0a9 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 877fadac..76a78998 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 d2e310fd..431bde39 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/#<relabel_config>'
+ 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
diff --git a/manifests/0prometheus-operator-deployment.yaml b/manifests/0prometheus-operator-deployment.yaml
index 1f880582..f1ace87e 100644
--- a/manifests/0prometheus-operator-deployment.yaml
+++ b/manifests/0prometheus-operator-deployment.yaml
@@ -20,8 +20,8 @@ spec:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.28.0
- image: quay.io/coreos/prometheus-operator:v0.28.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.29.0
+ image: quay.io/coreos/prometheus-operator:v0.29.0
name: prometheus-operator
ports:
- containerPort: 8080
--
GitLab