NO-JIRA: Bump prometheus-operator to v0.81.0

slashpai · slashpai · commit 0552243ae521 · 2025-04-17T19:02:55.000+05:30
Signed-off-by: Jayapriya Pai &lt;janantha@redhat.com&gt;
diff --git a/jsonnet/jsonnetfile.json b/jsonnet/jsonnetfile.json
@@ -17,7 +17,7 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "release-0.80"
+      "version": "release-0.81"
     },
     {
       "source": {
diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -191,7 +191,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "524131da7888af88091e30274c2507ea8b959017",
+      "version": "81634cc2c103d3f755932fd586bd63fd2c13d705",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -202,8 +202,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "4126d60d8a8ae99be866cdd0d15546a4d3e9fe8b",
-      "sum": "VF9CoB3hjwDGrxKONlX4OxW+k+9CkICWg+xbLb7dZ8A="
+      "version": "81634cc2c103d3f755932fd586bd63fd2c13d705",
+      "sum": "wAOdGxl8D660MfS7YW5Rhh+KObOJBr0F/OOImHSTMO8="
     },
     {
       "source": {
diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
     include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    operator.prometheus.io/version: 0.80.1
+    operator.prometheus.io/version: 0.81.0
     service.beta.openshift.io/inject-cabundle: "true"
   labels:
     app.kubernetes.io/managed-by: cluster-version-operator
diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml
diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
     include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    operator.prometheus.io/version: 0.80.1
+    operator.prometheus.io/version: 0.81.0
   labels:
     app.kubernetes.io/managed-by: cluster-version-operator
     app.kubernetes.io/part-of: openshift-monitoring
diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
     include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    operator.prometheus.io/version: 0.80.1
+    operator.prometheus.io/version: 0.81.0
   labels:
     app.kubernetes.io/managed-by: cluster-version-operator
     app.kubernetes.io/part-of: openshift-monitoring
diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
     include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    operator.prometheus.io/version: 0.80.1
+    operator.prometheus.io/version: 0.81.0
   labels:
     app.kubernetes.io/managed-by: cluster-version-operator
     app.kubernetes.io/part-of: openshift-monitoring
@@ -3530,6 +3530,9 @@ spec:
 
                   It requires Prometheus >= v2.33.0.
                 type: boolean
+              enableServiceLinks:
+                description: Indicates whether information about services should be injected into pod's environment variables
+                type: boolean
               enforcedBodySizeLimit:
                 description: |-
                   When defined, enforcedBodySizeLimit specifies a global limit on the size
@@ -7043,6 +7046,21 @@ spec:
                       description: Timeout for requests to the remote write endpoint.
                       pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                       type: string
+                    roundRobinDNS:
+                      description: |-
+                        When enabled:
+                            - The remote-write mechanism will resolve the hostname via DNS.
+                            - It will randomly select one of the resolved IP addresses and connect to it.
+
+                        When disabled (default behavior):
+                            - The Go standard library will handle hostname resolution.
+                            - It will attempt connections to each resolved IP address sequentially.
+
+                        Note: The connection timeout applies to the entire resolution and connection process.
+                              If disabled, the timeout is distributed across all connection attempts.
+
+                        It requires Prometheus >= v3.1.0.
+                      type: boolean
                     sendExemplars:
                       description: |-
                         Enables sending of exemplars over remote write. Note that
@@ -8607,9 +8625,30 @@ spec:
               sha:
                 description: 'Deprecated: use ''spec.image'' instead. The image''s digest can be specified as part of the image name.'
                 type: string
+              shardRetentionPolicy:
+                description: |-
+                  ShardRetentionPolicy defines the retention policy for the Prometheus shards.
+                  (Alpha) Using this field requires the 'PrometheusShardRetentionPolicy' feature gate to be enabled.
+
+                  The final goals for this feature can be seen at https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/proposals/202310-shard-autoscaling.md#graceful-scale-down-of-prometheus-servers,
+                  however, the feature is not yet fully implemented in this PR. The limitation being:
+                  * Retention duration is not settable, for now, shards are retained forever.
+                properties:
+                  whenScaled:
+                    description: |-
+                      Defines the retention policy when the Prometheus shards are scaled down.
+                      * `Delete`, the operator will delete the pods from the scaled-down shard(s).
+                      * `Retain`, the operator will keep the pods from the scaled-down shard(s), so the data can still be queried.
+
+                      If not defined, the operator assumes the `Delete` value.
+                    enum:
+                    - Retain
+                    - Delete
+                    type: string
+                type: object
               shards:
                 description: |-
-                  Number of shards to distribute scraped targets onto.
+                  Number of shards to distribute the scraped targets onto.
 
                   `spec.replicas` multiplied by `spec.shards` is the total number of Pods
                   being created.
@@ -8619,11 +8658,11 @@ spec:
                   Note that scaling down shards will not reshard data onto the remaining
                   instances, it must be manually moved. Increasing shards will not reshard
                   data either but it will continue to be available from the same
-                  instances. To query globally, use Thanos sidecar and Thanos querier or
-                  remote write data to a central location.
-                  Alerting and recording rules
+                  instances. To query globally, use either
+                  * Thanos sidecar + querier for query federation and Thanos Ruler for rules.
+                  * Remote-write to send metrics to a central location.
 
-                  By default, the sharding is performed on:
+                  By default, the sharding of targets is performed on:
                   * The `__address__` target's metadata label for PodMonitor,
                   ServiceMonitor and ScrapeConfig resources.
                   * The `__param_target__` label for Probe resources.
diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
     include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    operator.prometheus.io/version: 0.80.1
+    operator.prometheus.io/version: 0.81.0
   labels:
     app.kubernetes.io/managed-by: cluster-version-operator
     app.kubernetes.io/part-of: openshift-monitoring
diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
     include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    operator.prometheus.io/version: 0.80.1
+    operator.prometheus.io/version: 0.81.0
   labels:
     app.kubernetes.io/managed-by: cluster-version-operator
     app.kubernetes.io/part-of: openshift-monitoring
diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
     include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    operator.prometheus.io/version: 0.80.1
+    operator.prometheus.io/version: 0.81.0
   labels:
     app.kubernetes.io/managed-by: cluster-version-operator
     app.kubernetes.io/part-of: openshift-monitoring
@@ -2513,6 +2513,9 @@ spec:
                 - Default
                 - None
                 type: string
+              enableServiceLinks:
+                description: Indicates whether information about services should be injected into pod's environment variables
+                type: boolean
               enforcedNamespaceLabel:
                 description: |-
                   EnforcedNamespaceLabel enforces adding a namespace label of origin for each alert
@@ -4761,6 +4764,15 @@ spec:
                   ServiceAccountName is the name of the ServiceAccount to use to run the
                   Thanos Ruler Pods.
                 type: string
+              serviceName:
+                description: |-
+                  The name of the service name used by the underlying StatefulSet(s) as the governing service.
+                  If defined, the Service  must be created before the ThanosRuler resource in the same namespace and it must define a selector that matches the pod labels.
+                  If empty, the operator will create and manage a headless service named `thanos-ruler-operated` for ThanosRuler resources.
+                  When deploying multiple ThanosRuler resources in the same namespace, it is recommended to specify a different value for each.
+                  See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
+                minLength: 1
+                type: string
               storage:
                 description: Storage spec to specify how storage shall be used.
                 properties:

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"subdir": "jsonnet/prometheus-operator"`
`18`	`18`	`}`
`19`	`19`	`},`
`20`		`- "version": "release-0.80"`
	`20`	`+ "version": "release-0.81"`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"source": {`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@`
`191`	`191`	`"subdir": "jsonnet/mixin"`
`192`	`192`	`}`
`193`	`193`	`},`
`194`		`- "version": "524131da7888af88091e30274c2507ea8b959017",`
	`194`	`+ "version": "81634cc2c103d3f755932fd586bd63fd2c13d705",`
`195`	`195`	`"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",`
`196`	`196`	`"name": "prometheus-operator-mixin"`
`197`	`197`	`},`
`@@ -202,8 +202,8 @@`
`202`	`202`	`"subdir": "jsonnet/prometheus-operator"`
`203`	`203`	`}`
`204`	`204`	`},`
`205`		`- "version": "4126d60d8a8ae99be866cdd0d15546a4d3e9fe8b",`
`206`		`- "sum": "VF9CoB3hjwDGrxKONlX4OxW+k+9CkICWg+xbLb7dZ8A="`
	`205`	`+ "version": "81634cc2c103d3f755932fd586bd63fd2c13d705",`
	`206`	`+ "sum": "wAOdGxl8D660MfS7YW5Rhh+KObOJBr0F/OOImHSTMO8="`
`207`	`207`	`},`
`208`	`208`	`{`
`209`	`209`	`"source": {`